- * A vehicle towards a final value, of a CSS type that cannot be anticipated. - *
- *- * Example: {@code var()} or {@code attr()}. - *
- *- * (note that {@code attr()} has two components, a main one whose type - * could be anticipated, and a fallback that could be of a different type). - *
- */ - PROXY, - - /** - * A typed primitive value, includes numbers and identifiers. - */ - TYPED, - - /** - * A list of values. - *- * You can cast to {@link ListValue}. - *
- */ - LIST, - - /** - * A shorthand property. - */ - SHORTHAND - } - - /** - * The type of value. For keywords, it is the keyword. - */ - enum Type { - /** - * Unknown type, probably a system default or a compat value. - */ - UNKNOWN, - - /** - * {@code inherit} keyword. - */ - INHERIT, - - /** - * {@code initial} keyword. - */ - INITIAL, - - /** - * {@code unset} keyword. - */ - UNSET, - - /** - * {@code revert} keyword. - */ - REVERT, - - /** - * Numeric type (excludes {@code calc()} which is an {@link #EXPRESSION}). - *- * Cast to {@link NumericValue}. - *
- */ - NUMERIC, - - /** - * String. - *- * Cast to {@link StringValue}. - *
- */ - STRING, - - /** - * Identifier. - *- * Cast to {@link KeywordValue}. - *
- */ - IDENT, - - /** - * Color. - */ - COLOR, - - /** - * Color-Mix function. - */ - COLOR_MIX, - - /** - * URI ({@code url()}). - *- * Cast to {@link CSSStringValue}. - *
- */ - URI, - - /** - * {@code rect()} function. - */ - RECT, - - /** - * An expression with algebraic syntax (i.e.calc()).
- */
- EXPRESSION,
-
- /**
- * Gradient function.
- */
- GRADIENT,
-
- /**
- * CSS counter() function.
- */
- COUNTER,
-
- /**
- * CSS counters() function.
- */
- COUNTERS,
-
- /**
- * cubic-bezier() easing function.
- */
- CUBIC_BEZIER,
-
- /**
- * steps() easing function.
- */
- STEPS,
-
- /**
- * Function.
- */
- FUNCTION,
-
- /**
- * Mathematical function (as defined by CSS Values and Units).
- */
- MATH_FUNCTION,
-
- /**
- * Unicode range.
- */
- UNICODE_RANGE,
-
- /**
- * Unicode character.
- */
- UNICODE_CHARACTER,
-
- /**
- * Unicode wildcard.
- */
- UNICODE_WILDCARD,
-
- /**
- * Element reference.
- * - * Cast to {@link CSSKeywordValue}. - *
- */ - ELEMENT_REFERENCE, - - /** - * Ratio value. - */ - RATIO, - - /** - * {@code attr()} function. - */ - ATTR, - - /** - * Custom property reference. - */ - VAR, - - /** - * Environment variable. - */ - ENV, - - /** - * Lexical value. - */ - LEXICAL, - - /** - * For this library's internal use. - */ - INTERNAL, - - /** - * Invalid (non-primitive and non-keyword) value. - *- * The value is either a list or a shorthand. - *
- */ - INVALID - - } - - /** - * Get the general category to which this value belongs. - * - * @return the general value type. - */ - CssType getCssValueType(); - - /** - * Get the primitive type. - * - * @return the primitive type. - */ - Type getPrimitiveType(); - - /** - * Gets the css unit as in CSS4J's {@code CSSUnit}. - *- * If the value has no valid CSS unit, returns {@code CSSUnit.CSS_INVALID}. - *
- * - * @return the css unit as in CSS4J's {@code CSSUnit}. - */ - default short getCSSUnit() { - return CSSUnit.CSS_INVALID; - } - - /** - * Set this value to the result of parsing the argument. - * - * @param cssText a CSS serialization to set this value. - * @throws DOMException - */ - void setCssText(String cssText) throws DOMException; - - /** - * Get a parsable representation of this value. - * - * @return the CSS serialization of this value. - */ - String getCssText(); - - /** - * Convenience method that either returns the float value, if the value is - * numeric, or throws an exception. - * - * @return the float value. - */ - float getFloatValue(); - - /** - * Convenience method that either returns an identifier or throws an exception. - * - * @exception DOMException INVALID_ACCESS_ERR: Raised if the value doesn't - * contain an identifier value. - */ - String getIdentifierValue() throws DOMException; - - /** - * If this value can be used where a string is expected, get the value. - * - * @return the string value, without the commas. - * @exception DOMException INVALID_ACCESS_ERR: Raised if the value doesn't - * contain a String. - */ - String getStringValue() throws DOMException; - - /** - * Convenience method that either returns a String or URI or throws an exception. - * - * @exception DOMException INVALID_ACCESS_ERR: Raised if the value doesn't - * contain a String nor a URI value. - */ - String getURIValue() throws DOMException; - - /** - * If this value is a list or contains components, the number of - *CSSStyleValues in the list. The range of valid values of the
- * indices is 0 to length-1 inclusive.
- *
- * @return the number of components, or {@code 0} if this value is not a list
- * nor does it contain components.
- */
- int getLength();
-
- /**
- * If this value is a list, give the item corresponding to the requested index.
- * If there is no item at such index, return {@code null} If this object is not
- * a list and the index is {@code 0}, return itself.
- *
- * @param index the index on the list.
- * @return the item, or {@code null} if there is no item on that index.
- */
- default CSSValue item(int index) {
- return index == 0 ? this : null;
- }
-
-}
diff --git a/test-resources/io/sf/carte/echosvg/transcoder/image/resources/px2mm.svg b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/CSSCircularityException.java
similarity index 62%
rename from test-resources/io/sf/carte/echosvg/transcoder/image/resources/px2mm.svg
rename to echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/CSSCircularityException.java
index c4b0deb5b..0ed6b2e46 100644
--- a/test-resources/io/sf/carte/echosvg/transcoder/image/resources/px2mm.svg
+++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/CSSCircularityException.java
@@ -1,7 +1,5 @@
-
-
+/*
-
-
+ private static final long serialVersionUID = 1L;
+
+ public CSSCircularityException(String message) {
+ super(message);
+ }
+
+}
diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/CSSContext.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/CSSContext.java
index e423b7561..2e41fc98d 100644
--- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/CSSContext.java
+++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/CSSContext.java
@@ -58,8 +58,13 @@ public interface CSSContext {
/**
* Returns the size of a px CSS unit in millimeters.
+ *
+ * @deprecated Use {@link #getResolution()}.
*/
- float getPixelUnitToMillimeter();
+ @Deprecated
+ default float getPixelUnitToMillimeter() {
+ return 25.4f / getResolution();
+ }
/**
* Returns the size of a px CSS unit in millimeters. This will be removed after
@@ -72,6 +77,11 @@ default float getPixelToMillimeter() {
return getPixelUnitToMillimeter();
}
+ /**
+ * Returns the resolution in dpi.
+ */
+ float getResolution();
+
/**
* Returns the medium font size.
*/
@@ -105,6 +115,11 @@ default float getPixelToMillimeter() {
*/
void checkLoadExternalResource(ParsedURL resourceURL, ParsedURL docURL) throws SecurityException;
+ /**
+ * Get prefers-color-scheme.
+ */
+ String getPrefersColorScheme();
+
/**
* Returns true if the document is dynamic, false otherwise.
*/
diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/CSSEngine.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/CSSEngine.java
index bba9949bd..41568bcfe 100644
--- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/CSSEngine.java
+++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/CSSEngine.java
@@ -18,13 +18,19 @@
*/
package io.sf.carte.echosvg.css.engine;
+import java.awt.GraphicsEnvironment;
import java.io.IOException;
import java.io.StringReader;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
+import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.Locale;
+import java.util.Map;
import java.util.Set;
import org.w3c.dom.Attr;
@@ -39,24 +45,53 @@
import org.w3c.dom.events.MutationEvent;
import io.sf.carte.doc.style.css.BooleanCondition;
+import io.sf.carte.doc.style.css.CSSCanvas;
+import io.sf.carte.doc.style.css.CSSDocument;
import io.sf.carte.doc.style.css.CSSRule;
+import io.sf.carte.doc.style.css.CSSTypedValue;
+import io.sf.carte.doc.style.css.CSSUnit;
+import io.sf.carte.doc.style.css.CSSValue;
+import io.sf.carte.doc.style.css.CSSValue.Type;
+import io.sf.carte.doc.style.css.CSSValueSyntax;
+import io.sf.carte.doc.style.css.CSSValueSyntax.Match;
import io.sf.carte.doc.style.css.MediaQueryList;
import io.sf.carte.doc.style.css.SelectorMatcher;
+import io.sf.carte.doc.style.css.StyleDatabase;
+import io.sf.carte.doc.style.css.UnitStringToId;
+import io.sf.carte.doc.style.css.nsac.ArgumentCondition;
import io.sf.carte.doc.style.css.nsac.AttributeCondition;
+import io.sf.carte.doc.style.css.nsac.CSSBudgetException;
import io.sf.carte.doc.style.css.nsac.CSSHandler;
+import io.sf.carte.doc.style.css.nsac.CSSParseException;
+import io.sf.carte.doc.style.css.nsac.CombinatorCondition;
+import io.sf.carte.doc.style.css.nsac.CombinatorSelector;
import io.sf.carte.doc.style.css.nsac.Condition;
+import io.sf.carte.doc.style.css.nsac.ConditionalSelector;
+import io.sf.carte.doc.style.css.nsac.DeclarationCondition;
import io.sf.carte.doc.style.css.nsac.InputSource;
import io.sf.carte.doc.style.css.nsac.LexicalUnit;
+import io.sf.carte.doc.style.css.nsac.LexicalUnit.LexicalType;
import io.sf.carte.doc.style.css.nsac.PageSelectorList;
import io.sf.carte.doc.style.css.nsac.Parser;
import io.sf.carte.doc.style.css.nsac.ParserControl;
import io.sf.carte.doc.style.css.nsac.Selector;
+import io.sf.carte.doc.style.css.nsac.SelectorFunction;
import io.sf.carte.doc.style.css.nsac.SelectorList;
+import io.sf.carte.doc.style.css.om.AbstractCSSCanvas;
+import io.sf.carte.doc.style.css.om.AbstractStyleDatabase;
+import io.sf.carte.doc.style.css.om.CSSOMParser;
import io.sf.carte.doc.style.css.om.Specificity;
import io.sf.carte.doc.style.css.parser.AttributeConditionVisitor;
-import io.sf.carte.doc.style.css.parser.CSSParser;
+import io.sf.carte.doc.style.css.parser.ParseHelper;
+import io.sf.carte.doc.style.css.parser.SyntaxParser;
+import io.sf.carte.doc.style.css.property.ValueFactory;
+import io.sf.carte.echosvg.css.CSSSecurityException;
+import io.sf.carte.echosvg.css.engine.value.CSSProxyValueException;
import io.sf.carte.echosvg.css.engine.value.ComputedValue;
import io.sf.carte.echosvg.css.engine.value.InheritValue;
+import io.sf.carte.echosvg.css.engine.value.LexicalValue;
+import io.sf.carte.echosvg.css.engine.value.PendingValue;
+import io.sf.carte.echosvg.css.engine.value.PropertyDefinition;
import io.sf.carte.echosvg.css.engine.value.ShorthandManager;
import io.sf.carte.echosvg.css.engine.value.Value;
import io.sf.carte.echosvg.css.engine.value.ValueManager;
@@ -66,8 +101,10 @@
/**
* This is the base class for all the CSS engines.
*
- * @author Stephane Hillion
- * @author For later modifications, see Git history.
+ * + * Original author: Stephane Hillion. + * For later modifications, see Git history. + *
* @version $Id$ */ public abstract class CSSEngine { @@ -136,6 +173,10 @@ public static CSSStylableElement getParentCSSStylableElement(Element elt) { */ protected CSSContext cssContext; + private EngineStyleDatabase styleDb; + + private CSSCanvas csscanvas; + /** * The associated document. */ @@ -209,7 +250,7 @@ public static CSSStylableElement getParentCSSStylableElement(Element elt) { /** * The media to use to cascade properties. */ - protected MediaQueryList media; + private String medium; /** * The DOM nodes which contains StyleSheets. @@ -338,6 +379,13 @@ public static CSSStylableElement getParentCSSStylableElement(Element elt) { */ protected Setindex.
+ *
+ * @param index the rule list index at which the rule must be removed.
+ * @throws DOMException INDEX_SIZE_ERR if index is greater than or
+ * equal to {@link #getSize()}.
+ */
+ public void deleteRule(int index) throws DOMException {
+ if (index < 0 || index >= size) {
+ throw new DOMException(DOMException.INDEX_SIZE_ERR, "Invalid index: " + index + '.');
+ }
+ for (int i = index; i < size - 1; i++) {
+ rules[i] = rules[i + 1];
+ }
+ size--;
+ rules[size] = null;
+ }
+
/**
* Clears the content.
*/
diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/SupportsRule.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/SupportsRule.java
new file mode 100644
index 000000000..fb8b195c7
--- /dev/null
+++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/SupportsRule.java
@@ -0,0 +1,114 @@
+/*
+
+ See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
+package io.sf.carte.echosvg.css.engine;
+
+import org.w3c.css.om.CSSRule;
+import org.w3c.dom.DOMException;
+
+import io.sf.carte.doc.style.css.BooleanCondition;
+import io.sf.carte.doc.style.css.nsac.CSSBudgetException;
+import io.sf.carte.doc.style.css.nsac.CSSException;
+import io.sf.carte.doc.style.css.om.CSSOMParser;
+import io.sf.carte.doc.style.css.parser.CSSParser;
+
+/**
+ * This class represents a {@code @supports} CSS rule.
+ *
+ * @version $Id$
+ */
+public class SupportsRule extends StyleSheet implements Rule {
+
+ /**
+ * The type constant.
+ */
+ public static final short TYPE = CSSRule.SUPPORTS_RULE;
+
+ /**
+ * The media list.
+ */
+ private BooleanCondition condition;
+
+ boolean supports;
+
+ public SupportsRule(BooleanCondition condition) {
+ super();
+ this.condition = condition;
+ }
+
+ /**
+ * Returns a constant identifying the rule type.
+ */
+ @Override
+ public short getType() {
+ return TYPE;
+ }
+
+ public BooleanCondition getCondition() {
+ return condition;
+ }
+
+ public String getConditionText() {
+ return condition != null ? condition.toString() : "";
+ }
+
+ public void setConditionText(String conditionText) throws DOMException {
+ parseConditionText(conditionText);
+ }
+
+ /**
+ * Parse the condition text.
+ *
+ * @param conditionText the condition text.
+ */
+ private void parseConditionText(String conditionText) throws DOMException {
+ CSSParser parser = new CSSOMParser();
+ try {
+ condition = parser.parseSupportsCondition(conditionText, null);
+ } catch (CSSBudgetException e) {
+ DOMException ex = new DOMException(DOMException.NOT_SUPPORTED_ERR,
+ "Limit found while parsing condition " + conditionText);
+ ex.initCause(e);
+ throw ex;
+ } catch (CSSException e) {
+ DOMException ex = new DOMException(DOMException.SYNTAX_ERR,
+ "Error parsing condition: " + conditionText);
+ ex.initCause(e);
+ throw ex;
+ }
+ }
+
+ /**
+ * Returns a printable representation of this media rule.
+ */
+ @Override
+ public String toString(CSSEngine eng) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("@supports");
+ if (condition != null) {
+ sb.append(condition.toString());
+ }
+ sb.append(" {\n");
+ for (int i = 0; i < size; i++) {
+ sb.append(rules[i].toString(eng));
+ }
+ sb.append("}\n");
+ return sb.toString();
+ }
+
+}
diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractColorManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractColorManager.java
index 588c030ae..76aa3381b 100644
--- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractColorManager.java
+++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractColorManager.java
@@ -26,15 +26,17 @@
import io.sf.carte.doc.style.css.CSSColor;
import io.sf.carte.doc.style.css.CSSTypedValue;
+import io.sf.carte.doc.style.css.CSSValue;
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.nsac.CSSParseException;
import io.sf.carte.doc.style.css.nsac.LexicalUnit;
import io.sf.carte.doc.style.css.nsac.LexicalUnit.LexicalType;
import io.sf.carte.doc.style.css.parser.CSSParser;
import io.sf.carte.doc.style.css.property.NumberValue;
+import io.sf.carte.doc.style.css.property.PercentageEvaluator;
import io.sf.carte.doc.style.css.property.StyleValue;
import io.sf.carte.doc.style.css.property.ValueFactory;
-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;
@@ -192,9 +194,11 @@ public Value createValue(LexicalUnit lunit, CSSEngine engine) throws DOMExceptio
}
case RGBCOLOR:
return createRGBColor(lunit);
- default:
+ case IDENT:
// Clone so colors can be modified
return super.createValue(lunit, engine).clone();
+ default:
+ return super.createValue(lunit, engine);
}
}
@@ -220,7 +224,7 @@ private LexicalUnit reparseColor(String colorSerialization) throws DOMException
@Override
public Value computeValue(CSSStylableElement elt, String pseudo, CSSEngine engine, int idx, StyleMap sm,
Value value) {
- if (value.getPrimitiveType() == Type.IDENT) {
+ if (value.getPrimitiveType() == CSSValue.Type.IDENT) {
String ident = ((AbstractStringValue) value).getValue();
// Search for a direct computed value.
Value v = (Value) computedValues.get(ident);
@@ -350,6 +354,19 @@ protected NumericValue createRGBColorComponent(LexicalUnit lu) throws DOMExcepti
case PERCENTAGE:
return new FloatValue(CSSUnit.CSS_PERCENTAGE, lu.getFloatValue());
+ case VAR:
+ case ATTR:
+ throw new CSSProxyValueException();
+
+ case CALC:
+ Value calc = createCalc(lu);
+ if (calc.getCssValueType() == CSSValue.CssType.PROXY) {
+ throw new CSSProxyValueException();
+ } else if (calc.getPrimitiveType() != Type.EXPRESSION) {
+ break;
+ }
+ return evaluateComponentExpression((CalcValue) calc);
+
default:
}
throw createInvalidRGBComponentUnitDOMException(lu.getLexicalUnitType());
@@ -369,9 +386,28 @@ protected NumericValue createColorComponent(LexicalUnit lu) throws DOMException
case PERCENTAGE:
return new FloatValue(CSSUnit.CSS_PERCENTAGE, lu.getFloatValue());
+ case VAR:
+ case ATTR:
+ throw new CSSProxyValueException();
+
+ case CALC:
+ Value calc = createCalc(lu);
+ if (calc.getCssValueType() == CSSValue.CssType.PROXY) {
+ throw new CSSProxyValueException();
+ } else if (calc.getPrimitiveType() != Type.EXPRESSION) {
+ break;
+ }
+ return evaluateComponentExpression((CalcValue) calc);
+
default:
}
- throw createInvalidRGBComponentUnitDOMException(lu.getLexicalUnitType());
+ throw createInvalidComponentUnitDOMException(lu.getLexicalUnitType());
+ }
+
+ private FloatValue evaluateComponentExpression(CalcValue calc) {
+ PercentageEvaluator eval = new PercentageEvaluator();
+ CSSTypedValue result = eval.evaluateExpression(calc.getExpressionDelegate());
+ return new FloatValue(CSSUnit.CSS_NUMBER, result.getFloatValue(CSSUnit.CSS_NUMBER));
}
/**
@@ -388,4 +424,10 @@ private DOMException createInvalidRGBComponentUnitDOMException(LexicalType lexic
return new DOMException(DOMException.NOT_SUPPORTED_ERR, s);
}
+ private DOMException createInvalidComponentUnitDOMException(LexicalType lexicalType) {
+ Object[] p = { getPropertyName(), lexicalType.toString() };
+ String s = Messages.formatMessage("invalid.color.component.unit", p);
+ return new DOMException(DOMException.NOT_SUPPORTED_ERR, s);
+ }
+
}
diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractValue.java
index e806cdb64..275db095c 100644
--- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractValue.java
+++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractValue.java
@@ -19,15 +19,11 @@
package io.sf.carte.echosvg.css.engine.value;
import org.w3c.css.om.typed.CSSCounterValue;
-import org.w3c.css.om.unit.CSSUnit;
import org.w3c.dom.DOMException;
/**
- * This class provides an abstract implementation of the Value interface.
+ * This class provides an abstract implementation of the CSSValue interface.
*
- * - * Original author: Stephane Hillion. - *
* @version $Id$ */ public abstract class AbstractValue implements Value, Cloneable { @@ -39,16 +35,6 @@ public CssType getCssValueType() { return Value.CssType.TYPED; } - @Override - public Type getPrimitiveType() { - throw createDOMException(); - } - - @Override - public short getCSSUnit() { - return CSSUnit.CSS_INVALID; - } - @Override public void setCssText(String cssText) throws DOMException { throw createDOMException(); @@ -137,9 +123,9 @@ public boolean equals(Object obj) { return true; if (obj == null) return false; - if (!(obj instanceof Value)) + if (!(obj instanceof CSSVal)) return false; - Value other = (Value) obj; + CSSVal other = (CSSVal) obj; return getPrimitiveType() == other.getPrimitiveType(); } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractValueFactory.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractValueFactory.java index 70d1e007e..520e86b92 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractValueFactory.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractValueFactory.java @@ -20,8 +20,8 @@ import org.w3c.dom.DOMException; +import io.sf.carte.doc.style.css.CSSValue.Type; import io.sf.carte.doc.style.css.nsac.LexicalUnit; -import io.sf.carte.echosvg.css.dom.CSSValue.Type; import io.sf.carte.echosvg.util.ParsedURL; /** diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractValueList.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractValueList.java index 9dbc762de..7ecd9ef81 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractValueList.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractValueList.java @@ -34,7 +34,7 @@ public class AbstractValueList+ * This class is intended for internal use by this implementation. + *
+ */ +public class CSSProxyValueException extends DOMException { + + private static final long serialVersionUID = 1L; + + public CSSProxyValueException() { + super(DOMException.INVALID_ACCESS_ERR, "Found a PROXY value."); + } + +} diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/CSSVal.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/CSSVal.java new file mode 100644 index 000000000..162e11a8a --- /dev/null +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/CSSVal.java @@ -0,0 +1,114 @@ +/* + + See the NOTICE file distributed with this work for additional + information regarding copyright ownership. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + */ +package io.sf.carte.echosvg.css.engine.value; + +import java.io.IOException; + +import org.w3c.css.om.typed.CSSStyleValue; +import org.w3c.dom.DOMException; + +import io.sf.carte.doc.style.css.CSSValueSyntax; +import io.sf.carte.doc.style.css.CSSValueSyntax.Match; +import io.sf.carte.util.SimpleWriter; + +/** + * A gateway value between CSS Typed OM and an internal representation. + * + * @author See Git history. + * @version $Id$ + */ +public interface CSSVal extends io.sf.carte.doc.style.css.CSSValue, CSSStyleValue { + + /** + * If this value is a list or contains components, the number of + *CSSStyleValues in the list. The range of valid values of the
+ * indices is 0 to length-1 inclusive.
+ *
+ * @return the number of components, or {@code 0} if this value is not a list
+ * nor does it contain components.
+ */
+ int getLength();
+
+ /**
+ * If this value is a list, give the item corresponding to the requested index.
+ * If there is no item at such index, return {@code null} If this object is not
+ * a list and the index is {@code 0}, return itself.
+ *
+ * @param index the index on the list.
+ * @return the item, or {@code null} if there is no item on that index.
+ */
+ default CSSVal item(int index) {
+ return index == 0 ? this : null;
+ }
+
+ /**
+ * Convenience method that either returns an identifier or throws an exception.
+ *
+ * @exception DOMException INVALID_ACCESS_ERR: Raised if the value doesn't
+ * contain an identifier value.
+ */
+ String getIdentifierValue() throws DOMException;
+
+ /**
+ * If this value can be used where a string is expected, get the value.
+ *
+ * @return the string value, without the commas.
+ * @exception DOMException INVALID_ACCESS_ERR: Raised if the value doesn't
+ * contain a String.
+ */
+ String getStringValue() throws DOMException;
+
+ /**
+ * Convenience method that either returns a String or URI or throws an exception.
+ *
+ * @exception DOMException INVALID_ACCESS_ERR: Raised if the value doesn't
+ * contain a String nor a URI value.
+ */
+ String getURIValue() throws DOMException;
+
+ /**
+ * Convenience method that either returns the float value, if the value is
+ * numeric, or throws an exception.
+ *
+ * @return the float value.
+ */
+ float getFloatValue();
+
+ @Override
+ default void writeCssText(SimpleWriter wri) throws IOException {
+ wri.write(getCssText());
+ }
+
+ @Override
+ default Match matches(CSSValueSyntax syntax) {
+ return Match.PENDING;
+ }
+
+ /**
+ * Create and return a copy of this object.
+ * + * If this object is unmodifiable, the clone will be modifiable. + *
+ * + * @return a modifiable copy of this object. + */ + @Override + CSSVal clone(); + +} diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/CalcValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/CalcValue.java new file mode 100644 index 000000000..4abdc57e9 --- /dev/null +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/CalcValue.java @@ -0,0 +1,138 @@ +/* + + See the NOTICE file distributed with this work for additional + information regarding copyright ownership. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + */ +package io.sf.carte.echosvg.css.engine.value; + +import org.w3c.css.om.typed.CSSUnitValue; +import org.w3c.css.om.unit.CSSUnit; +import org.w3c.dom.DOMException; + +import io.sf.carte.doc.style.css.CSSExpressionValue; +import io.sf.carte.doc.style.css.CSSTypedValue; +import io.sf.carte.doc.style.css.property.Evaluator; +import io.sf.carte.doc.style.css.property.NumberValue; +import io.sf.carte.echosvg.css.engine.CSSEngine; +import io.sf.carte.echosvg.css.engine.CSSStylableElement; +import io.sf.carte.echosvg.css.engine.StyleMap; + +/** + * {@code calc()} value. + * + * @author See Git history. + * @version $Id$ + */ +public class CalcValue extends NumericValue { + + private CSSExpressionValue expressionDelegate; + + /** + * Creates a new value. + */ + public CalcValue(CSSExpressionValue expr) { + super(); + this.expressionDelegate = expr; + } + + @Override + public Type getPrimitiveType() { + return Type.EXPRESSION; + } + + @Override + public String getCssText() { + return expressionDelegate.getCssText(); + } + + @Override + short getCSSUnit() { + return expressionDelegate.computeUnitType(); + } + + public CSSExpressionValue getExpressionDelegate() { + return expressionDelegate; + } + + public FloatValue evaluate(CSSStylableElement elt, String pseudo, CSSEngine engine, int idx, StyleMap sm, + final short unit) throws DOMException { + Evaluator eval = new Evaluator(unit) { + + @Override + protected CSSTypedValue absoluteTypedValue(CSSTypedValue typed) { + if (CSSUnit.isRelativeLengthUnitType(typed.getUnitType())) { + FloatValue relative = new FloatValue(typed.getUnitType(), + typed.getFloatValue(typed.getUnitType())); + FloatValue abs = CalcValue.this.absoluteValue(elt, pseudo, engine, idx, sm, relative); + short u; + if (abs.getUnitType() != CSSUnit.CSS_NUMBER) { + u = abs.getUnitType(); + } else { + u = unit; + } + return NumberValue.createCSSNumberValue(u, abs.getFloatValue()); + } else { + return typed; + } + } + + @Override + protected float percentage(CSSTypedValue typed, short resultType) throws DOMException { + FloatValue relative = new FloatValue(typed.getUnitType(), typed.getFloatValue(typed.getUnitType())); + FloatValue abs = CalcValue.this.absoluteValue(elt, pseudo, engine, idx, sm, relative); + return NumberValue.floatValueConversion(abs.getFloatValue(), abs.getUnitType(), resultType); + } + + }; + + CSSTypedValue typed = eval.evaluateExpression(expressionDelegate); + if (typed.getPrimitiveType() != Type.NUMERIC) { + throw new DOMException(DOMException.INVALID_STATE_ERR, + "Unexpected calc() result: " + typed.getCssText()); + } + + float f; + short u; + if (typed.getUnitType() == CSSUnit.CSS_NUMBER) { + // Plain number can be interpreted as px or deg according to context + u = CSSUnit.CSS_NUMBER; + f = typed.getFloatValue(CSSUnit.CSS_NUMBER); + } else { + u = unit; + f = typed.getFloatValue(unit); + } + + return new FloatValue(u, f); + } + + protected FloatValue absoluteValue(CSSStylableElement elt, String pseudo, CSSEngine engine, int idx, + StyleMap sm, FloatValue relative) throws DOMException { + return relative; + } + + @Override + public CSSUnitValue to(String unit) { + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not supported."); + } + + @Override + public CalcValue clone() { + CalcValue clon = (CalcValue) super.clone(); + clon.expressionDelegate = expressionDelegate; + return clon; + } + +} diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ColorFunction.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ColorFunction.java index d4012a2b2..99397b5f8 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ColorFunction.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ColorFunction.java @@ -167,7 +167,7 @@ public String getCssText() { * @throws DOMSyntaxException if the value is inadequate for a component. */ private NumericValue numericComponent(NumericValue ch) throws DOMSyntaxException { - if (ch.getCSSUnit() != CSSUnit.CSS_PERCENTAGE && ch.getCSSUnit() != CSSUnit.CSS_NUMBER) { + if (ch.getUnitType() != CSSUnit.CSS_PERCENTAGE && ch.getUnitType() != CSSUnit.CSS_NUMBER) { throw new DOMSyntaxException("color() component must be a number or percentage."); } componentize(ch); diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ColorValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ColorValue.java index 1d0acfc72..f3c729f54 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ColorValue.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ColorValue.java @@ -29,7 +29,7 @@ * @author See Git history. * @version $Id$ */ -public abstract class ColorValue extends ComponentValue implements CSSColorValue { +public abstract class ColorValue extends ComponentValue implements TypedValue, CSSColorValue { public static final String RGB_FUNCTION = "rgb"; @@ -134,7 +134,7 @@ public void setAlpha(CSSNumericValue alpha) throws DOMSyntaxException { private void setAlphaChannel(CSSNumericValue alpha) throws DOMSyntaxException { NumericValue a = (NumericValue) alpha; - if (a.getCSSUnit() != CSSUnit.CSS_PERCENTAGE && a.getCSSUnit() != CSSUnit.CSS_NUMBER) { + if (a.getUnitType() != CSSUnit.CSS_PERCENTAGE && a.getUnitType() != CSSUnit.CSS_NUMBER) { throw new DOMSyntaxException("Alpha channel must be a number or percentage."); } componentize(a); @@ -144,7 +144,7 @@ private void setAlphaChannel(CSSNumericValue alpha) throws DOMSyntaxException { } boolean isOpaque() { - switch (alpha.getCSSUnit()) { + switch (alpha.getUnitType()) { case CSSUnit.CSS_NUMBER: return alpha.getFloatValue() == 1f; case CSSUnit.CSS_PERCENTAGE: diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ComputedValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ComputedValue.java index 0fb8ed4b4..0b8fe9080 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ComputedValue.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ComputedValue.java @@ -91,8 +91,8 @@ public Type getPrimitiveType() { } @Override - public short getCSSUnit() { - return computedValue.getCSSUnit(); + public short getUnitType() { + return computedValue.getUnitType(); } @Override diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/FloatValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/FloatValue.java index 572839a3b..26cb3cef7 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/FloatValue.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/FloatValue.java @@ -28,10 +28,11 @@ import org.w3c.css.om.unit.CSSUnit; import org.w3c.dom.DOMException; +import io.sf.carte.doc.style.css.CSSNumberValue; +import io.sf.carte.doc.style.css.UnitStringToId; import io.sf.carte.doc.style.css.nsac.CSSParseException; import io.sf.carte.doc.style.css.nsac.LexicalUnit; import io.sf.carte.doc.style.css.parser.CSSParser; -import io.sf.carte.doc.style.css.parser.ParseHelper; import io.sf.carte.doc.style.css.property.NumberValue; /** @@ -40,7 +41,7 @@ * @author See Git history. * @version $Id$ */ -public class FloatValue extends NumericValue implements CSSUnitValue { +public class FloatValue extends NumericValue implements CSSNumberValue, CSSUnitValue { /** * Returns the CSS text associated with the given type/value pair. @@ -80,6 +81,16 @@ public static FloatValue createConstant(short unit, float value) { */ private short unitType; + /** + * True if this value is the result of a calculation + */ + private boolean calculated = false; + + /** + * True if this number is in the same unit as was specified. + */ + private boolean specified = true; + /** * Creates a new value. * @@ -100,7 +111,7 @@ public Type getPrimitiveType() { } @Override - public short getCSSUnit() { + public short getUnitType() { return unitType; } @@ -181,12 +192,51 @@ public void setCssText(String cssText) throws DOMException { } } + @Override + public boolean isCalculatedNumber() { + return calculated; + } + /** - * Returns a printable representation of this value. + * Sets whether this number is the result of a calculation. + * + * @param calculated {@code true} if this number was calculated. */ @Override - public String toString() { - return getCssText(); + public void setCalculatedNumber(boolean calculated) { + this.calculated = calculated; + this.specified = this.specified && !calculated; + } + + @Override + public void setExpectInteger() throws DOMException { + if (getUnitType() != CSSUnit.CSS_NUMBER) { + super.setExpectInteger(); + } else if (calculated) { + floatValue = Math.round(floatValue); + } else if (!isInteger()) { + super.setExpectInteger(); + } + } + + private boolean isInteger() { + return Math.rint(floatValue) == floatValue; + } + + @Override + public void roundToInteger() throws DOMException { + setExpectInteger(); + floatValue = Math.round(floatValue); + } + + @Override + public boolean isNegativeNumber() { + return floatValue < 0f; + } + + @Override + public boolean isNumberZero() { + return floatValue == 0f; } @Override @@ -206,81 +256,21 @@ public boolean equals(Object obj) { if (!(obj instanceof Value)) return false; Value other = (Value) obj; - return other.getCSSUnit() == unitType + return other.getUnitType() == unitType && Float.floatToIntBits(floatValue) == Float.floatToIntBits(other.getFloatValue()); } @Override public CSSUnitValue to(String unit) { - short destUnit = ParseHelper.unitFromString(unit); + short destUnit = UnitStringToId.unitFromString(unit); float destValue = NumberValue.floatValueConversion(floatValue, unitType, destUnit); FloatValue toVal = new FloatValue(destUnit, destValue); return toVal; } @Override - public CSSNumericType type() { - return new NumericType(); - } - - class NumericType implements CSSNumericType { - - @Override - public int getLength() { - return CSSUnit.isLengthUnitType(unitType) ? 1 : 0; - } - - @Override - public int getAngle() { - return CSSUnit.isAngleUnitType(unitType) ? 1 : 0; - } - - @Override - public int getTime() { - return CSSUnit.isTimeUnitType(unitType) ? 1 : 0; - } - - @Override - public int getFrequency() { - return unitType == CSSUnit.CSS_HZ || unitType == CSSUnit.CSS_KHZ ? 1 : 0; - } - - @Override - public int getResolution() { - return CSSUnit.isResolutionUnitType(unitType) ? 1 : 0; - } - - @Override - public int getFlex() { - return unitType == CSSUnit.CSS_FR ? 1 : 0; - } - - @Override - public int getPercent() { - return unitType == CSSUnit.CSS_PERCENTAGE ? 1 : 0; - } - - @Override - public CSSNumericBaseType getPercentHint() { - CSSNumericBaseType baseType = null; - if (CSSUnit.isLengthUnitType(unitType)) { - baseType = CSSNumericBaseType.length; - } else if (unitType == CSSUnit.CSS_PERCENTAGE) { - baseType = CSSNumericBaseType.percent; - } else if (CSSUnit.isTimeUnitType(unitType)) { - baseType = CSSNumericBaseType.time; - } else if (CSSUnit.isAngleUnitType(unitType)) { - baseType = CSSNumericBaseType.angle; - } else if (CSSUnit.isResolutionUnitType(unitType)) { - baseType = CSSNumericBaseType.resolution; - } else if (unitType == CSSUnit.CSS_HZ || unitType == CSSUnit.CSS_KHZ) { - baseType = CSSNumericBaseType.frequency; - } else if (unitType == CSSUnit.CSS_FR) { - baseType = CSSNumericBaseType.flex; - } - return baseType; - } - + short getCSSUnit() { + return unitType; } @Override diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/IdentifierManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/IdentifierManager.java index 2b54976c6..e59010bf2 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/IdentifierManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/IdentifierManager.java @@ -22,8 +22,8 @@ import org.w3c.dom.DOMException; +import io.sf.carte.doc.style.css.CSSValue.Type; import io.sf.carte.doc.style.css.nsac.LexicalUnit; -import io.sf.carte.echosvg.css.dom.CSSValue.Type; import io.sf.carte.echosvg.css.engine.CSSEngine; /** @@ -44,9 +44,6 @@ public abstract class IdentifierManager extends AbstractValueManager { @Override public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { switch (lu.getLexicalUnitType()) { - case INHERIT: - return ValueConstants.INHERIT_VALUE; - case IDENT: String s = lu.getStringValue().toLowerCase(Locale.ROOT).intern(); Object v = getIdentifiers().get(s); @@ -55,6 +52,22 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { } return (Value) v; + case INHERIT: + return ValueConstants.INHERIT_VALUE; + + case UNSET: + return UnsetValue.getInstance(); + + case REVERT: + return RevertValue.getInstance(); + + case INITIAL: + return getDefaultValue(); + + case VAR: + case ATTR: + return createLexicalValue(lu); + default: throw createInvalidLexicalUnitDOMException(lu.getLexicalUnitType()); } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ImmutableUnitValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ImmutableUnitValue.java index dde6aadfc..c54bcbb63 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ImmutableUnitValue.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ImmutableUnitValue.java @@ -47,7 +47,7 @@ public void setValue(String cssText) throws DOMException { @Override public FloatValue clone() { - return new FloatValue(getCSSUnit(), getFloatValue()); + return new FloatValue(getUnitType(), getFloatValue()); } } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/InheritValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/InheritValue.java index 3b036b598..711d045be 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/InheritValue.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/InheritValue.java @@ -18,9 +18,6 @@ */ package io.sf.carte.echosvg.css.engine.value; -import org.w3c.api.DOMTypeException; -import org.w3c.css.om.typed.CSSKeywordValue; - /** * This singleton class represents the 'inherit' value. * @@ -30,7 +27,7 @@ * * @version $Id$ */ -public class InheritValue extends AbstractValue implements CSSKeywordValue { +public final class InheritValue extends KeywordValue { /** * The only instance of this class. @@ -40,15 +37,7 @@ public class InheritValue extends AbstractValue implements CSSKeywordValue { /** * Creates a new InheritValue object. */ - protected InheritValue() { - } - - /** - * A string representation of the current value. - */ - @Override - public String getCssText() { - return getValue(); + InheritValue() { } @Override @@ -56,19 +45,6 @@ public String getValue() { return "inherit"; } - @Override - public void setValue(String value) throws DOMTypeException { - throw new DOMTypeException("Not supported."); - } - - /** - * A code defining the type of the value. - */ - @Override - public CssType getCssValueType() { - return CssType.KEYWORD; - } - @Override public Type getPrimitiveType() { return Type.INHERIT; @@ -80,11 +56,12 @@ public InheritValue clone() { } /** - * Returns a printable representation of this object. + * Get the instance of {@code inherit}. + * + * @return the instance of {@code inherit}. */ - @Override - public String toString() { - return getCssText(); + public static Value getInstance() { + return INSTANCE; } } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/KeywordValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/KeywordValue.java new file mode 100644 index 000000000..8795e6d1c --- /dev/null +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/KeywordValue.java @@ -0,0 +1,57 @@ +/* + + See the NOTICE file distributed with this work for additional + information regarding copyright ownership. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + */ +package io.sf.carte.echosvg.css.engine.value; + +import org.w3c.api.DOMTypeException; +import org.w3c.css.om.typed.CSSKeywordValue; + +/** + * A CSS-wide non-primitive keyword value: 'inherit', 'unset', 'revert'. + * + */ +abstract class KeywordValue extends AbstractValue implements CSSKeywordValue { + + /** + * Creates a new UnsetValue object. + */ + protected KeywordValue() { + } + + /** + * A string representation of the current value. + */ + @Override + public String getCssText() { + return getValue(); + } + + @Override + public void setValue(String value) throws DOMTypeException { + throw new DOMTypeException("Not supported."); + } + + /** + * A code defining the type of the value. + */ + @Override + public CssType getCssValueType() { + return CssType.KEYWORD; + } + +} diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/LCHColorValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/LCHColorValue.java index 46d273651..0181def91 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/LCHColorValue.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/LCHColorValue.java @@ -124,7 +124,7 @@ public void setL(CSSNumericValue lightness) throws DOMSyntaxException { */ private NumericValue component(CSSNumericValue c) throws DOMSyntaxException { NumericValue ch = (NumericValue) c; - if (ch.getCSSUnit() != CSSUnit.CSS_PERCENTAGE && ch.getCSSUnit() != CSSUnit.CSS_NUMBER) { + if (ch.getUnitType() != CSSUnit.CSS_PERCENTAGE && ch.getUnitType() != CSSUnit.CSS_NUMBER) { throw new DOMSyntaxException("LC component must be a number or percentage."); } if (ch.handler != null) { @@ -162,7 +162,7 @@ public void setH(CSSNumericValue h) throws DOMSyntaxException { private NumericValue hueComponent(CSSNumericValue h) { NumericValue ch = (NumericValue) h; - if (ch.getCSSUnit() != CSSUnit.CSS_NUMBER && !CSSUnit.isAngleUnitType(ch.getCSSUnit())) { + if (ch.getUnitType() != CSSUnit.CSS_NUMBER && !CSSUnit.isAngleUnitType(ch.getUnitType())) { throw new DOMSyntaxException("Hue component must be a number or angle."); } if (ch.handler != null) { diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/LabColorValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/LabColorValue.java index 17cb92ed2..29e71e1e0 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/LabColorValue.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/LabColorValue.java @@ -124,7 +124,7 @@ public void setL(CSSNumericValue lightness) throws DOMSyntaxException { */ private NumericValue component(CSSNumericValue c) throws DOMSyntaxException { NumericValue ch = (NumericValue) c; - if (ch.getCSSUnit() != CSSUnit.CSS_PERCENTAGE && ch.getCSSUnit() != CSSUnit.CSS_NUMBER) { + if (ch.getUnitType() != CSSUnit.CSS_PERCENTAGE && ch.getUnitType() != CSSUnit.CSS_NUMBER) { throw new DOMSyntaxException("Lab component must be a number or percentage."); } if (ch.handler != null) { diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/LengthManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/LengthManager.java index 48c5072d8..69b7e2674 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/LengthManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/LengthManager.java @@ -21,10 +21,10 @@ import org.w3c.css.om.unit.CSSUnit; import org.w3c.dom.DOMException; +import io.sf.carte.doc.style.css.CSSValue.Type; import io.sf.carte.doc.style.css.nsac.LexicalUnit; import io.sf.carte.doc.style.css.property.NumberValue; import io.sf.carte.echosvg.css.Viewport; -import io.sf.carte.echosvg.css.dom.CSSValue.Type; import io.sf.carte.echosvg.css.engine.CSSContext; import io.sf.carte.echosvg.css.engine.CSSEngine; import io.sf.carte.echosvg.css.engine.CSSStylableElement; @@ -64,6 +64,23 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { case PERCENTAGE: return new FloatValue(CSSUnit.CSS_PERCENTAGE, lu.getFloatValue()); + + case UNSET: + return UnsetValue.getInstance(); + + case REVERT: + return RevertValue.getInstance(); + + case INITIAL: + return getDefaultValue(); + + case VAR: + case ATTR: + return createLexicalValue(lu); + + case CALC: + return createCalc(lu); + default: break; } @@ -96,38 +113,41 @@ public Value createFloatValue(short type, float floatValue) throws DOMException public Value computeValue(CSSStylableElement elt, String pseudo, CSSEngine engine, int idx, StyleMap sm, Value value) { if (value.getPrimitiveType() != Type.NUMERIC) { - return value; + if (value.getPrimitiveType() != Type.EXPRESSION) { + return value; + } + try { + return evaluateCalc((CalcValue) value, elt, pseudo, engine, idx, sm, CSSUnit.CSS_PX); + } catch (Exception e) { + return isInheritedProperty() ? null : getDefaultValue(); + } } - switch (value.getCSSUnit()) { + CSSContext ctx; + switch (value.getUnitType()) { case CSSUnit.CSS_NUMBER: case CSSUnit.CSS_PX: return value; case CSSUnit.CSS_MM: - CSSContext ctx = engine.getCSSContext(); float v = value.getFloatValue(); - return new FloatValue(CSSUnit.CSS_NUMBER, v / ctx.getPixelUnitToMillimeter()); + return new FloatValue(CSSUnit.CSS_NUMBER, v * 3.779527559055f); case CSSUnit.CSS_CM: - ctx = engine.getCSSContext(); v = value.getFloatValue(); - return new FloatValue(CSSUnit.CSS_NUMBER, v * 10f / ctx.getPixelUnitToMillimeter()); + return new FloatValue(CSSUnit.CSS_NUMBER, v * 37.79527559055f); case CSSUnit.CSS_IN: - ctx = engine.getCSSContext(); v = value.getFloatValue(); - return new FloatValue(CSSUnit.CSS_NUMBER, v * 25.4f / ctx.getPixelUnitToMillimeter()); + return new FloatValue(CSSUnit.CSS_NUMBER, v * 96f); case CSSUnit.CSS_PT: - ctx = engine.getCSSContext(); v = value.getFloatValue(); - return new FloatValue(CSSUnit.CSS_NUMBER, v * 25.4f / (72f * ctx.getPixelUnitToMillimeter())); + return new FloatValue(CSSUnit.CSS_NUMBER, v / 0.75f); case CSSUnit.CSS_PC: - ctx = engine.getCSSContext(); v = value.getFloatValue(); - return new FloatValue(CSSUnit.CSS_NUMBER, (v * 25.4f / (6f * ctx.getPixelUnitToMillimeter()))); + return new FloatValue(CSSUnit.CSS_NUMBER, v * 16f); case CSSUnit.CSS_EM: sm.putFontSizeRelative(idx, true); @@ -247,8 +267,8 @@ public Value computeValue(CSSStylableElement elt, String pseudo, CSSEngine engin // Maybe it is one of the new absolute length units try { value = new FloatValue(CSSUnit.CSS_NUMBER, - NumberValue.floatValueConversion(value.getFloatValue(), value.getCSSUnit(), CSSUnit.CSS_MM) - / engine.getCSSContext().getPixelUnitToMillimeter()); + NumberValue.floatValueConversion(value.getFloatValue(), value.getUnitType(), + CSSUnit.CSS_PX)); } catch (DOMException e) { } } @@ -256,6 +276,11 @@ public Value computeValue(CSSStylableElement elt, String pseudo, CSSEngine engin return value; } + protected Value evaluateCalc(CalcValue value, CSSStylableElement elt, String pseudo, CSSEngine engine, + int idx, StyleMap sm, short destUnit) throws DOMException { + return value.evaluate(elt, pseudo, engine, idx, sm, destUnit); + } + // // Orientation enumeration // diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/LexicalHelper.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/LexicalHelper.java new file mode 100644 index 000000000..5e70ce3ca --- /dev/null +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/LexicalHelper.java @@ -0,0 +1,43 @@ +/* + + See the NOTICE file distributed with this work for additional + information regarding copyright ownership. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + */ +package io.sf.carte.echosvg.css.engine.value; + +import java.io.IOException; +import java.io.StringReader; + +import io.sf.carte.doc.style.css.nsac.CSSParseException; +import io.sf.carte.doc.style.css.nsac.LexicalUnit; +import io.sf.carte.doc.style.css.parser.CSSParser; + +/** + * Lexical Helper + * + * @version $Id$ + */ +class LexicalHelper { + + public static LexicalUnit parsePropertyValue(String value) { + try { + return new CSSParser().parsePropertyValue(new StringReader(value)); + } catch (CSSParseException | IOException e) { + return null; + } + } + +} diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/LexicalValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/LexicalValue.java new file mode 100644 index 000000000..e26f7e321 --- /dev/null +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/LexicalValue.java @@ -0,0 +1,71 @@ +/* + + See the NOTICE file distributed with this work for additional + information regarding copyright ownership. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + */ +package io.sf.carte.echosvg.css.engine.value; + +import io.sf.carte.doc.style.css.nsac.LexicalUnit; + +/** + * A value containing {@code var()} or any PROXY value. + * + * @version $Id$ + */ +public class LexicalValue extends AbstractValue { + + private LexicalUnit lunit = null; + + /** + * Creates a new LexicalValue object. + * + * @param params the lexical unit with the {@code var()} function(s). + */ + public LexicalValue(LexicalUnit lunit) throws IllegalArgumentException { + super(); + this.lunit = lunit; + } + + /** + * A code defining the type of the value. + */ + @Override + public CssType getCssValueType() { + return CssType.PROXY; + } + + @Override + public Type getPrimitiveType() { + return Type.LEXICAL; + } + + public LexicalUnit getLexicalUnit() { + return lunit; + } + + @Override + public String getCssText() { + return lunit.toString(); + } + + @Override + public LexicalValue clone() { + LexicalValue clon = (LexicalValue) super.clone(); + clon.lunit = lunit; + return clon; + } + +} diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ListValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ListValue.java index d6aabf205..5d52eda02 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ListValue.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ListValue.java @@ -18,6 +18,10 @@ */ package io.sf.carte.echosvg.css.engine.value; +import java.util.Iterator; + +import org.w3c.dom.DOMException; + /** * This class represents a list of values. * @@ -25,6 +29,7 @@ * @version $Id$ */ public class ListValue extends AbstractValueList+ * See CSS + * Properties and Values API Level 1. + *
+ */ +public interface PropertyDefinition { + + /** + * Gets the property name. + * + * @return the property name. + */ + String getName(); + + /** + * Whether the property inherits or not. + * + * @return {@code true} if the property inherits. + */ + boolean inherits(); + + /** + * The initial value associated with the property. + * + * @return the initial value, or {@code null} if none was specified. + */ + LexicalUnit getInitialValue(); + + /** + * The syntax associated with the property. + *+ * If the syntax descriptor was not recognized, {@code *} will be used. + *
+ * + * @return the syntax. Cannot be {@code null}. + */ + CSSValueSyntax getSyntax(); + +} diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/RGBColorValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/RGBColorValue.java index e53a9d73a..3145b2f40 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/RGBColorValue.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/RGBColorValue.java @@ -173,9 +173,9 @@ public static RGBColorValue createLegacy(NumericValue r, NumericValue g, Numeric g = legacyRange(g); b = legacyRange(b); RGBColorValue rgb = new RGBColorValue(r, g, b); - rgb.pcntSpecified = r.getCSSUnit() == CSSUnit.CSS_PERCENTAGE - || g.getCSSUnit() == CSSUnit.CSS_PERCENTAGE - || b.getCSSUnit() == CSSUnit.CSS_PERCENTAGE; + rgb.pcntSpecified = r.getUnitType() == CSSUnit.CSS_PERCENTAGE + || g.getUnitType() == CSSUnit.CSS_PERCENTAGE + || b.getUnitType() == CSSUnit.CSS_PERCENTAGE; return rgb; } @@ -189,18 +189,18 @@ public static RGBColorValue createLegacy(NumericValue r, NumericValue g, Numeric */ private static NumericValue constantLegacyRange(NumericValue ch) throws DOMSyntaxException, IllegalArgumentException { - if (ch.getCSSUnit() == CSSUnit.CSS_NUMBER) { + if (ch.getUnitType() == CSSUnit.CSS_NUMBER) { if (ch.getPrimitiveType() == Type.NUMERIC) { ch = new ImmutableUnitValue(CSSUnit.CSS_NUMBER, ch.getFloatValue() / 255f); } else { throw new IllegalArgumentException("Cannot normalize value to [0,1] now: " + ch.getCssText()); } - } else if (ch.getCSSUnit() != CSSUnit.CSS_PERCENTAGE) { + } else if (ch.getUnitType() != CSSUnit.CSS_PERCENTAGE) { throw new DOMSyntaxException("RGB component must be a number or percentage, not a " - + CSSUnit.dimensionUnitString(ch.getCSSUnit()) + '.'); + + CSSUnit.dimensionUnitString(ch.getUnitType()) + '.'); } if (ch.handler != null) { - ch = new ImmutableUnitValue(ch.getCSSUnit(), ch.getFloatValue()); + ch = new ImmutableUnitValue(ch.getUnitType(), ch.getFloatValue()); } return ch; } @@ -215,15 +215,15 @@ private static NumericValue constantLegacyRange(NumericValue ch) */ private static NumericValue legacyRange(NumericValue ch) throws DOMSyntaxException, IllegalArgumentException { - if (ch.getCSSUnit() == CSSUnit.CSS_NUMBER) { + if (ch.getUnitType() == CSSUnit.CSS_NUMBER) { if (ch.getPrimitiveType() == Type.NUMERIC) { ch.setFloatValue(ch.getFloatValue() / 255f); } else { throw new IllegalArgumentException("Cannot normalize value to [0,1] now: " + ch.getCssText()); } - } else if (ch.getCSSUnit() != CSSUnit.CSS_PERCENTAGE) { + } else if (ch.getUnitType() != CSSUnit.CSS_PERCENTAGE) { throw new DOMSyntaxException("RGB component must be a number or percentage, not a " - + CSSUnit.dimensionUnitString(ch.getCSSUnit()) + '.'); + + CSSUnit.dimensionUnitString(ch.getUnitType()) + '.'); } return ch; } @@ -279,7 +279,7 @@ private String rgbComponentText(NumericValue comp, DecimalFormat df) { } float f; - if (comp.getCSSUnit() == CSSUnit.CSS_NUMBER) { + if (comp.getUnitType() == CSSUnit.CSS_NUMBER) { f = comp.getFloatValue() * 255f; } else { f = comp.getFloatValue() * 2.55f; @@ -288,7 +288,7 @@ private String rgbComponentText(NumericValue comp, DecimalFormat df) { } private String alphaComponentText(NumericValue alpha, DecimalFormat df) { - if (alphaPcntSpecified || alpha.getCSSUnit() == CSSUnit.CSS_NUMBER) { + if (alphaPcntSpecified || alpha.getUnitType() == CSSUnit.CSS_NUMBER) { return alpha.getCssText(); } @@ -320,7 +320,7 @@ public NumericValue getB() { * * @return the red component. */ - public Value getRed() { + public NumericValue getRed() { return red; } @@ -329,7 +329,7 @@ public Value getRed() { * * @return the green component. */ - public Value getGreen() { + public NumericValue getGreen() { return green; } @@ -338,7 +338,7 @@ public Value getGreen() { * * @return the blue component. */ - public Value getBlue() { + public NumericValue getBlue() { return blue; } @@ -354,7 +354,7 @@ public void setR(double r) { public void setR(CSSNumericValue r) throws DOMSyntaxException { red = component(r); componentChanged(red); - pcntSpecified = red.getCSSUnit() == CSSUnit.CSS_PERCENTAGE; + pcntSpecified = red.getUnitType() == CSSUnit.CSS_PERCENTAGE; } /** @@ -366,9 +366,9 @@ public void setR(CSSNumericValue r) throws DOMSyntaxException { */ private NumericValue component(CSSNumericValue c) throws DOMSyntaxException { NumericValue ch = (NumericValue) c; - if (ch.getCSSUnit() != CSSUnit.CSS_PERCENTAGE && ch.getCSSUnit() != CSSUnit.CSS_NUMBER) { + if (ch.getUnitType() != CSSUnit.CSS_PERCENTAGE && ch.getUnitType() != CSSUnit.CSS_NUMBER) { throw new DOMSyntaxException("RGB component must be a number or percentage, not a " - + CSSUnit.dimensionUnitString(ch.getCSSUnit()) + '.'); + + CSSUnit.dimensionUnitString(ch.getUnitType()) + '.'); } if (ch.handler != null) { ch = ch.clone(); @@ -411,7 +411,7 @@ public int getLength() throws DOMException { } @Override - public Value item(int index) throws DOMException { + public NumericValue item(int index) throws DOMException { switch (index) { case 0: return getR(); diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/RectManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/RectManager.java index 8a5d79264..e32fd6cb3 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/RectManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/RectManager.java @@ -21,8 +21,8 @@ import org.w3c.css.om.unit.CSSUnit; import org.w3c.dom.DOMException; +import io.sf.carte.doc.style.css.CSSValue.Type; import io.sf.carte.doc.style.css.nsac.LexicalUnit; -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; @@ -49,34 +49,53 @@ public abstract class RectManager extends LengthManager { * Implements {@link ValueManager#createValue(LexicalUnit,CSSEngine)}. */ @Override - public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { - switch (lu.getLexicalUnitType()) { + public Value createValue(final LexicalUnit lunit, CSSEngine engine) throws DOMException { + switch (lunit.getLexicalUnitType()) { case FUNCTION: - if (!lu.getFunctionName().equalsIgnoreCase("rect")) { + // This case could be removed + if (!lunit.getFunctionName().equalsIgnoreCase("rect")) { break; } case RECT_FUNCTION: - lu = lu.getParameters(); - Value top = createRectComponent(lu); - lu = lu.getNextLexicalUnit(); - if (lu == null || lu.getLexicalUnitType() != LexicalUnit.LexicalType.OPERATOR_COMMA) { - throw createMalformedRectDOMException(); - } - lu = lu.getNextLexicalUnit(); - Value right = createRectComponent(lu); - lu = lu.getNextLexicalUnit(); - if (lu == null || lu.getLexicalUnitType() != LexicalUnit.LexicalType.OPERATOR_COMMA) { - throw createMalformedRectDOMException(); + LexicalUnit lu = lunit.getParameters(); + try { + Value top = createRectComponent(lu); + lu = lu.getNextLexicalUnit(); + if (lu == null || lu.getLexicalUnitType() != LexicalUnit.LexicalType.OPERATOR_COMMA) { + throw createMalformedRectDOMException(); + } + lu = lu.getNextLexicalUnit(); + Value right = createRectComponent(lu); + lu = lu.getNextLexicalUnit(); + if (lu == null || lu.getLexicalUnitType() != LexicalUnit.LexicalType.OPERATOR_COMMA) { + throw createMalformedRectDOMException(); + } + lu = lu.getNextLexicalUnit(); + Value bottom = createRectComponent(lu); + lu = lu.getNextLexicalUnit(); + if (lu == null || lu.getLexicalUnitType() != LexicalUnit.LexicalType.OPERATOR_COMMA) { + throw createMalformedRectDOMException(); + } + lu = lu.getNextLexicalUnit(); + Value left = createRectComponent(lu); + return new RectValue(top, right, bottom, left); + } catch (CSSProxyValueException e) { + return createLexicalValue(lunit); } - lu = lu.getNextLexicalUnit(); - Value bottom = createRectComponent(lu); - lu = lu.getNextLexicalUnit(); - if (lu == null || lu.getLexicalUnitType() != LexicalUnit.LexicalType.OPERATOR_COMMA) { - throw createMalformedRectDOMException(); - } - lu = lu.getNextLexicalUnit(); - Value left = createRectComponent(lu); - return new RectValue(top, right, bottom, left); + + case UNSET: + return UnsetValue.getInstance(); + + case REVERT: + return RevertValue.getInstance(); + + case INITIAL: + return getDefaultValue(); + + case VAR: + case ATTR: + return createLexicalValue(lunit); + default: break; } @@ -90,14 +109,26 @@ private Value createRectComponent(LexicalUnit lu) throws DOMException { return ValueConstants.AUTO_VALUE; } break; + case DIMENSION: return createLength(lu); + case INTEGER: return new FloatValue(CSSUnit.CSS_NUMBER, lu.getIntegerValue()); + case REAL: return new FloatValue(CSSUnit.CSS_NUMBER, lu.getFloatValue()); + case PERCENTAGE: return new FloatValue(CSSUnit.CSS_PERCENTAGE, lu.getFloatValue()); + + case VAR: + case ATTR: + throw new CSSProxyValueException(); + + case CALC: + return createCalc(lu); + default: break; } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/RectValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/RectValue.java index f6dd3d454..b48bb532b 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/RectValue.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/RectValue.java @@ -113,7 +113,7 @@ void setTop(Value top) { * @throws DOMSyntaxException if the value is inadequate for a component. */ Value component(Value c) throws DOMSyntaxException { - short unit = c.getCSSUnit(); + short unit = c.getUnitType(); if (unit != CSSUnit.CSS_PERCENTAGE && unit != CSSUnit.CSS_NUMBER && !CSSUnit.isLengthUnitType(unit) && c.getPrimitiveType() != Type.IDENT) { throw new DOMSyntaxException("rect() component must be a length or percentage."); diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/RevertValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/RevertValue.java new file mode 100644 index 000000000..b69367d7c --- /dev/null +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/RevertValue.java @@ -0,0 +1,62 @@ +/* + + See the NOTICE file distributed with this work for additional + information regarding copyright ownership. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + */ +package io.sf.carte.echosvg.css.engine.value; + +/** + * This singleton class represents the 'revert' value. + * + */ +public final class RevertValue extends KeywordValue { + + /** + * The only instance of this class. + */ + private static final RevertValue INSTANCE = new RevertValue(); + + /** + * Creates a new UnsetValue object. + */ + RevertValue() { + } + + @Override + public String getValue() { + return "revert"; + } + + @Override + public Type getPrimitiveType() { + return Type.REVERT; + } + + @Override + public RevertValue clone() { + return INSTANCE; + } + + /** + * Get the instance of {@code revert}. + * + * @return the instance of {@code revert}. + */ + public static Value getInstance() { + return INSTANCE; + } + +} diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ShorthandManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ShorthandManager.java index 3d60ecada..6568f9d74 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ShorthandManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ShorthandManager.java @@ -27,8 +27,10 @@ * This interface represents the objects which provide support for shorthand * properties. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *
* @version $Id$ */ public interface ShorthandManager { @@ -53,7 +55,7 @@ public interface ShorthandManager { * * @param eng The current CSSEngine. * @param ph The property handler to use. - * @param lu The SAC lexical unit used to create the value. + * @param lu The NSAC lexical unit used to create the value. * @param imp The property priority. */ void setValues(CSSEngine eng, PropertyHandler ph, LexicalUnit lu, boolean imp) throws DOMException; @@ -65,6 +67,17 @@ interface PropertyHandler { void property(String name, LexicalUnit value, boolean important); + /** + * Process a longhand value that points to a shorthand that is pending lexical + * substitution. + * + * @param name the longhand property name. + * @param value the pending value that contains the shorthand's lexical + * value. + * @param important the priority. + */ + void pendingValue(String name, PendingValue value, boolean important); + } } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/TypedValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/TypedValue.java new file mode 100644 index 000000000..bd4193caa --- /dev/null +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/TypedValue.java @@ -0,0 +1,78 @@ +/* + + See the NOTICE file distributed with this work for additional + information regarding copyright ownership. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + */ +package io.sf.carte.echosvg.css.engine.value; + +import org.w3c.css.om.unit.CSSUnit; +import org.w3c.dom.DOMException; + +import io.sf.carte.doc.style.css.RGBAColor; +import io.sf.carte.doc.style.css.property.NumberValue; + +/** + * A gateway value between Typed OM and its internal representation. + * + * @version $Id$ + */ +public interface TypedValue extends Value, io.sf.carte.doc.style.css.CSSTypedValue { + + @Override + default short getUnitType() { + return CSSUnit.CSS_INVALID; + } + + @Override + default void setExpectInteger() throws DOMException { + throw new DOMException(DOMException.TYPE_MISMATCH_ERR, + "Expected an integer, found type " + getPrimitiveType()); + } + + @Override + default void setFloatValue(short unitType, float floatValue) throws DOMException { + setFloatValue(NumberValue.floatValueConversion(floatValue, unitType, getUnitType())); + } + + @Override + default float getFloatValue(short unitType) throws DOMException { + return NumberValue.floatValueConversion(getFloatValue(), getUnitType(), unitType); + } + + @Override + default void setStringValue(Type stringType, String stringValue) throws DOMException { + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Please use setValue()"); + } + + @Override + default RGBAColor toRGBColor() throws DOMException { + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Please use getColorValue()"); + } + + @Override + default boolean isCalculatedNumber() { + return false; + } + + @Override + default boolean isNumberZero() { + return false; + } + + @Override + TypedValue clone(); + +} diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/UnsetValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/UnsetValue.java new file mode 100644 index 000000000..a8f0ff68c --- /dev/null +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/UnsetValue.java @@ -0,0 +1,62 @@ +/* + + See the NOTICE file distributed with this work for additional + information regarding copyright ownership. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + */ +package io.sf.carte.echosvg.css.engine.value; + +/** + * This singleton class represents the 'unset' value. + * + */ +public final class UnsetValue extends KeywordValue { + + /** + * The only instance of this class. + */ + private static final UnsetValue INSTANCE = new UnsetValue(); + + /** + * Creates a new UnsetValue object. + */ + UnsetValue() { + } + + @Override + public String getValue() { + return "unset"; + } + + @Override + public Type getPrimitiveType() { + return Type.UNSET; + } + + @Override + public UnsetValue clone() { + return INSTANCE; + } + + /** + * Get the instance of {@code unset}. + * + * @return the instance of {@code unset}. + */ + public static Value getInstance() { + return INSTANCE; + } + +} diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/Value.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/Value.java index c5f71d553..4c94c2686 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/Value.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/Value.java @@ -19,17 +19,62 @@ package io.sf.carte.echosvg.css.engine.value; import org.w3c.css.om.typed.CSSCounterValue; +import org.w3c.css.om.typed.CSSStyleValue; +import org.w3c.css.om.unit.CSSUnit; import org.w3c.dom.DOMException; -import io.sf.carte.echosvg.css.dom.CSSValue; - /** * This interface represents a property value. * * @author See Git history. * @version $Id$ */ -public interface Value extends CSSValue { +public interface Value extends CSSVal, CSSStyleValue { + + /** + * Gets the css unit as in CSS4J's {@code CSSUnit}. + *+ * If the value has no valid CSS unit, returns {@code CSSUnit.CSS_INVALID}. + *
+ * + * @return the css unit as in CSS4J's {@code CSSUnit}. + */ + default short getUnitType() { + return CSSUnit.CSS_INVALID; + } + + /** + * Set the modification handler. + * + * @param handler the modification handler. + */ + void setModificationHandler(ValueModificationHandler handler); + + /** + * Get the modification handler. + * + * @return the modification handler, or {@code null} if there is no handler. + */ + ValueModificationHandler getModificationHandler(); + + /** + * Is this value a component? + * + * @return {@code true} if the value is a component. + */ + default boolean isComponent() { + return false; + } + + /** + * Do this value represent the given identifier? + * + * @param internedIdent the interned identifier string. + * @return {@code true} if the value is a component. + */ + default boolean isIdentifier(String internedIdent) { + return false; + } /** * Convenience method that either returns an identifier or throws an exception. @@ -43,6 +88,14 @@ default String getIdentifier() throws DOMException { return getIdentifierValue(); } + /** + * If this value is a unit value, set the float value. + * + * @param value the new value, in the current unit. + * @throws DOMException if the value is not a unit value. + */ + void setFloatValue(float value) throws DOMException; + /** * If this value is a list, give the item corresponding to the requested index. * If there is no item at such index, return {@code null} If this object is not @@ -81,47 +134,6 @@ default Value item(int index) { */ ColorValue getColorValue() throws DOMException; - /** - * If this value is a unit value, set the float value. - * - * @param value the new value, in the current unit. - * @throws DOMException if the value is not a unit value. - */ - void setFloatValue(float value) throws DOMException; - - /** - * Set the modification handler. - * - * @param handler the modification handler. - */ - void setModificationHandler(ValueModificationHandler handler); - - /** - * Get the modification handler. - * - * @return the modification handler, or {@code null} if there is no handler. - */ - ValueModificationHandler getModificationHandler(); - - /** - * Is this value a component? - * - * @return {@code true} if the value is a component. - */ - default boolean isComponent() { - return false; - } - - /** - * Do this value represent the given identifier? - * - * @param internedIdent the interned identifier string. - * @return {@code true} if the value is a component. - */ - default boolean isIdentifier(String internedIdent) { - return false; - } - /** * Create and return a copy of this object. *@@ -130,6 +142,7 @@ default boolean isIdentifier(String internedIdent) { * * @return a modifiable copy of this object. */ + @Override Value clone(); } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ValueConstants.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ValueConstants.java index 6a03e46bc..2a604c578 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ValueConstants.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ValueConstants.java @@ -20,6 +20,7 @@ import org.w3c.css.om.unit.CSSUnit; +import io.sf.carte.doc.style.css.nsac.LexicalUnit; import io.sf.carte.echosvg.util.CSSConstants; /** @@ -101,7 +102,7 @@ public interface ValueConstants { /** * The 'inherit' value. */ - Value INHERIT_VALUE = InheritValue.INSTANCE; + Value INHERIT_VALUE = InheritValue.getInstance(); /** * The 'all' keyword. @@ -828,4 +829,9 @@ public interface ValueConstants { */ Value TRANSPARENT_RGB_VALUE = RGBColorValue.createConstant(NUMBER_0, NUMBER_0, NUMBER_0, NUMBER_0); + /** + * A lexical unit with value zero. + */ + LexicalUnit ZERO_LEXICAL_UNIT = LexicalHelper.parsePropertyValue("0"); + } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ValueManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ValueManager.java index 8fee9a3a8..4eb295fc7 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ValueManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ValueManager.java @@ -21,8 +21,8 @@ import org.w3c.dom.DOMException; +import io.sf.carte.doc.style.css.CSSValue.Type; import io.sf.carte.doc.style.css.nsac.LexicalUnit; -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; @@ -59,6 +59,19 @@ public interface ValueManager { */ boolean isAdditiveProperty(); + /** + * Allows URL values. + *
+ * If this property accepts URL values, then {@code attr()} values cannot be + * used. + *
+ * + * @return {@code true} if URL values are allowed by this property. + */ + default boolean allowsURL() { + return false; + } + /** * Returns the type of value this manager handles. This should be one of the * TYPE_* constants defined in {@link io.sf.carte.echosvg.util.SVGTypes}. diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/ClipManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/ClipManager.java index d40f3c4c2..6b740ce7b 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/ClipManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/ClipManager.java @@ -20,11 +20,12 @@ import org.w3c.dom.DOMException; +import io.sf.carte.doc.style.css.CSSValue.Type; import io.sf.carte.doc.style.css.nsac.LexicalUnit; -import io.sf.carte.echosvg.css.dom.CSSValue.Type; import io.sf.carte.echosvg.css.engine.CSSEngine; -import io.sf.carte.echosvg.css.engine.value.InheritValue; import io.sf.carte.echosvg.css.engine.value.RectManager; +import io.sf.carte.echosvg.css.engine.value.RevertValue; +import io.sf.carte.echosvg.css.engine.value.UnsetValue; import io.sf.carte.echosvg.css.engine.value.Value; import io.sf.carte.echosvg.css.engine.value.ValueConstants; import io.sf.carte.echosvg.css.engine.value.ValueManager; @@ -96,13 +97,28 @@ public Value getDefaultValue() { @Override public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { switch (lu.getLexicalUnitType()) { - case INHERIT: - return InheritValue.INSTANCE; - case IDENT: if (lu.getStringValue().equalsIgnoreCase(CSSConstants.CSS_AUTO_VALUE)) { return ValueConstants.AUTO_VALUE; } + break; + + case INHERIT: + return ValueConstants.INHERIT_VALUE; + + case UNSET: + return UnsetValue.getInstance(); + + case REVERT: + return RevertValue.getInstance(); + + case INITIAL: + return getDefaultValue(); + + case VAR: + case ATTR: + return createLexicalValue(lu); + default: break; } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/CursorManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/CursorManager.java index 3a393a584..7a3698bce 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/CursorManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/CursorManager.java @@ -22,15 +22,17 @@ import org.w3c.dom.DOMException; +import io.sf.carte.doc.style.css.CSSValue.Type; import io.sf.carte.doc.style.css.nsac.LexicalUnit; -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; import io.sf.carte.echosvg.css.engine.value.AbstractValueManager; import io.sf.carte.echosvg.css.engine.value.ListValue; +import io.sf.carte.echosvg.css.engine.value.RevertValue; import io.sf.carte.echosvg.css.engine.value.StringMap; import io.sf.carte.echosvg.css.engine.value.URIValue; +import io.sf.carte.echosvg.css.engine.value.UnsetValue; import io.sf.carte.echosvg.css.engine.value.Value; import io.sf.carte.echosvg.css.engine.value.ValueConstants; import io.sf.carte.echosvg.css.engine.value.ValueManager; @@ -95,6 +97,11 @@ public boolean isAdditiveProperty() { return false; } + @Override + public boolean allowsURL() { + return true; + } + /** * Implements {@link ValueManager#getPropertyType()}. */ @@ -123,12 +130,10 @@ public Value getDefaultValue() { * Implements {@link ValueManager#createValue(LexicalUnit,CSSEngine)}. */ @Override - public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { + public Value createValue(final LexicalUnit lunit, CSSEngine engine) throws DOMException { ListValue result = new ListValue(); - switch (lu.getLexicalUnitType()) { - case INHERIT: - return ValueConstants.INHERIT_VALUE; - + LexicalUnit lu = lunit; + switch (lunit.getLexicalUnitType()) { case URI: do { result.append( @@ -138,6 +143,9 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { throw createMalformedLexicalUnitDOMException(); } if (lu.getLexicalUnitType() != LexicalUnit.LexicalType.OPERATOR_COMMA) { + if (lu.getLexicalUnitType() == LexicalUnit.LexicalType.VAR) { + return createLexicalValue(lunit); + } throw createInvalidLexicalUnitDOMException(lu.getLexicalUnitType()); } lu = lu.getNextLexicalUnit(); @@ -146,6 +154,9 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { } } while (lu.getLexicalUnitType() == LexicalUnit.LexicalType.URI); if (lu.getLexicalUnitType() != LexicalUnit.LexicalType.IDENT) { + if (lu.getLexicalUnitType() == LexicalUnit.LexicalType.VAR) { + return createLexicalValue(lunit); + } throw createInvalidLexicalUnitDOMException(lu.getLexicalUnitType()); } // Fall through... @@ -159,6 +170,22 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { result.append((Value) v); lu = lu.getNextLexicalUnit(); break; + + case INHERIT: + return ValueConstants.INHERIT_VALUE; + + case UNSET: + return UnsetValue.getInstance(); + + case REVERT: + return RevertValue.getInstance(); + + case INITIAL: + return getDefaultValue(); + + case VAR: + return createLexicalValue(lunit); + default: break; } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/FontFamilyManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/FontFamilyManager.java index 750c7c1fc..a3a784523 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/FontFamilyManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/FontFamilyManager.java @@ -31,8 +31,10 @@ import io.sf.carte.echosvg.css.engine.value.AbstractValueManager; import io.sf.carte.echosvg.css.engine.value.IdentValue; import io.sf.carte.echosvg.css.engine.value.ListValue; +import io.sf.carte.echosvg.css.engine.value.RevertValue; import io.sf.carte.echosvg.css.engine.value.StringMap; import io.sf.carte.echosvg.css.engine.value.StringValue; +import io.sf.carte.echosvg.css.engine.value.UnsetValue; import io.sf.carte.echosvg.css.engine.value.Value; import io.sf.carte.echosvg.css.engine.value.ValueConstants; import io.sf.carte.echosvg.css.engine.value.ValueManager; @@ -53,11 +55,14 @@ public class FontFamilyManager extends AbstractValueManager { /** * The default value. */ - protected static final ListValue DEFAULT_VALUE = new ListValue(); - static { - DEFAULT_VALUE.append(new StringValue("Arial")); - DEFAULT_VALUE.append(new StringValue("Helvetica")); - DEFAULT_VALUE.append(IdentValue.createConstant(CSSConstants.CSS_SANS_SERIF_VALUE)); + protected static final ListValue DEFAULT_VALUE = createDefaultValue(); + + private static ListValue createDefaultValue() { + ListValue def = new ListValue(',', 4); + def.append(new StringValue("Arial")); + def.append(new StringValue("Helvetica")); + def.append(IdentValue.createConstant(CSSConstants.CSS_SANS_SERIF_VALUE)); + return def.createUnmodifiableView(); } /** @@ -117,7 +122,6 @@ public String getPropertyName() { */ @Override public Value getDefaultValue() { - // Do not clone this value return DEFAULT_VALUE; } @@ -125,18 +129,32 @@ public Value getDefaultValue() { * Implements {@link ValueManager#createValue(LexicalUnit,CSSEngine)}. */ @Override - public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { - switch (lu.getLexicalUnitType()) { + public Value createValue(final LexicalUnit lunit, CSSEngine engine) throws DOMException { + switch (lunit.getLexicalUnitType()) { case INHERIT: return ValueConstants.INHERIT_VALUE; + case UNSET: + return UnsetValue.getInstance(); + + case REVERT: + return RevertValue.getInstance(); + + case INITIAL: + return getDefaultValue(); + + case VAR: + case ATTR: + return createLexicalValue(lunit); + default: - throw createInvalidLexicalUnitDOMException(lu.getLexicalUnitType()); + throw createInvalidLexicalUnitDOMException(lunit.getLexicalUnitType()); case IDENT: case STRING: } ListValue result = new ListValue(); + LexicalUnit lu = lunit; for (;;) { switch (lu.getLexicalUnitType()) { case STRING: @@ -171,12 +189,22 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { result.append((v != null) ? v : new StringValue(id)); } break; + + case VAR: + case ATTR: + return createLexicalValue(lunit); + default: } - if (lu == null) + if (lu == null) { return result; - if (lu.getLexicalUnitType() != LexicalUnit.LexicalType.OPERATOR_COMMA) + } + if (lu.getLexicalUnitType() != LexicalUnit.LexicalType.OPERATOR_COMMA) { + if (lu.getLexicalUnitType() == LexicalUnit.LexicalType.VAR) { + return createLexicalValue(lunit); + } throw createInvalidLexicalUnitDOMException(lu.getLexicalUnitType()); + } lu = lu.getNextLexicalUnit(); if (lu == null) throw createMalformedLexicalUnitDOMException(); @@ -185,13 +213,7 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { private boolean isIdentOrNumber(LexicalUnit lu) { LexicalType type = lu.getLexicalUnitType(); - switch (type) { - case IDENT: - case INTEGER: - return true; - default: - return false; - } + return type == LexicalType.IDENT || type == LexicalType.INTEGER; } /** diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/FontShorthandManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/FontShorthandManager.java index aa4641841..5846bab8e 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/FontShorthandManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/FontShorthandManager.java @@ -26,15 +26,30 @@ import java.util.Set; import org.w3c.css.om.unit.CSSUnit; +import org.w3c.dom.DOMException; +import io.sf.carte.doc.style.css.CSSExpressionValue; +import io.sf.carte.doc.style.css.CSSValue; +import io.sf.carte.doc.style.css.CSSValue.Type; +import io.sf.carte.doc.style.css.CSSValueSyntax.Match; import io.sf.carte.doc.style.css.nsac.CSSParseException; import io.sf.carte.doc.style.css.nsac.LexicalUnit; import io.sf.carte.doc.style.css.parser.CSSParser; +import io.sf.carte.doc.style.css.parser.SyntaxParser; +import io.sf.carte.doc.style.css.property.StyleValue; +import io.sf.carte.doc.style.css.property.ValueFactory; import io.sf.carte.echosvg.css.engine.CSSEngine; +import io.sf.carte.echosvg.css.engine.CSSStylableElement; +import io.sf.carte.echosvg.css.engine.StyleMap; import io.sf.carte.echosvg.css.engine.value.AbstractValueFactory; +import io.sf.carte.echosvg.css.engine.value.CSSProxyValueException; +import io.sf.carte.echosvg.css.engine.value.CalcValue; +import io.sf.carte.echosvg.css.engine.value.FloatValue; import io.sf.carte.echosvg.css.engine.value.IdentifierManager; +import io.sf.carte.echosvg.css.engine.value.PendingValue; import io.sf.carte.echosvg.css.engine.value.ShorthandManager; import io.sf.carte.echosvg.css.engine.value.StringMap; +import io.sf.carte.echosvg.css.engine.value.Value; import io.sf.carte.echosvg.css.engine.value.ValueManager; import io.sf.carte.echosvg.util.CSSConstants; @@ -146,17 +161,29 @@ public void handleSystemFont(CSSEngine eng, ShorthandManager.PropertyHandler ph, * {@link ShorthandManager#setValues(CSSEngine,ShorthandManager.PropertyHandler,LexicalUnit,boolean)}. */ @Override - public void setValues(CSSEngine eng, ShorthandManager.PropertyHandler ph, LexicalUnit lu, boolean imp) { - switch (lu.getLexicalUnitType()) { - case INHERIT: - return; + public void setValues(CSSEngine eng, ShorthandManager.PropertyHandler ph, final LexicalUnit lunit, + boolean imp) { + switch (lunit.getLexicalUnitType()) { case IDENT: { - String s = lu.getStringValue().toLowerCase(Locale.ROOT); + String s = lunit.getStringValue().toLowerCase(Locale.ROOT); if (values.contains(s)) { handleSystemFont(eng, ph, s, imp); return; } + break; } + + case INHERIT: + case UNSET: + case REVERT: + return; + + case VAR: + case ATTR: + setPendingLonghands(eng, ph, lunit, imp, + eng.getPropertyIndex(CSSConstants.CSS_LINE_HEIGHT_PROPERTY)); + return; + default: break; } @@ -190,6 +217,7 @@ public void setValues(CSSEngine eng, ShorthandManager.PropertyHandler ph, Lexica // These are all optional. boolean svwDone = false; + LexicalUnit lu = lunit; LexicalUnit intLU = null; while (!svwDone && (lu != null)) { switch (lu.getLexicalUnitType()) { @@ -237,6 +265,11 @@ public void setValues(CSSEngine eng, ShorthandManager.PropertyHandler ph, Lexica svwDone = true; break; + case VAR: + case ATTR: + setPendingLonghands(eng, ph, lunit, imp, lh); + return; + default: // All other must be size,'/line-height', family svwDone = true; break; @@ -270,6 +303,23 @@ public void setValues(CSSEngine eng, ShorthandManager.PropertyHandler ph, Lexica fontSize = lu; lu = lu.getNextLexicalUnit(); break; + + case VAR: + case ATTR: + setPendingLonghands(eng, ph, lunit, imp, lh); + return; + + case CALC: + Value calc = createFontSizeCalc(lu); + if (calc.getCssValueType() == CSSValue.CssType.PROXY) { + throw new CSSProxyValueException(); + } else if (calc.getPrimitiveType() != Type.EXPRESSION || ((CalcValue) calc).getExpressionDelegate() + .matches(new SyntaxParser().parseSyntax("+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *
* @version $Id$ */ public class MarkerShorthandManager extends AbstractValueFactory implements ShorthandManager { @@ -68,9 +76,33 @@ public boolean isAdditiveProperty() { @Override public void setValues(CSSEngine eng, ShorthandManager.PropertyHandler ph, LexicalUnit lu, boolean imp) throws DOMException { + switch (lu.getLexicalUnitType()) { + case VAR: + setPendingLonghands(eng, ph, lu, imp); + /* fall-through */ + case INHERIT: + case UNSET: + return; + case INITIAL: + // none + try { + lu = new CSSParser().parsePropertyValue(new StringReader(CSSConstants.CSS_NONE_VALUE)); + } catch (CSSParseException | IOException e) { + } + default: + break; + } + ph.property(CSSConstants.CSS_MARKER_END_PROPERTY, lu, imp); ph.property(CSSConstants.CSS_MARKER_MID_PROPERTY, lu, imp); ph.property(CSSConstants.CSS_MARKER_START_PROPERTY, lu, imp); } + private void setPendingLonghands(CSSEngine eng, PropertyHandler ph, LexicalUnit lu, boolean imp) { + PendingValue pending = new PendingValue(getPropertyName(), lu); + ph.pendingValue(CSSConstants.CSS_MARKER_END_PROPERTY, pending, imp); + ph.pendingValue(CSSConstants.CSS_MARKER_MID_PROPERTY, pending, imp); + ph.pendingValue(CSSConstants.CSS_MARKER_START_PROPERTY, pending, imp); + } + } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/MaskManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/MaskManager.java index 7181b4807..813a76a56 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/MaskManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/MaskManager.java @@ -20,11 +20,13 @@ import org.w3c.dom.DOMException; +import io.sf.carte.doc.style.css.CSSValue.Type; import io.sf.carte.doc.style.css.nsac.LexicalUnit; -import io.sf.carte.echosvg.css.dom.CSSValue.Type; import io.sf.carte.echosvg.css.engine.CSSEngine; import io.sf.carte.echosvg.css.engine.value.AbstractValueManager; +import io.sf.carte.echosvg.css.engine.value.RevertValue; import io.sf.carte.echosvg.css.engine.value.URIValue; +import io.sf.carte.echosvg.css.engine.value.UnsetValue; import io.sf.carte.echosvg.css.engine.value.Value; import io.sf.carte.echosvg.css.engine.value.ValueConstants; import io.sf.carte.echosvg.css.engine.value.ValueManager; @@ -66,6 +68,11 @@ public boolean isAdditiveProperty() { return false; } + @Override + public boolean allowsURL() { + return true; + } + /** * Implements {@link ValueManager#getPropertyType()}. */ @@ -96,9 +103,6 @@ public Value getDefaultValue() { @Override public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { switch (lu.getLexicalUnitType()) { - case INHERIT: - return ValueConstants.INHERIT_VALUE; - case URI: return new URIValue(lu.getStringValue(), resolveURI(engine.getCSSBaseURI(), lu.getStringValue())); @@ -106,6 +110,22 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { if (lu.getStringValue().equalsIgnoreCase(CSSConstants.CSS_NONE_VALUE)) { return ValueConstants.NONE_VALUE; } + throw createInvalidIdentifierDOMException(lu.getStringValue()); + + case INHERIT: + return ValueConstants.INHERIT_VALUE; + + case UNSET: + return UnsetValue.getInstance(); + + case REVERT: + return RevertValue.getInstance(); + + case INITIAL: + return getDefaultValue(); + + case VAR: + return createLexicalValue(lu); default: break; diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/OpacityManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/OpacityManager.java index da37217b3..7466b1ef1 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/OpacityManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/OpacityManager.java @@ -21,10 +21,16 @@ import org.w3c.css.om.unit.CSSUnit; import org.w3c.dom.DOMException; +import io.sf.carte.doc.style.css.CSSValue; +import io.sf.carte.doc.style.css.CSSValue.Type; import io.sf.carte.doc.style.css.nsac.LexicalUnit; import io.sf.carte.echosvg.css.engine.CSSEngine; import io.sf.carte.echosvg.css.engine.value.AbstractValueManager; +import io.sf.carte.echosvg.css.engine.value.CSSProxyValueException; +import io.sf.carte.echosvg.css.engine.value.CalcValue; import io.sf.carte.echosvg.css.engine.value.FloatValue; +import io.sf.carte.echosvg.css.engine.value.RevertValue; +import io.sf.carte.echosvg.css.engine.value.UnsetValue; import io.sf.carte.echosvg.css.engine.value.Value; import io.sf.carte.echosvg.css.engine.value.ValueConstants; import io.sf.carte.echosvg.css.engine.value.ValueManager; @@ -113,15 +119,37 @@ public Value getDefaultValue() { @Override public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { switch (lu.getLexicalUnitType()) { - case INHERIT: - return ValueConstants.INHERIT_VALUE; - case INTEGER: return new FloatValue(CSSUnit.CSS_NUMBER, lu.getIntegerValue()); case REAL: return new FloatValue(CSSUnit.CSS_NUMBER, lu.getFloatValue()); + case INHERIT: + return ValueConstants.INHERIT_VALUE; + + case UNSET: + return UnsetValue.getInstance(); + + case REVERT: + return RevertValue.getInstance(); + + case INITIAL: + return getDefaultValue(); + + case VAR: + case ATTR: + return createLexicalValue(lu); + + case CALC: + Value calc = createCalc(lu); + if (calc.getCssValueType() == CSSValue.CssType.PROXY) { + throw new CSSProxyValueException(); + } else if (calc.getPrimitiveType() != Type.EXPRESSION) { + break; + } + return ((CalcValue) calc).evaluate(null, null, engine, -1, null, CSSUnit.CSS_NUMBER); + default: break; } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/SVGPaintManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/SVGPaintManager.java index f31d64e74..0f59bd6bd 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/SVGPaintManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/SVGPaintManager.java @@ -84,6 +84,11 @@ public boolean isAdditiveProperty() { return true; } + @Override + public boolean allowsURL() { + return true; + } + /** * Implements {@link ValueManager#getPropertyType()}. */ diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/SpacingManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/SpacingManager.java index 85c7f57f9..64fcfdc58 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/SpacingManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/SpacingManager.java @@ -20,8 +20,8 @@ import org.w3c.dom.DOMException; +import io.sf.carte.doc.style.css.CSSValue.Type; import io.sf.carte.doc.style.css.nsac.LexicalUnit; -import io.sf.carte.echosvg.css.dom.CSSValue.Type; import io.sf.carte.echosvg.css.engine.CSSEngine; import io.sf.carte.echosvg.css.engine.value.LengthManager; import io.sf.carte.echosvg.css.engine.value.Value; @@ -115,6 +115,7 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { return ValueConstants.NORMAL_VALUE; } throw createInvalidIdentifierDOMException(lu.getStringValue()); + default: break; } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/StrokeDasharrayManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/StrokeDasharrayManager.java index fa976a1f1..0bf1cf7dd 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/StrokeDasharrayManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/StrokeDasharrayManager.java @@ -20,13 +20,15 @@ import org.w3c.dom.DOMException; +import io.sf.carte.doc.style.css.CSSValue.Type; import io.sf.carte.doc.style.css.nsac.LexicalUnit; -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; import io.sf.carte.echosvg.css.engine.value.LengthManager; import io.sf.carte.echosvg.css.engine.value.ListValue; +import io.sf.carte.echosvg.css.engine.value.RevertValue; +import io.sf.carte.echosvg.css.engine.value.UnsetValue; import io.sf.carte.echosvg.css.engine.value.Value; import io.sf.carte.echosvg.css.engine.value.ValueConstants; import io.sf.carte.echosvg.css.engine.value.ValueManager; @@ -96,25 +98,48 @@ public Value getDefaultValue() { * Implements {@link ValueManager#createValue(LexicalUnit,CSSEngine)}. */ @Override - public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { - switch (lu.getLexicalUnitType()) { - case INHERIT: - return ValueConstants.INHERIT_VALUE; - + public Value createValue(final LexicalUnit lunit, CSSEngine engine) throws DOMException { + switch (lunit.getLexicalUnitType()) { case IDENT: - if (lu.getStringValue().equalsIgnoreCase(CSSConstants.CSS_NONE_VALUE)) { + if (lunit.getStringValue().equalsIgnoreCase(CSSConstants.CSS_NONE_VALUE)) { return ValueConstants.NONE_VALUE; } - throw createInvalidIdentifierDOMException(lu.getStringValue()); + throw createInvalidIdentifierDOMException(lunit.getStringValue()); + + case INHERIT: + return ValueConstants.INHERIT_VALUE; + + case UNSET: + return UnsetValue.getInstance(); + + case REVERT: + return RevertValue.getInstance(); + + case INITIAL: + return getDefaultValue(); + + case VAR: + case ATTR: + return createLexicalValue(lunit); default: + /* + * "A list of comma and/or white space separated+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *
* @version $Id$ */ public class MarginShorthandManager extends AbstractValueFactory implements ShorthandManager { @@ -69,14 +74,40 @@ public boolean isAdditiveProperty() { * {@link ShorthandManager#setValues(CSSEngine,ShorthandManager.PropertyHandler,LexicalUnit,boolean)}. */ @Override - public void setValues(CSSEngine eng, ShorthandManager.PropertyHandler ph, LexicalUnit lu, boolean imp) - throws DOMException { - if (lu.getLexicalUnitType() == LexicalUnit.LexicalType.INHERIT) + public void setValues(CSSEngine eng, ShorthandManager.PropertyHandler ph, final LexicalUnit lunit, + boolean imp) throws DOMException { + switch (lunit.getLexicalUnitType()) { + case INHERIT: return; + case UNSET: + case REVERT: + case INITIAL: + // Set defaults + LexicalUnit luZero = ValueConstants.ZERO_LEXICAL_UNIT; + ph.property(SVG12CSSConstants.CSS_MARGIN_TOP_PROPERTY, luZero, imp); + ph.property(SVG12CSSConstants.CSS_MARGIN_RIGHT_PROPERTY, luZero, imp); + ph.property(SVG12CSSConstants.CSS_MARGIN_BOTTOM_PROPERTY, luZero, imp); + ph.property(SVG12CSSConstants.CSS_MARGIN_LEFT_PROPERTY, luZero, imp); + break; + + case VAR: + case ATTR: + setPendingLonghands(eng, ph, lunit, imp); + return; + + default: + break; + } + + LexicalUnit lu = lunit; LexicalUnit[] lus = new LexicalUnit[4]; int cnt = 0; while (lu != null) { + if (lu.getLexicalUnitType() == LexicalType.VAR) { + setPendingLonghands(eng, ph, lunit, imp); + return; + } if (cnt == 4) throw createInvalidLexicalUnitDOMException(lu.getLexicalUnitType()); lus[cnt++] = lu; @@ -102,4 +133,12 @@ public void setValues(CSSEngine eng, ShorthandManager.PropertyHandler ph, Lexica ph.property(SVG12CSSConstants.CSS_MARGIN_LEFT_PROPERTY, lus[3], imp); } + private void setPendingLonghands(CSSEngine eng, PropertyHandler ph, LexicalUnit lunit, boolean imp) { + PendingValue pending = new PendingValue(getPropertyName(), lunit); + ph.pendingValue(SVG12CSSConstants.CSS_MARGIN_TOP_PROPERTY, pending, imp); + ph.pendingValue(SVG12CSSConstants.CSS_MARGIN_RIGHT_PROPERTY, pending, imp); + ph.pendingValue(SVG12CSSConstants.CSS_MARGIN_BOTTOM_PROPERTY, pending, imp); + ph.pendingValue(SVG12CSSConstants.CSS_MARGIN_LEFT_PROPERTY, pending, imp); + } + } diff --git a/echosvg-css/src/main/resources/io/sf/carte/echosvg/css/engine/value/resources/Messages.properties b/echosvg-css/src/main/resources/io/sf/carte/echosvg/css/engine/value/resources/Messages.properties index 30f1da964..ac273ea58 100644 --- a/echosvg-css/src/main/resources/io/sf/carte/echosvg/css/engine/value/resources/Messages.properties +++ b/echosvg-css/src/main/resources/io/sf/carte/echosvg/css/engine/value/resources/Messages.properties @@ -29,7 +29,7 @@ The given string type ({1}) is invalid for \ the "{0}" property. invalid.identifier = \ -The "{1}" identifier is not a valid value for the "{0}" property. +The "{1}" identifier is not a valid value for the "{0}" property. # !!! choices limited to 30 (java.text bug). @@ -45,8 +45,11 @@ The given CSS primitive value ({1}) represents an invalid type for the "{0}". invalid.float.value = \ The number ''{1}'' represents an invalid value for the ''{0}'' property. +invalid.color.component.unit = \ +The "{0}" property does not support color values with type #{1} components. + invalid.rgb.component.unit = \ -The "{0}" property does not support RGB values with type #{1} components. +The "{0}" property does not support RGB values with type #{1} components. malformed.lexical.unit = \ A malformed value was assigned to a "{0}" property. diff --git a/echosvg-dom/src/main/java/io/sf/carte/echosvg/dom/ExtensibleDOMImplementation.java b/echosvg-dom/src/main/java/io/sf/carte/echosvg/dom/ExtensibleDOMImplementation.java index 80c6908fb..379665809 100644 --- a/echosvg-dom/src/main/java/io/sf/carte/echosvg/dom/ExtensibleDOMImplementation.java +++ b/echosvg-dom/src/main/java/io/sf/carte/echosvg/dom/ExtensibleDOMImplementation.java @@ -35,7 +35,7 @@ import org.w3c.dom.view.ViewCSS; import io.sf.carte.doc.style.css.nsac.Parser; -import io.sf.carte.doc.style.css.parser.CSSParser; +import io.sf.carte.doc.style.css.om.CSSOMParser; import io.sf.carte.echosvg.css.engine.CSSContext; import io.sf.carte.echosvg.css.engine.CSSEngine; import io.sf.carte.echosvg.css.engine.value.ShorthandManager; @@ -117,7 +117,7 @@ public void registerCustomCSSShorthandManager(ShorthandManager sm) { * Creates new CSSEngine and attach it to the document. */ public CSSEngine createCSSEngine(AbstractStylableDocument doc, CSSContext ctx) { - Parser p = new CSSParser(); + Parser p = new CSSOMParser(); ValueManager[] vms; if (customValueManagers == null) { diff --git a/echosvg-parser/src/main/java/io/sf/carte/echosvg/parser/UnitProcessor.java b/echosvg-parser/src/main/java/io/sf/carte/echosvg/parser/UnitProcessor.java index a6ceac1ff..d7f9cb77f 100644 --- a/echosvg-parser/src/main/java/io/sf/carte/echosvg/parser/UnitProcessor.java +++ b/echosvg-parser/src/main/java/io/sf/carte/echosvg/parser/UnitProcessor.java @@ -144,15 +144,15 @@ public static float svgToUserSpace(float v, short type, short d, Context ctx) { case SVGLength.SVG_LENGTHTYPE_PX: return v; case SVGLength.SVG_LENGTHTYPE_MM: - return (v / ctx.getPixelUnitToMillimeter()); + return v * 3.779527559055f; // 96 / 25.4 case SVGLength.SVG_LENGTHTYPE_CM: - return (v * 10f / ctx.getPixelUnitToMillimeter()); + return v * 37.79527559055f; // 96 / 2.54 case SVGLength.SVG_LENGTHTYPE_IN: - return (v * 25.4f / ctx.getPixelUnitToMillimeter()); + return v * 96f; case SVGLength.SVG_LENGTHTYPE_PT: - return (v * 25.4f / (72f * ctx.getPixelUnitToMillimeter())); + return v / 0.75f; // Mult. by 96 / 72 case SVGLength.SVG_LENGTHTYPE_PC: - return (v * 25.4f / (6f * ctx.getPixelUnitToMillimeter())); + return v * 16f; // 96 / 6 case SVGLength.SVG_LENGTHTYPE_EMS: return emsToPixels(v, d, ctx); case SVGLength.SVG_LENGTHTYPE_EXS: @@ -179,15 +179,15 @@ public static float userSpaceToSVG(float v, short type, short d, Context ctx) { case SVGLength.SVG_LENGTHTYPE_PX: return v; case SVGLength.SVG_LENGTHTYPE_MM: - return (v * ctx.getPixelUnitToMillimeter()); + return v * 0.26458333333333f; // 25.4/96 case SVGLength.SVG_LENGTHTYPE_CM: - return (v * ctx.getPixelUnitToMillimeter() / 10f); + return v * 0.026458333333333f; // 2.54/96 case SVGLength.SVG_LENGTHTYPE_IN: - return (v * ctx.getPixelUnitToMillimeter() / 25.4f); + return v / 96f; case SVGLength.SVG_LENGTHTYPE_PT: - return (v * (72f * ctx.getPixelUnitToMillimeter()) / 25.4f); + return v * 0.75f; // 72/96 case SVGLength.SVG_LENGTHTYPE_PC: - return (v * (6f * ctx.getPixelUnitToMillimeter()) / 25.4f); + return v / 16f; case SVGLength.SVG_LENGTHTYPE_EMS: return pixelsToEms(v, d, ctx); case SVGLength.SVG_LENGTHTYPE_EXS: @@ -415,20 +415,9 @@ public interface Context { Element getElement(); /** - * Returns the size of a px CSS unit in millimeters. + * Returns the resolution in {@code dpi}. */ - float getPixelUnitToMillimeter(); - - /** - * Returns the size of a px CSS unit in millimeters. This will be removed after - * next release. - * - * @see #getPixelUnitToMillimeter() - */ - @Deprecated(forRemoval = true) - default float getPixelToMM() { - return getPixelUnitToMillimeter(); - } + float getResolution(); /** * Returns the font-size value. diff --git a/echosvg-svg-dom/src/main/java/io/sf/carte/echosvg/dom/svg/SVGContext.java b/echosvg-svg-dom/src/main/java/io/sf/carte/echosvg/dom/svg/SVGContext.java index 86e7fbe14..564b86013 100644 --- a/echosvg-svg-dom/src/main/java/io/sf/carte/echosvg/dom/svg/SVGContext.java +++ b/echosvg-svg-dom/src/main/java/io/sf/carte/echosvg/dom/svg/SVGContext.java @@ -38,8 +38,13 @@ public interface SVGContext { /** * Returns the size of a px CSS unit in millimeters. + * + * @deprecated Use {@link #getResolution()} instead. */ - float getPixelUnitToMillimeter(); + @Deprecated + default float getPixelUnitToMillimeter() { + return 25.4f / getResolution(); + } /** * Returns the size of a px CSS unit in millimeters. This will be removed after @@ -52,6 +57,11 @@ default float getPixelToMM() { return getPixelUnitToMillimeter(); } + /** + * Returns the resolution in dpi. + */ + float getResolution(); + /** * Returns the tight bounding box in current user space (i.e., after application * of the transform attribute, if any) on the geometry of all contained graphics diff --git a/echosvg-swing/src/main/java/io/sf/carte/echosvg/swing/svg/JSVGComponent.java b/echosvg-swing/src/main/java/io/sf/carte/echosvg/swing/svg/JSVGComponent.java index 6732d549d..8404058e0 100644 --- a/echosvg-swing/src/main/java/io/sf/carte/echosvg/swing/svg/JSVGComponent.java +++ b/echosvg-swing/src/main/java/io/sf/carte/echosvg/swing/svg/JSVGComponent.java @@ -2505,6 +2505,25 @@ public void run() { } } + @Override + public float getResolution() { + if (EventQueue.isDispatchThread()) { + return userAgent.getResolution(); + } else { + class Query implements Runnable { + float result; + + @Override + public void run() { + result = userAgent.getResolution(); + } + } + Query q = new Query(); + invokeAndWait(q); + return q.result; + } + } + /** * Returns the default font family. */ @@ -3229,15 +3248,12 @@ public boolean showConfirm(String message) { return JSVGComponent.this.showConfirm(message); } - /** - * Returns the size of a px CSS unit in millimeters. - */ @Override - public float getPixelUnitToMillimeter() { + public float getResolution() { if (svgUserAgent != null) { - return svgUserAgent.getPixelUnitToMillimeter(); + return svgUserAgent.getResolution(); } - return 0.264583333333333333333f; // 96 dpi + return 96f; // 96 dpi } /** @@ -3260,7 +3276,7 @@ public float getMediumFontSize() { return svgUserAgent.getMediumFontSize(); } // 9pt (72pt = 1in) - return 9f * 25.4f / (72f * getPixelUnitToMillimeter()); + return 9f * getResolution() / 72f; } /** diff --git a/echosvg-swing/src/main/java/io/sf/carte/echosvg/swing/svg/SVGUserAgent.java b/echosvg-swing/src/main/java/io/sf/carte/echosvg/swing/svg/SVGUserAgent.java index 217b20b32..4fee75493 100644 --- a/echosvg-swing/src/main/java/io/sf/carte/echosvg/swing/svg/SVGUserAgent.java +++ b/echosvg-swing/src/main/java/io/sf/carte/echosvg/swing/svg/SVGUserAgent.java @@ -72,8 +72,13 @@ public interface SVGUserAgent { /** * Returns the size of a px CSS unit in millimeters. + * + * @deprecated Use {@link #getResolution()}. */ - float getPixelUnitToMillimeter(); + @Deprecated + default float getPixelUnitToMillimeter() { + return 25.4f / getResolution(); + } /** * Returns the size of a px CSS unit in millimeters. This will be removed after @@ -86,6 +91,11 @@ default float getPixelToMM() { return getPixelUnitToMillimeter(); } + /** + * Returns the resolution in {@code dpi}. + */ + float getResolution(); + /** * Returns the default font family. */ diff --git a/echosvg-swing/src/main/java/io/sf/carte/echosvg/swing/svg/SVGUserAgentAdapter.java b/echosvg-swing/src/main/java/io/sf/carte/echosvg/swing/svg/SVGUserAgentAdapter.java index fde735d65..e7624f7b7 100644 --- a/echosvg-swing/src/main/java/io/sf/carte/echosvg/swing/svg/SVGUserAgentAdapter.java +++ b/echosvg-swing/src/main/java/io/sf/carte/echosvg/swing/svg/SVGUserAgentAdapter.java @@ -119,6 +119,11 @@ public float getPixelUnitToMillimeter() { return 0.26458333333333333333333333333333f; // 96dpi } + @Override + public float getResolution() { + return 96f; + } + /** * Returns the default font family. */ @@ -132,8 +137,8 @@ public String getDefaultFontFamily() { */ @Override public float getMediumFontSize() { - // 9pt (72pt == 1in) - return 9f * 25.4f / (72f * getPixelUnitToMillimeter()); + // 9pt (72pt = 1in) + return 9f * getResolution() / 72f; } /** diff --git a/echosvg-test/src/main/java/io/sf/carte/echosvg/test/image/ImageCompareUtil.java b/echosvg-test/src/main/java/io/sf/carte/echosvg/test/image/ImageCompareUtil.java index 07a09fda5..c0866ece7 100644 --- a/echosvg-test/src/main/java/io/sf/carte/echosvg/test/image/ImageCompareUtil.java +++ b/echosvg-test/src/main/java/io/sf/carte/echosvg/test/image/ImageCompareUtil.java @@ -182,6 +182,10 @@ public String compare(float allowedPercentBelowThreshold, float allowedPercentOv return null; } + if (result < ImageComparator.DIFFERENT_PIXELS_BELOW_THRESHOLD) { + return ImageComparator.getResultDescription(result); + } + // We are in error (images are different: produce an image // with the two images side by side as well as a diff image) BufferedImage diff = ImageComparator.createDiffImage(imageA, imageB); diff --git a/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/AbstractBypassRenderingCheck.java b/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/AbstractBypassRenderingCheck.java index e1daa589d..6f17afcd5 100644 --- a/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/AbstractBypassRenderingCheck.java +++ b/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/AbstractBypassRenderingCheck.java @@ -56,7 +56,7 @@ public class AbstractBypassRenderingCheck { static final String BROWSER_MEDIA = "screen"; - static final String PRINT_MEDIUM = "print"; + static final String PRINT_MEDIA = "print"; void test(String file) throws TranscoderException, IOException { test(file, 0); @@ -82,7 +82,7 @@ void test(String file, int expectedErrorCount, boolean validating) */ void testPrint(String file, int expectedErrorCount) throws TranscoderException, IOException { - test(file, PRINT_MEDIUM, false, null, null, true, expectedErrorCount); + test(file, PRINT_MEDIA, false, null, null, true, expectedErrorCount); } /** diff --git a/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/AbstractSamplesRendering.java b/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/AbstractSamplesRendering.java index 70d7db02a..5e80ae588 100644 --- a/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/AbstractSamplesRendering.java +++ b/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/AbstractSamplesRendering.java @@ -183,6 +183,15 @@ void testAlternateSheet(String file, String alt, boolean validating) runner.runTest(getBelowThresholdAllowed(), getOverThresholdAllowed()); } + void testDarkMode(String file) + throws TranscoderException, IOException { + RenderingTest runner = new RenderingTest(); + runner.setValidating(Boolean.FALSE); + runner.setDarkMode(true); + runner.setFile(file); + runner.runTest(getBelowThresholdAllowed(), getOverThresholdAllowed()); + } + void testUserSheet(String file, boolean validating) throws TranscoderException, IOException { AltUserSheetRenderingTest runner = new AltUserSheetRenderingTest(); runner.setValidating(validating); diff --git a/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/MermaidRenderingTest.java b/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/MermaidRenderingTest.java index 02e2df121..580ac0ebf 100644 --- a/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/MermaidRenderingTest.java +++ b/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/MermaidRenderingTest.java @@ -112,7 +112,7 @@ public void testC4Dynamic() throws TranscoderException, IOException { @Test public void testClass() throws TranscoderException, IOException { - testMermaid("samples/tests/spec2/foreign/mermaid-class.svg", 1); + testMermaid("samples/tests/spec2/foreign/mermaid-class.svg"); } @Test @@ -137,17 +137,17 @@ public void testFlowChartCyrillic() throws TranscoderException, IOException { @Test public void testGantt() throws TranscoderException, IOException { - testMermaid("samples/tests/spec2/foreign/mermaid-gantt.svg", 6); + testMermaid("samples/tests/spec2/foreign/mermaid-gantt.svg", 1); } @Test public void testGitGraph() throws TranscoderException, IOException { - testMermaid("samples/tests/spec2/foreign/mermaid-git-graph.svg", 1); + testMermaid("samples/tests/spec2/foreign/mermaid-git-graph.svg"); } @Test public void testJourney() throws TranscoderException, IOException { - testMermaid("samples/tests/spec2/foreign/mermaid-journey.svg", 9); + testMermaid("samples/tests/spec2/foreign/mermaid-journey.svg", 7); } @Test diff --git a/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/ResolutionPxMmRenderingTest.java b/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/ResolutionPxMmRenderingTest.java index 66d4e3eb7..ba7673a5d 100644 --- a/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/ResolutionPxMmRenderingTest.java +++ b/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/ResolutionPxMmRenderingTest.java @@ -24,7 +24,7 @@ /** * Checks for regressions in rendering of SVG with varying resolution. * - * @see io.sf.carte.echosvg.transcoder.image.test.PixelToMMTest + * @see io.sf.carte.echosvg.transcoder.image.test.ResolutionTest * * @author See Git history. * @version $Id$ @@ -55,6 +55,7 @@ protected CharSequence getImageSuffix() { /** * Returns theImageTranscoder the Test should use
*/
+ @SuppressWarnings("deprecation")
@Override
ImageTranscoder getTestImageTranscoder() {
ImageTranscoder t = super.getTestImageTranscoder();
diff --git a/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/SVGRenderingAccuracyTest.java b/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/SVGRenderingAccuracyTest.java
index e3ecd3032..c6eb6e6a4 100644
--- a/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/SVGRenderingAccuracyTest.java
+++ b/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/SVGRenderingAccuracyTest.java
@@ -79,6 +79,10 @@ public class SVGRenderingAccuracyTest extends AbstractRenderingAccuracyTest {
*/
private String media;
+ /*
+ * Enable or disable dark mode.
+ */
+ private boolean darkMode = false;
// Batik uses 9
private static final int DEFAULT_COMPRESSION_LEVEL = 9;
@@ -154,6 +158,15 @@ public void setMedia(String media) {
this.media = media;
}
+ /**
+ * Enable or disable the dark mode.
+ *
+ * @param darkMode {@code true} to enable the dark mode.
+ */
+ public void setDarkMode(boolean darkMode) {
+ this.darkMode = darkMode;
+ }
+
/**
* Set the compression level.
*
@@ -204,7 +217,7 @@ protected CharSequence getImageSuffix() {
boolean nonDefCompr = getCompressionLevel() != getDefaultCompressionLevel();
boolean nonDefMedia = media != null && !DEFAULT_MEDIUM.equals(media);
- if (nonDefCompr && nonDefMedia && tEXt == null && iTXt == null && zTXt == null) {
+ if (nonDefCompr && nonDefMedia && !darkMode && tEXt == null && iTXt == null && zTXt == null) {
return "";
}
@@ -212,6 +225,11 @@ protected CharSequence getImageSuffix() {
if (nonDefMedia) {
buf.append("-").append(media);
}
+
+ if (darkMode) {
+ buf.append("-dark");
+ }
+
if (nonDefCompr) {
buf.append("-z").append(getCompressionLevel());
}
@@ -277,7 +295,14 @@ protected void checkErrorHandler(ErrorHandler errorHandler) {
ImageTranscoder getTestImageTranscoder() {
ImageTranscoder t = createTestImageTranscoder();
t.addTranscodingHint(ImageTranscoder.KEY_FORCE_TRANSPARENT_WHITE, Boolean.FALSE);
- t.addTranscodingHint(ImageTranscoder.KEY_BACKGROUND_COLOR, new Color(0, 0, 0, 0));
+
+ if (darkMode) {
+ // Opaque background for dark mode
+ t.addTranscodingHint(ImageTranscoder.KEY_BACKGROUND_COLOR, new Color(0, 0, 0, 255));
+ } else {
+ t.addTranscodingHint(ImageTranscoder.KEY_BACKGROUND_COLOR, new Color(0, 0, 0, 0));
+ }
+
t.addTranscodingHint(SVGAbstractTranscoder.KEY_EXECUTE_ONLOAD, Boolean.TRUE);
if (validate) {
@@ -292,6 +317,10 @@ ImageTranscoder getTestImageTranscoder() {
t.addTranscodingHint(SVGAbstractTranscoder.KEY_MEDIA, media);
}
+ if (darkMode) {
+ t.addTranscodingHint(SVGAbstractTranscoder.KEY_PREFERS_COLOR_SCHEME, "dark");
+ }
+
if (getCompressionLevel() != getDefaultCompressionLevel()) {
t.addTranscodingHint(PNGTranscoder.KEY_COMPRESSION_LEVEL, getCompressionLevel());
}
diff --git a/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/SamplesSpec2RenderingTest.java b/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/SamplesSpec2RenderingTest.java
index 89537b76f..56faa3772 100644
--- a/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/SamplesSpec2RenderingTest.java
+++ b/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/SamplesSpec2RenderingTest.java
@@ -18,11 +18,17 @@
*/
package io.sf.carte.echosvg.test.svg;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import java.io.IOException;
+import java.util.concurrent.TimeUnit;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import io.sf.carte.echosvg.css.engine.CSSCircularityException;
+import io.sf.carte.echosvg.css.engine.CSSResourceLimitException;
import io.sf.carte.echosvg.test.TestFonts;
import io.sf.carte.echosvg.transcoder.TranscoderException;
@@ -45,6 +51,100 @@ public static void setUpBeforeClass() throws Exception {
TestFonts.loadTestFonts();
}
+ /*
+ * Security
+ */
+
+ /**
+ * Check the behaviour on attr() circularity.
+ *
+ * + * If the test runs for more than a few seconds, the test failed. + *
+ * + * @throws TranscoderException + * @throws IOException + */ + @Test + @Timeout(value = 2500, unit = TimeUnit.MILLISECONDS) + public void testAttrCircularity() throws TranscoderException, IOException { + assertThrows(CSSCircularityException.class, + () -> testNVErrIgnore("samples/tests/spec2/security/attrCircularity.svg", BROWSER_MEDIA, 0)); + } + + /** + * Test a Billion Laughs DoS attack against the var() implementation. + * + *+ * If the test runs for more than 3 seconds, either the computer is really slow + * or the test failed. + *
+ * + * @throws TranscoderException + * @throws IOException + */ + @Test + @Timeout(value = 3000, unit = TimeUnit.MILLISECONDS) + public void testVarBLA() throws TranscoderException, IOException { + assertThrows(CSSResourceLimitException.class, + () -> testNVErrIgnore("samples/tests/spec2/security/varBillionLaughsAttack.svg", + BROWSER_MEDIA, 0)); + } + + /** + * Test a Billion Laughs DoS attack against the var() implementation, fallback + * variant. + * + *+ * If the test runs for more than 3 seconds, either the computer is really slow + * or the test failed. + *
+ * + * @throws TranscoderException + * @throws IOException + */ + @Test + @Timeout(value = 3000, unit = TimeUnit.MILLISECONDS) + public void testVarBLAFallback() throws TranscoderException, IOException { + assertThrows(CSSResourceLimitException.class, + () -> testNVErrIgnore("samples/tests/spec2/security/varBLAFallback.svg", + BROWSER_MEDIA, 0)); + } + + /** + * Check the behaviour on var() circularity. + * + *+ * If the test runs for more than a few seconds, the test failed. + *
+ * + * @throws TranscoderException + * @throws IOException + */ + @Test + @Timeout(value = 2500, unit = TimeUnit.MILLISECONDS) + public void testVarCircularity() throws TranscoderException, IOException { + assertThrows(CSSCircularityException.class, + () -> testNVErrIgnore("samples/tests/spec2/security/varCircularity.svg", BROWSER_MEDIA, 0)); + } + + /** + * Check the behaviour on var() fallback circularity. + * + *+ * If the test runs for more than a few seconds, the test failed. + *
+ * + * @throws TranscoderException + * @throws IOException + */ + @Test + @Timeout(value = 2500, unit = TimeUnit.MILLISECONDS) + public void testVarFallbackCircularity() throws TranscoderException, IOException { + assertThrows(CSSCircularityException.class, () -> testNVErrIgnore( + "samples/tests/spec2/security/varFallbackCircularity.svg", BROWSER_MEDIA, 0)); + } + /* * Namespaceless href */ @@ -56,6 +156,31 @@ public void testHref() throws TranscoderException, IOException { /* * CSS3 Styling */ + @Test + public void testAttrValues() throws TranscoderException, IOException { + testNV("samples/tests/spec2/styling/attrValues.svg"); + } + + @Test + public void testConditionalRules() throws TranscoderException, IOException { + testNV("samples/tests/spec2/styling/conditionalRules.svg"); + } + + @Test + public void testConditionalRulesDark() throws TranscoderException, IOException { + testDarkMode("samples/tests/spec2/styling/conditionalRules.svg"); + } + + @Test + public void testConditionalRulesAlternate() throws TranscoderException, IOException { + testAlternateSheet("samples/tests/spec2/styling/conditionalRules.svg", "Gray", false); + } + + @Test + public void testConditionalRulesPrint() throws TranscoderException, IOException { + testNVErrIgnore("samples/tests/spec2/styling/conditionalRules.svg", PRINT_MEDIA, 0); + } + @Test public void testMermaidColor4() throws TranscoderException, IOException { testNV("samples/tests/spec2/styling/mermaid-color4.svg"); diff --git a/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/SamplesSpecRenderingTest.java b/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/SamplesSpecRenderingTest.java index e72ba0243..2b8ff0ca9 100644 --- a/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/SamplesSpecRenderingTest.java +++ b/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/SamplesSpecRenderingTest.java @@ -523,6 +523,7 @@ public void testRenderingPaintOpacity() throws TranscoderException, IOException test("samples/tests/spec/rendering/paintOpacity.svg"); } + @Test public void testRenderingResolutionPxMM() throws TranscoderException, IOException { testResolutionPxMM("samples/tests/spec/rendering/resolution.svg", 0.25f); } diff --git a/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/StyleBypassRenderingTest.java b/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/StyleBypassRenderingTest.java index 1b03a9f29..eab48a6cd 100644 --- a/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/StyleBypassRenderingTest.java +++ b/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/StyleBypassRenderingTest.java @@ -1340,28 +1340,28 @@ public void testBug19363() throws TranscoderException, IOException { @Test public void testCSS3_All() throws TranscoderException, IOException { testAllInputSources("samples/tests/spec2/styling/css3.html", null, false, null, null, - false, 4); + false, 0); } @Test public void testCSS3Print() throws TranscoderException, IOException { - testPrint("samples/tests/spec2/styling/css3.html", 4); + testPrint("samples/tests/spec2/styling/css3.html", 0); } @Test public void testCSS3AlternateStylesheet() throws TranscoderException, IOException { - testAlternate("samples/tests/spec2/styling/css3.html", "Gray", false, 4); + testAlternate("samples/tests/spec2/styling/css3.html", "Gray", false, 0); } @Test public void testCSS3Dark() throws TranscoderException, IOException { - testDark("samples/tests/spec2/styling/css3.html", 4); + testDark("samples/tests/spec2/styling/css3.html", 0); } @Test public void testCSS3_Selector() throws TranscoderException, IOException { test("samples/tests/spec2/styling/css3.html", SVGRenderingAccuracyTest.DEFAULT_MEDIUM, - false, null, "#theSVG", true, 4); + false, null, "#theSVG", true, 0); } } diff --git a/echosvg-test/src/test/java/io/sf/carte/echosvg/transcoder/image/test/AbstractImageTranscoderTest.java b/echosvg-test/src/test/java/io/sf/carte/echosvg/transcoder/image/test/AbstractImageTranscoderTest.java index f227dd31f..4b6e212cf 100644 --- a/echosvg-test/src/test/java/io/sf/carte/echosvg/transcoder/image/test/AbstractImageTranscoderTest.java +++ b/echosvg-test/src/test/java/io/sf/carte/echosvg/transcoder/image/test/AbstractImageTranscoderTest.java @@ -275,6 +275,10 @@ private boolean compareImage(BufferedImage img) throws TranscoderException, IOEx ByteArrayOutputStream out = new ByteArrayOutputStream(2048); TranscoderOutput output = new TranscoderOutput(out); PNGTranscoder t = new PNGTranscoder(); + Map+ * Based on PixelToMM test by + * Thierry Kormann. For + * later modifications, see Git history. + *
+ * * @version $Id$ */ -public class PixelToMMTest extends AbstractImageTranscoderTest { +public class ResolutionTest extends AbstractImageTranscoderTest { /** The URI of the input image. */ private String inputURI; @@ -44,33 +47,33 @@ public class PixelToMMTest extends AbstractImageTranscoderTest { /** The URI of the reference image. */ private String refImageURI; - /** The pixel to mm factor. */ - private float px2mm; + /** The resolution. */ + private float resolution; @Test public void test96dpi() throws TranscoderException { - testPixelToMM("test-resources/io/sf/carte/echosvg/transcoder/image/resources/px2mm.svg", - "test-references/io/sf/carte/echosvg/transcoder/image/px2mm96dpi.png", 0.2645833f); + testResolution("test-resources/io/sf/carte/echosvg/transcoder/image/resources/resolution.svg", + "test-references/io/sf/carte/echosvg/transcoder/image/resolution96dpi.png", 96f); } @Test public void test72dpi() throws TranscoderException { - testPixelToMM("test-resources/io/sf/carte/echosvg/transcoder/image/resources/px2mm.svg", - "test-references/io/sf/carte/echosvg/transcoder/image/px2mm72dpi.png", 0.3528f); + testResolution("test-resources/io/sf/carte/echosvg/transcoder/image/resources/resolution.svg", + "test-references/io/sf/carte/echosvg/transcoder/image/resolution72dpi.png", 72f); } /** - * Runs a newPixelToMMTest.
+ * Runs a new ResolutionTest.
*
* @param inputURI the URI of the input image
* @param refImageURI the URI of the reference image
- * @param px2mm the pixel to mm conversion factor
- * @throws TranscoderException
+ * @param resolution the resolution
+ * @throws TranscoderException
*/
- private void testPixelToMM(String inputURI, String refImageURI, float px2mm) throws TranscoderException {
+ private void testResolution(String inputURI, String refImageURI, float resolution) throws TranscoderException {
this.inputURI = inputURI;
this.refImageURI = refImageURI;
- this.px2mm = px2mm;
+ this.resolution = resolution;
runTest();
}
@@ -88,7 +91,7 @@ protected TranscoderInput createTranscoderInput() {
@Override
protected Map| Key: | + *KEY_PREFERS_COLOR_SCHEME | + *
|---|---|
| Value: | + *String | + *
| Default: | + *"light" | + *
| Required: | + *No | + *
| Description: | + *Specify the preferred color scheme to use in + * CSS media queries. | + *
| Key: | - *KEY_PIXEL_UNIT_TO_MILLIMETER | - *
|---|---|
| Value: | - *Float | - *
| Default: | - *0.264583 | - *
| Required: | - *No | - *
| Description: | - *Specify the size of a px CSS unit in millimeters. | - *
+ * Using a concept of physical pixels instead of CSS pixels is a bad idea which + * leads to distorted shapes, unexpected font sizes and wrong aspect ratios. + * Physical pixels were removed from Web standards decades ago, please use + * {@code KEY_RESOLUTION_DPI} instead. + *
+ * @deprecated as of EchoSVG 2.0 + * @see #KEY_RESOLUTION_DPI + *| Key: | + *KEY_PIXEL_UNIT_TO_MILLIMETER | + *
|---|---|
| Value: | + *Float | + *
| Default: | + *0.264583 | + *
| Required: | + *No | + *
| Description: | + *Specify the size of a px CSS unit in + * millimeters. | + *
| Key: | + *KEY_RESOLUTION_DPI | + *
|---|---|
| Value: | + *Float | + *
| Default: | + *96 | + *
| Required: | + *No | + *
| Description: | + *The resolution expressed in {@code dpi}. If + * not set, implementations may check for {@code KEY_PIXEL_UNIT_TO_MILLIMETER} + * and compute the resolution from that value. | + *