From 921b8bbd570b83653d3ad515ada5bbe10da55dad Mon Sep 17 00:00:00 2001 From: Carlos Amengual Date: Mon, 12 Aug 2024 13:46:02 +0200 Subject: [PATCH] Switch from the legacy CSSValue API to Typed OM --- NOTICE | 12 +- buildSrc/allowed-licenses.json | 3 + .../groovy/echosvg.java-conventions.gradle | 8 +- echosvg-all/build.gradle | 26 +- .../anim/dom/SVGDOMImplementation.java | 6 +- .../carte/echosvg/anim/dom/SVGOMDocument.java | 7 +- .../echosvg/anim/dom/SVGOMSVGElement.java | 18 +- .../echosvg/anim/dom/SVGStylableElement.java | 34 +- .../AbstractSVGGradientElementBridge.java | 8 +- .../carte/echosvg/bridge/BridgeContext.java | 9 +- .../sf/carte/echosvg/bridge/CSSFontFace.java | 23 +- .../sf/carte/echosvg/bridge/CSSUtilities.java | 107 +- .../carte/echosvg/bridge/CursorManager.java | 23 +- .../carte/echosvg/bridge/ErrorConstants.java | 13 + .../sf/carte/echosvg/bridge/PaintServer.java | 267 +++- .../echosvg/bridge/SVGAnimationEngine.java | 90 +- .../sf/carte/echosvg/bridge/SVGGVTFont.java | 2 +- .../echosvg/bridge/SVGTextElementBridge.java | 98 +- .../carte/echosvg/bridge/TextUtilities.java | 18 +- .../io/sf/carte/echosvg/bridge/Viewport.java | 18 +- .../svg12/SVGSolidColorElementBridge.java | 12 +- .../color/profiles/ClayRGB-elle-V4-g22.icc | Bin 0 -> 1164 bytes .../bridge/color/profiles/Display P3.icc | Bin 0 -> 536 bytes .../color/profiles/ElleStone-legalcode.txt | 359 +++++ .../bridge/color/profiles/ITU-R_BT2020.icc | Bin 0 -> 732 bytes .../color/profiles/LargeRGB-elle-V4-g18.icc | Bin 0 -> 1164 bytes .../echosvg/bridge/color/profiles/NOTICE.txt | 7 + .../bridge/resources/Messages.properties | 5 + echosvg-css/build.gradle | 1 + .../io/sf/carte/echosvg/css/Viewport.java | 39 + .../echosvg/css/dom/CSSOMComputedStyle.java | 21 +- .../carte/echosvg/css/dom/CSSOMSVGColor.java | 1140 ++------------ .../css/dom/CSSOMSVGComputedStyle.java | 2 - .../carte/echosvg/css/dom/CSSOMSVGPaint.java | 713 ++------- .../css/dom/CSSOMSVGStyleDeclaration.java | 16 +- .../echosvg/css/dom/CSSOMSVGViewCSS.java | 2 +- .../css/dom/CSSOMStyleDeclaration.java | 58 +- .../sf/carte/echosvg/css/dom/CSSOMValue.java | 1315 ++--------------- .../carte/echosvg/css/dom/CSSOMViewCSS.java | 4 +- .../io/sf/carte/echosvg/css/dom/CSSValue.java | 358 +++++ .../carte/echosvg/css/engine/CSSContext.java | 14 +- .../css/engine/SystemColorSupport.java | 14 +- .../engine/value/AbstractColorManager.java | 173 ++- .../engine/value/AbstractCounterValue.java | 141 ++ .../css/engine/value/AbstractStringValue.java | 86 ++ .../css/engine/value/AbstractValue.java | 137 +- .../engine/value/AbstractValueFactory.java | 11 +- .../css/engine/value/AbstractValueList.java | 151 ++ .../engine/value/AbstractValueManager.java | 42 +- .../AbstractValueModificationHandler.java | 64 + .../css/engine/value/ColorFunction.java | 189 +++ .../echosvg/css/engine/value/ColorValue.java | 164 ++ .../css/engine/value/ComponentHandler.java | 61 + .../css/engine/value/ComponentValue.java | 96 ++ .../css/engine/value/ComputedValue.java | 120 +- .../css/engine/value/CounterValue.java | 65 + .../css/engine/value/CountersValue.java | 77 + .../echosvg/css/engine/value/FloatValue.java | 201 ++- .../echosvg/css/engine/value/IdentValue.java | 85 ++ .../css/engine/value/IdentifierManager.java | 15 +- .../css/engine/value/InheritValue.java | 35 +- .../css/engine/value/LCHColorValue.java | 207 +++ .../css/engine/value/LabColorValue.java | 195 +++ .../css/engine/value/LengthManager.java | 128 +- .../echosvg/css/engine/value/ListValue.java | 88 +- .../css/engine/value/NumericValue.java | 41 + .../css/engine/value/RGBColorValue.java | 237 ++- .../echosvg/css/engine/value/RectManager.java | 30 +- .../echosvg/css/engine/value/RectValue.java | 105 +- .../echosvg/css/engine/value/StringValue.java | 85 +- .../echosvg/css/engine/value/URIValue.java | 52 +- .../carte/echosvg/css/engine/value/Value.java | 153 +- .../css/engine/value/ValueConstants.java | 297 ++-- .../css/engine/value/ValueManager.java | 13 +- .../value/ValueModificationHandler.java | 31 + .../css/engine/value/css2/ClipManager.java | 15 +- .../css/engine/value/css2/CursorManager.java | 27 +- .../engine/value/css2/FontFamilyManager.java | 20 +- .../value/css2/FontShorthandManager.java | 9 +- .../value/css2/FontSizeAdjustManager.java | 22 +- .../engine/value/css2/FontSizeManager.java | 114 +- .../engine/value/css2/FontWeightManager.java | 14 +- .../css/engine/value/css2/SrcManager.java | 18 +- .../value/css2/TextDecorationManager.java | 19 +- .../value/svg/BaselineShiftManager.java | 24 +- .../css/engine/value/svg/ClipPathManager.java | 19 +- .../engine/value/svg/ColorProfileManager.java | 25 +- .../value/svg/EnableBackgroundManager.java | 35 +- .../css/engine/value/svg/FilterManager.java | 17 +- .../value/svg/GlyphOrientationManager.java | 27 +- .../svg/GlyphOrientationVerticalManager.java | 15 +- .../css/engine/value/svg/ICCColor.java | 23 +- .../css/engine/value/svg/KerningManager.java | 15 +- .../css/engine/value/svg/MarkerManager.java | 22 +- .../css/engine/value/svg/MaskManager.java | 19 +- .../css/engine/value/svg/OpacityManager.java | 14 +- .../css/engine/value/svg/SVGColorManager.java | 98 +- .../css/engine/value/svg/SVGPaintManager.java | 30 +- .../engine/value/svg/SVGValueConstants.java | 640 ++++---- .../css/engine/value/svg/SpacingManager.java | 15 +- .../value/svg/StrokeDasharrayManager.java | 32 +- .../value/svg/StrokeMiterlimitManager.java | 14 +- .../engine/value/svg12/AbstractCIEColor.java | 15 +- .../css/engine/value/svg12/CIELCHColor.java | 60 - .../css/engine/value/svg12/CIELabColor.java | 56 - .../css/engine/value/svg12/DeviceColor.java | 48 +- .../css/engine/value/svg12/ICCNamedColor.java | 23 +- .../engine/value/svg12/LineHeightManager.java | 21 +- .../value/svg12/SVG12ValueConstants.java | 20 +- echosvg-css/src/main/java/module-info.java | 2 + .../value/resources/Messages.properties | 21 +- .../echosvg/dom/AbstractStylableDocument.java | 4 +- .../dom/ExtensibleDOMImplementation.java | 2 +- .../dom/util/CSSStyleDeclarationFactory.java | 8 +- echosvg-dom/src/main/java/module-info.java | 2 + .../extension/StylableExtensionElement.java | 16 +- .../bridge/test/ModificationsTest.java | 134 ++ .../echosvg/bridge/test/PaintServerTest.java | 162 ++ .../echosvg/svggen/test/FontDecoration.java | 3 + .../test/svg/SamplesCanvgRenderingTest.java | 4 +- .../test/svg/SamplesSpecRenderingTest.java | 2 + gradle.properties | 3 +- samples/tests/spec/scripting/domSVGColor.svg | 93 +- samples/tests/spec/scripting/paintType.svg | 2 +- samples/tests/spec/scripting/relativeURI.svg | 2 +- samples/tests/spec/scripting/setProperty.svg | 2 +- .../svggen/rendering/ContextDrawImageICC.png | Bin 1480 -> 1479 bytes .../rendering/ContextFontDecoration.png | Bin 5915 -> 5931 bytes .../echosvg/svggen/rendering/DrawImageICC.png | Bin 1481 -> 1479 bytes .../svggen/rendering/FontDecoration.png | Bin 5905 -> 5923 bytes test-references/samples/canvg/issue320.png | Bin 13427 -> 11489 bytes test-references/samples/canvg/issue690.png | Bin 3517 -> 5717 bytes .../tests/spec/scripting/domSVGColor.png | Bin 32601 -> 35278 bytes .../tests/spec/scripting/paintType.png | Bin 13786 -> 12291 bytes .../io/sf/carte/echosvg/css/dom/bug11670.svg | 6 +- .../io/sf/carte/echosvg/css/dom/bug9740.svg | 12 +- .../echosvg/css/dom/rgbPresentationTest.svg | 4 +- .../io/sf/carte/echosvg/css/dom/rgbTest.svg | 6 +- .../carte/echosvg/css/dom/rgbUpdateTest.svg | 6 +- 139 files changed, 5577 insertions(+), 4949 deletions(-) create mode 100644 echosvg-bridge/src/main/resources/io/sf/carte/echosvg/bridge/color/profiles/ClayRGB-elle-V4-g22.icc create mode 100644 echosvg-bridge/src/main/resources/io/sf/carte/echosvg/bridge/color/profiles/Display P3.icc create mode 100644 echosvg-bridge/src/main/resources/io/sf/carte/echosvg/bridge/color/profiles/ElleStone-legalcode.txt create mode 100644 echosvg-bridge/src/main/resources/io/sf/carte/echosvg/bridge/color/profiles/ITU-R_BT2020.icc create mode 100644 echosvg-bridge/src/main/resources/io/sf/carte/echosvg/bridge/color/profiles/LargeRGB-elle-V4-g18.icc create mode 100644 echosvg-bridge/src/main/resources/io/sf/carte/echosvg/bridge/color/profiles/NOTICE.txt create mode 100644 echosvg-css/src/main/java/io/sf/carte/echosvg/css/Viewport.java create mode 100644 echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSValue.java create mode 100644 echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractCounterValue.java create mode 100644 echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractStringValue.java create mode 100644 echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractValueList.java create mode 100644 echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractValueModificationHandler.java create mode 100644 echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ColorFunction.java create mode 100644 echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ColorValue.java create mode 100644 echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ComponentHandler.java create mode 100644 echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ComponentValue.java create mode 100644 echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/CounterValue.java create mode 100644 echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/CountersValue.java create mode 100644 echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/IdentValue.java create mode 100644 echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/LCHColorValue.java create mode 100644 echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/LabColorValue.java create mode 100644 echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/NumericValue.java create mode 100644 echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ValueModificationHandler.java delete mode 100644 echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/CIELCHColor.java delete mode 100644 echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/CIELabColor.java create mode 100644 echosvg-test/src/test/java/io/sf/carte/echosvg/bridge/test/ModificationsTest.java create mode 100644 echosvg-test/src/test/java/io/sf/carte/echosvg/bridge/test/PaintServerTest.java diff --git a/NOTICE b/NOTICE index fe6e2dcb1..18c795b5a 100644 --- a/NOTICE +++ b/NOTICE @@ -7,12 +7,22 @@ This product includes software developed at The Apache Software Foundation (https://www.apache.org/) under the 'Apache Batik' project. This software contains code from the World Wide Web Consortium (W3C) for the -Document Object Model API (DOM API) and SVG Document Type Definition (DTD). +Document Object Model API (DOM API). This software contains code from the International Organisation for Standardization for the definition of character entities used in the software's documentation. +This software contains color profiles by Elle Stone, that are licensed as shown +in the 'ElleStone-legalcode.txt' file under the color profiles directory (bridge +module). + +This product contains a Display P3 color profile that was made by Apple and was +obtained from color.org (ICC). + +This product contains the ITU-R Recommendation BT.2020 color profile that was +also obtained from color.org (ICC). + This product includes images from the Tango Desktop Project (Former website http://tango.freedesktop.org/ archived at https://web.archive.org/web/20201024165718/http://tango-project.org/). diff --git a/buildSrc/allowed-licenses.json b/buildSrc/allowed-licenses.json index 22670b189..b1d0906af 100644 --- a/buildSrc/allowed-licenses.json +++ b/buildSrc/allowed-licenses.json @@ -15,6 +15,9 @@ { "moduleLicense": "Mozilla Public License, Version 2.0" }, + { + "moduleLicense": "W3C Software and Document Notice and License" + }, { "moduleLicense": "MIT License" } diff --git a/buildSrc/src/main/groovy/echosvg.java-conventions.gradle b/buildSrc/src/main/groovy/echosvg.java-conventions.gradle index ca73d322a..0d1e14e4c 100644 --- a/buildSrc/src/main/groovy/echosvg.java-conventions.gradle +++ b/buildSrc/src/main/groovy/echosvg.java-conventions.gradle @@ -18,6 +18,7 @@ repositories { content { includeGroup 'io.sf.carte' includeGroup 'io.sf.graphics' + includeGroup 'io.sf.w3' includeGroup 'io.sf.jclf' } } @@ -121,7 +122,7 @@ tasks.register("${project.name}-jar-with-deps", Jar) { // Provided by Java SE exclude 'javax/**' // Not used by EchoSVG - exclude 'org/w3c/css/**' + exclude 'org/w3c/css/sac/**' // The next ones are provided by java.xml module exclude 'org/w3c/dom/*' exclude 'org/w3c/dom/bootstrap/**' @@ -131,6 +132,11 @@ tasks.register("${project.name}-jar-with-deps", Jar) { exclude 'org/w3c/dom/traversal/**' exclude 'org/w3c/dom/views/**' exclude 'org/xml/**' + // Provided by jdk.xml.dom module + exclude 'org/w3c/dom/css/**' + exclude 'org/w3c/dom/html/**' + exclude 'org/w3c/dom/stylesheets/**' + exclude 'org/w3c/dom/xpath/**' // Modularity does not apply here exclude 'module-info.class' } diff --git a/echosvg-all/build.gradle b/echosvg-all/build.gradle index b2a2717a3..d781a1285 100644 --- a/echosvg-all/build.gradle +++ b/echosvg-all/build.gradle @@ -61,6 +61,11 @@ tasks.register('cloneRepos') { refToCheckout: "v${svgomVersion}") gitWebAPIs?.close() + def gitCSSAPIs = grgit.clone(dir: "$buildDir/repos/cssom-apis", + uri: 'https://github.com/css4j/cssom-apis.git', + refToCheckout: "v0.1") + gitCSSAPIs?.close() + def gitLegacyColors = grgit.clone(dir: "$buildDir/repos/legacy-colors", uri: 'https://github.com/css4j/legacy-colors.git', refToCheckout: "v${legacyColorsVersion}") @@ -208,6 +213,18 @@ tasks.register('prepareModularSources') { include(name: '**/*') } } + + // CSSOM and DOM View APIs + ant.copy(todir: "$buildDir/src/org.w3c.css.om") { + fileset(dir: "$buildDir/repos/cssom-apis/cssom-api/src/main/java") { + include(name: '**/*') + } + } + ant.copy(todir: "$buildDir/src/org.w3c.dom.view") { + fileset(dir: "$buildDir/repos/cssom-apis/domview-api/src/main/java") { + include(name: '**/*') + } + } } } @@ -243,6 +260,8 @@ tasks.register('modularJavadoc', Javadoc) { "$buildDir/src/io.sf.carte.echosvg.util.gui", "$buildDir/src/io.sf.carte.echosvg.xml", "$buildDir/src/io.sf.graphics.legacy.colors", + "$buildDir/src/org.w3c.css.om", + "$buildDir/src/org.w3c.dom.view", "$buildDir/src/org.w3c.dom.smil", "$buildDir/src/org.w3c.dom.svg" ] includes += '**/*.java' @@ -282,7 +301,7 @@ tasks.register('uberjar', Jar) { // Provided by Java SE exclude 'javax/**' // Not used by EchoSVG - exclude 'org/w3c/css/**' + exclude 'org/w3c/css/sac/**' // The next ones are provided by java.xml module exclude 'org/w3c/dom/*' exclude 'org/w3c/dom/bootstrap/**' @@ -292,6 +311,11 @@ tasks.register('uberjar', Jar) { exclude 'org/w3c/dom/traversal/**' exclude 'org/w3c/dom/views/**' exclude 'org/xml/**' + // Provided by jdk.xml.dom module + exclude 'org/w3c/dom/css/**' + exclude 'org/w3c/dom/html/**' + exclude 'org/w3c/dom/stylesheets/**' + exclude 'org/w3c/dom/xpath/**' // Modularity does not apply here exclude 'module-info.class' diff --git a/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGDOMImplementation.java b/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGDOMImplementation.java index e473c6e75..0faca4948 100644 --- a/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGDOMImplementation.java +++ b/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGDOMImplementation.java @@ -25,17 +25,17 @@ import java.nio.charset.StandardCharsets; import java.util.HashMap; +import org.w3c.css.om.CSSStyleDeclaration; +import org.w3c.css.om.CSSStyleSheet; import org.w3c.dom.DOMException; import org.w3c.dom.DOMImplementation; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; import org.w3c.dom.Element; import org.w3c.dom.Node; -import org.w3c.dom.css.CSSStyleDeclaration; -import org.w3c.dom.css.CSSStyleSheet; -import org.w3c.dom.css.ViewCSS; import org.w3c.dom.events.Event; import org.w3c.dom.stylesheets.StyleSheet; +import org.w3c.dom.view.ViewCSS; import io.sf.carte.doc.style.css.nsac.InputSource; import io.sf.carte.doc.style.css.nsac.Parser; diff --git a/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGOMDocument.java b/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGOMDocument.java index e2209668e..2e39d7111 100644 --- a/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGOMDocument.java +++ b/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGOMDocument.java @@ -27,6 +27,7 @@ import java.util.Locale; import java.util.MissingResourceException; +import org.w3c.css.om.CSSStyleDeclaration; import org.w3c.dom.Attr; import org.w3c.dom.CDATASection; import org.w3c.dom.Comment; @@ -40,8 +41,6 @@ import org.w3c.dom.Node; import org.w3c.dom.ProcessingInstruction; import org.w3c.dom.Text; -import org.w3c.dom.css.CSSStyleDeclaration; -import org.w3c.dom.css.DocumentCSS; import org.w3c.dom.events.Event; import org.w3c.dom.events.EventListener; import org.w3c.dom.events.MutationEvent; @@ -687,9 +686,9 @@ public void otherAnimationChanged(Element e, String type) { // DocumentCSS //////////////////////////////////////////////////////////// /** - * DOM: Implements {@link DocumentCSS#getOverrideStyle(Element,String)}. + * This does not implement {@code DocumentCSS#getOverrideStyle(Element,String)} + * anymore, as it does not support Typed OM. */ - @Override public CSSStyleDeclaration getOverrideStyle(Element elt, String pseudoElt) { if (elt instanceof SVGStylableElement && pseudoElt == null) { return ((SVGStylableElement) elt).getOverrideStyle(); diff --git a/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGOMSVGElement.java b/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGOMSVGElement.java index b2bdfb52a..8d99179fa 100644 --- a/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGOMSVGElement.java +++ b/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGOMSVGElement.java @@ -21,13 +21,11 @@ import java.awt.geom.AffineTransform; import java.util.List; +import org.w3c.css.om.CSSStyleDeclaration; import org.w3c.dom.DOMException; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.w3c.dom.css.CSSStyleDeclaration; -import org.w3c.dom.css.DocumentCSS; -import org.w3c.dom.css.ViewCSS; import org.w3c.dom.events.DocumentEvent; import org.w3c.dom.events.Event; import org.w3c.dom.stylesheets.DocumentStyle; @@ -48,6 +46,8 @@ import org.w3c.dom.svg.SVGStringList; import org.w3c.dom.svg.SVGTransform; import org.w3c.dom.svg.SVGViewSpec; +import org.w3c.dom.view.DocumentCSS; +import org.w3c.dom.view.ViewCSS; import org.w3c.dom.views.AbstractView; import org.w3c.dom.views.DocumentView; @@ -716,10 +716,6 @@ public DocumentView getDocument() { return (DocumentView) getOwnerDocument(); } - /** - * DOM: Implements - * {@link org.w3c.dom.css.ViewCSS#getComputedStyle(Element,String)}. - */ @Override public CSSStyleDeclaration getComputedStyle(Element elt, String pseudoElt) { AbstractView av = ((DocumentView) getOwnerDocument()).getDefaultView(); @@ -748,19 +744,11 @@ public boolean canDispatch(String namespaceURI, String type) throws DOMException // DocumentCSS //////////////////////////////////////////////////////////// - /** - * DOM: Implements - * {@link org.w3c.dom.stylesheets.DocumentStyle#getStyleSheets()}. - */ @Override public StyleSheetList getStyleSheets() { return ((DocumentStyle) getOwnerDocument()).getStyleSheets(); } - /** - * DOM: Implements - * {@link org.w3c.dom.css.DocumentCSS#getOverrideStyle(Element,String)}. - */ @Override public CSSStyleDeclaration getOverrideStyle(Element elt, String pseudoElt) { return ((DocumentCSS) getOwnerDocument()).getOverrideStyle(elt, pseudoElt); diff --git a/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGStylableElement.java b/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGStylableElement.java index c1fed720a..88a086323 100644 --- a/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGStylableElement.java +++ b/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGStylableElement.java @@ -18,11 +18,11 @@ */ package io.sf.carte.echosvg.anim.dom; +import org.w3c.css.om.CSSStyleDeclaration; +import org.w3c.css.om.typed.CSSStyleValue; import org.w3c.dom.Attr; import org.w3c.dom.DOMException; import org.w3c.dom.Node; -import org.w3c.dom.css.CSSStyleDeclaration; -import org.w3c.dom.css.CSSValue; import org.w3c.dom.svg.SVGAnimatedString; import io.sf.carte.echosvg.anim.values.AnimatableValue; @@ -35,6 +35,7 @@ import io.sf.carte.echosvg.css.engine.SVGCSSEngine; import io.sf.carte.echosvg.css.engine.StyleDeclarationProvider; import io.sf.carte.echosvg.css.engine.StyleMap; +import io.sf.carte.echosvg.css.engine.value.AbstractValueModificationHandler; import io.sf.carte.echosvg.css.engine.value.Value; import io.sf.carte.echosvg.css.engine.value.svg.SVGColorManager; import io.sf.carte.echosvg.css.engine.value.svg.SVGPaintManager; @@ -48,8 +49,10 @@ * This class provides a common superclass for elements which implement * SVGStylable. * - * @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 SVGStylableElement extends SVGOMElement implements CSSStylableElement { @@ -227,7 +230,7 @@ public void updatePropertyValue(String pn, AnimatableValue val) { public boolean useLinearRGBColorInterpolation() { CSSEngine eng = ((SVGOMDocument) getOwnerDocument()).getCSSEngine(); Value v = eng.getComputedStyle(this, null, SVGCSSEngine.COLOR_INTERPOLATION_INDEX); - return v.getStringValue().charAt(0) == 'l'; + return v.getIdentifierValue().charAt(0) == 'l'; } /** @@ -262,9 +265,6 @@ public void removeTargetListener(String ns, String an, boolean isCSS, AnimationT // SVGStylable support /////////////////////////////////////////////////// - /** - * DOM: Implements {@link org.w3c.dom.svg.SVGStylable#getStyle()}. - */ public CSSStyleDeclaration getStyle() { if (style == null) { CSSEngine eng = ((SVGOMDocument) getOwnerDocument()).getCSSEngine(); @@ -274,12 +274,8 @@ public CSSStyleDeclaration getStyle() { return style; } - /** - * DOM: Implements - * {@link org.w3c.dom.svg.SVGStylable#getPresentationAttribute(String)}. - */ - public CSSValue getPresentationAttribute(String name) { - CSSValue result = (CSSValue) getLiveAttributeValue(null, name); + public CSSStyleValue getPresentationAttributeValue(String name) { + CSSStyleValue result = (CSSStyleValue) getLiveAttributeValue(null, name); if (result != null) return result; @@ -365,14 +361,14 @@ public class PresentationAttributeValue extends CSSOMValue implements LiveAttrib public PresentationAttributeValue(CSSEngine eng, String prop) { super(null); valueProvider = this; - setModificationHandler(new AbstractModificationHandler() { + setModificationHandler(new AbstractValueModificationHandler() { @Override protected Value getValue() { return PresentationAttributeValue.this.getValue(); } @Override - public void textChanged(String text) throws DOMException { + protected void setPropertyText(String text) throws DOMException { value = cssEngine.parsePropertyValue(SVGStylableElement.this, property, text); mutate = true; setAttributeNS(null, property, text); @@ -468,14 +464,14 @@ public class PresentationAttributeColorValue extends CSSOMSVGColor public PresentationAttributeColorValue(CSSEngine eng, String prop) { super(null); valueProvider = this; - setModificationHandler(new AbstractModificationHandler() { + setModificationHandler(new AbstractValueModificationHandler() { @Override protected Value getValue() { return PresentationAttributeColorValue.this.getValue(); } @Override - public void textChanged(String text) throws DOMException { + protected void setPropertyText(String text) throws DOMException { value = cssEngine.parsePropertyValue(SVGStylableElement.this, property, text); mutate = true; setAttributeNS(null, property, text); @@ -578,7 +574,7 @@ protected Value getValue() { } @Override - public void textChanged(String text) throws DOMException { + protected void setPropertyText(String text) throws DOMException { value = cssEngine.parsePropertyValue(SVGStylableElement.this, property, text); mutate = true; setAttributeNS(null, property, text); diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/AbstractSVGGradientElementBridge.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/AbstractSVGGradientElementBridge.java index e5b48fd52..7e49e64f2 100644 --- a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/AbstractSVGGradientElementBridge.java +++ b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/AbstractSVGGradientElementBridge.java @@ -296,7 +296,13 @@ public Stop createStop(BridgeContext ctx, Element gradientElement, Element stopE // use default value offset = 0f; } - Color color = CSSUtilities.convertStopColor(stopElement, opacity, ctx); + Color color; + try { + color = CSSUtilities.convertStopColor(stopElement, opacity, ctx); + } catch (Exception ex) { + throw new BridgeException(ctx, stopElement, ex, ERR_CSS_VALUE_ERROR, + new Object[] { ex }); + } return new Stop(color, offset); } diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/BridgeContext.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/BridgeContext.java index def8d791b..76c02f064 100644 --- a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/BridgeContext.java +++ b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/BridgeContext.java @@ -803,6 +803,7 @@ public Element getReferencedElement(Element e, String uri) { * * @param e the element interested in its viewport */ + @Override public Viewport getViewport(Element e) { if (viewportStack != null) { // building time @@ -1896,11 +1897,9 @@ public boolean checkInteractiveElement(SVGDocument doc, Element e) { * * // Check if cursor property is set to something other than 'auto'. Value * cursorValue = CSSUtilities.getComputedStyle (e, SVGCSSEngine.CURSOR_INDEX); - * if ((cursorValue != null) && (cursorValue.getCssValueType() == - * CSSValue.CSS_PRIMITIVE_VALUE) && (cursorValue.getPrimitiveType() == - * CSSPrimitiveValue.CSS_IDENT) && - * (SVGConstants.SVG_AUTO_VALUE.equals(cursorValue.getStringValue()))) return - * true; + * if ((cursorValue != null) && (cursorValue.getPrimitiveType() == Type.IDENT) + * && (SVGConstants.SVG_AUTO_VALUE.equals(cursorValue.getIdentifierValue()))) + * return true; */ // Check all the child elements for any of the above. diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/CSSFontFace.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/CSSFontFace.java index 3fece4672..705c0a68a 100644 --- a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/CSSFontFace.java +++ b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/CSSFontFace.java @@ -21,9 +21,8 @@ import java.util.LinkedList; import java.util.List; -import org.w3c.dom.css.CSSPrimitiveValue; -import org.w3c.dom.css.CSSValue; - +import io.sf.carte.echosvg.css.dom.CSSValue.CssType; +import io.sf.carte.echosvg.css.dom.CSSValue.Type; import io.sf.carte.echosvg.css.engine.CSSEngine; import io.sf.carte.echosvg.css.engine.FontFaceRule; import io.sf.carte.echosvg.css.engine.SVGCSSEngine; @@ -85,10 +84,10 @@ public static CSSFontFace createCSSFontFace(CSSEngine eng, FontFaceRule ffr) { ParsedURL base = ffr.getURL(); if ((v != null) && (v != ValueConstants.NONE_VALUE)) { - if (v.getCssValueType() == CSSValue.CSS_PRIMITIVE_VALUE) { + if (v.getCssValueType() == CssType.TYPED) { ret.srcs = new LinkedList<>(); ret.srcs.add(getSrcValue(v, base)); - } else if (v.getCssValueType() == CSSValue.CSS_VALUE_LIST) { + } else if (v.getCssValueType() == CssType.LIST) { ret.srcs = new LinkedList<>(); for (int i = 0; i < v.getLength(); i++) { ret.srcs.add(getSrcValue(v.item(i), base)); @@ -115,14 +114,12 @@ public static CSSFontFace createCSSFontFace(CSSEngine eng, FontFaceRule ffr) { } public static Object getSrcValue(Value v, ParsedURL base) { - if (v.getCssValueType() != CSSValue.CSS_PRIMITIVE_VALUE) - return null; - if (v.getPrimitiveType() == CSSPrimitiveValue.CSS_URI) { + if (v.getPrimitiveType() == Type.URI) { if (base != null) - return new ParsedURL(base, v.getStringValue()); - return new ParsedURL(v.getStringValue()); + return new ParsedURL(base, v.getURIValue()); + return new ParsedURL(v.getURIValue()); } - if (v.getPrimitiveType() == CSSPrimitiveValue.CSS_STRING) + if (v.getPrimitiveType() == Type.STRING) return v.getStringValue(); return null; } @@ -134,7 +131,7 @@ public static String getStringProp(StyleMap sm, CSSEngine eng, int pidx) { ValueManager vm = vms[pidx]; v = vm.getDefaultValue(); } - while (v.getCssValueType() == CSSValue.CSS_VALUE_LIST) { + while (v.getCssValueType() == CssType.LIST) { v = v.item(0); } return v.getStringValue(); @@ -147,7 +144,7 @@ public static float getFloatProp(StyleMap sm, CSSEngine eng, int pidx) { ValueManager vm = vms[pidx]; v = vm.getDefaultValue(); } - while (v.getCssValueType() == CSSValue.CSS_VALUE_LIST) { + while (v.getCssValueType() == CssType.LIST) { v = v.item(0); } return v.getFloatValue(); diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/CSSUtilities.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/CSSUtilities.java index 07c2b5360..da10fdde3 100644 --- a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/CSSUtilities.java +++ b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/CSSUtilities.java @@ -27,15 +27,15 @@ import java.awt.geom.Rectangle2D; import org.w3c.dom.Element; -import org.w3c.dom.css.CSSPrimitiveValue; -import org.w3c.dom.css.CSSValue; import io.sf.carte.echosvg.anim.dom.SVGOMDocument; import io.sf.carte.echosvg.constants.XMLConstants; +import io.sf.carte.echosvg.css.dom.CSSValue.CssType; +import io.sf.carte.echosvg.css.dom.CSSValue.Type; import io.sf.carte.echosvg.css.engine.CSSEngine; import io.sf.carte.echosvg.css.engine.CSSStylableElement; import io.sf.carte.echosvg.css.engine.SVGCSSEngine; -import io.sf.carte.echosvg.css.engine.value.ListValue; +import io.sf.carte.echosvg.css.engine.value.RectValue; import io.sf.carte.echosvg.css.engine.value.Value; import io.sf.carte.echosvg.ext.awt.MultipleGradientPaint; import io.sf.carte.echosvg.ext.awt.image.renderable.ClipRable; @@ -99,7 +99,7 @@ public static Value getComputedStyle(Element e, int property) { */ public static int convertPointerEvents(Element e) { Value v = getComputedStyle(e, SVGCSSEngine.POINTER_EVENTS_INDEX); - String s = v.getStringValue(); + String s = v.getIdentifierValue(); switch (s.charAt(0)) { case 'v': if (s.length() == 7) { @@ -146,11 +146,10 @@ public static int convertPointerEvents(Element e) { public static Rectangle2D convertEnableBackground(Element e /* * , UnitProcessor.Context uctx */) { - Value v = getComputedStyle(e, SVGCSSEngine.ENABLE_BACKGROUND_INDEX); - if (v.getCssValueType() != CSSValue.CSS_VALUE_LIST) { + Value lv = getComputedStyle(e, SVGCSSEngine.ENABLE_BACKGROUND_INDEX); + if (lv.getCssValueType() != CssType.LIST) { return null; // accumulate } - ListValue lv = (ListValue) v; int length = lv.getLength(); switch (length) { case 1: @@ -180,7 +179,7 @@ public static Rectangle2D convertEnableBackground(Element e /* */ public static boolean convertColorInterpolationFilters(Element e) { Value v = getComputedStyle(e, SVGCSSEngine.COLOR_INTERPOLATION_FILTERS_INDEX); - return CSS_LINEARRGB_VALUE == v.getStringValue(); + return CSS_LINEARRGB_VALUE == v.getIdentifierValue(); } ///////////////////////////////////////////////////////////////////////// @@ -195,7 +194,7 @@ public static boolean convertColorInterpolationFilters(Element e) { */ public static MultipleGradientPaint.ColorSpaceEnum convertColorInterpolation(Element e) { Value v = getComputedStyle(e, SVGCSSEngine.COLOR_INTERPOLATION_INDEX); - return (CSS_LINEARRGB_VALUE == v.getStringValue()) ? MultipleGradientPaint.LINEAR_RGB + return (CSS_LINEARRGB_VALUE == v.getIdentifierValue()) ? MultipleGradientPaint.LINEAR_RGB : MultipleGradientPaint.SRGB; } @@ -211,15 +210,13 @@ public static boolean isAutoCursor(Element e) { boolean isAuto = false; if (cursorValue != null) { - if (cursorValue.getCssValueType() == CSSValue.CSS_PRIMITIVE_VALUE - && cursorValue.getPrimitiveType() == CSSPrimitiveValue.CSS_IDENT - && cursorValue.getStringValue().charAt(0) == 'a') { + if (cursorValue.getPrimitiveType() == Type.IDENT + && cursorValue.getIdentifierValue().charAt(0) == 'a') { isAuto = true; - } else if (cursorValue.getCssValueType() == CSSValue.CSS_VALUE_LIST && cursorValue.getLength() == 1) { + } else if (cursorValue.getCssValueType() == CssType.LIST && cursorValue.getLength() == 1) { Value lValue = cursorValue.item(0); - if (lValue != null && lValue.getCssValueType() == CSSValue.CSS_PRIMITIVE_VALUE - && lValue.getPrimitiveType() == CSSPrimitiveValue.CSS_IDENT - && lValue.getStringValue().charAt(0) == 'a') { + if (lValue != null && lValue.getPrimitiveType() == Type.IDENT + && lValue.getIdentifierValue().charAt(0) == 'a') { isAuto = true; } } @@ -281,7 +278,7 @@ public static Cursor convertCursor(Element e, BridgeContext ctx) { */ public static RenderingHints convertShapeRendering(Element e, RenderingHints hints) { Value v = getComputedStyle(e, SVGCSSEngine.SHAPE_RENDERING_INDEX); - String s = v.getStringValue(); + String s = v.getIdentifierValue(); int len = s.length(); if ((len == 4) && (s.charAt(0) == 'a')) // auto return hints; @@ -360,7 +357,7 @@ public static RenderingHints convertShapeRendering(Element e, RenderingHints hin */ public static RenderingHints convertTextRendering(Element e, RenderingHints hints) { Value v = getComputedStyle(e, SVGCSSEngine.TEXT_RENDERING_INDEX); - String s = v.getStringValue(); + String s = v.getIdentifierValue(); int len = s.length(); if ((len == 4) && (s.charAt(0) == 'a')) // auto return hints; @@ -428,7 +425,7 @@ public static RenderingHints convertTextRendering(Element e, RenderingHints hint */ public static RenderingHints convertImageRendering(Element e, RenderingHints hints) { Value v = getComputedStyle(e, SVGCSSEngine.IMAGE_RENDERING_INDEX); - String s = v.getStringValue(); + String s = v.getIdentifierValue(); int len = s.length(); if ((len == 4) && (s.charAt(0) == 'a')) // auto return hints; @@ -483,7 +480,7 @@ public static RenderingHints convertImageRendering(Element e, RenderingHints hin */ public static RenderingHints convertColorRendering(Element e, RenderingHints hints) { Value v = getComputedStyle(e, SVGCSSEngine.COLOR_RENDERING_INDEX); - String s = v.getStringValue(); + String s = v.getIdentifierValue(); int len = s.length(); if ((len == 4) && (s.charAt(0) == 'a')) // auto return hints; @@ -521,7 +518,7 @@ public static boolean convertDisplay(Element e) { return true; } Value v = getComputedStyle(e, SVGCSSEngine.DISPLAY_INDEX); - return v.getStringValue().charAt(0) != 'n'; + return v.getIdentifierValue().charAt(0) != 'n'; } ///////////////////////////////////////////////////////////////////////// @@ -536,7 +533,7 @@ public static boolean convertDisplay(Element e) { */ public static boolean convertVisibility(Element e) { Value v = getComputedStyle(e, SVGCSSEngine.VISIBILITY_INDEX); - return v.getStringValue().charAt(0) == 'v'; + return v.getIdentifierValue().charAt(0) == 'v'; } ///////////////////////////////////////////////////////////////////////// @@ -576,7 +573,7 @@ public static Composite convertOpacity(Element e) { */ public static boolean convertOverflow(Element e) { Value v = getComputedStyle(e, SVGCSSEngine.OVERFLOW_INDEX); - String s = v.getStringValue(); + String s = v.getIdentifierValue(); return (s.charAt(0) == 'h') || (s.charAt(0) == 's'); } @@ -588,20 +585,20 @@ public static boolean convertOverflow(Element e) { */ public static float[] convertClip(Element e) { Value v = getComputedStyle(e, SVGCSSEngine.CLIP_INDEX); - int primitiveType = v.getPrimitiveType(); - switch (primitiveType) { - case CSSPrimitiveValue.CSS_RECT: + switch (v.getPrimitiveType()) { + case RECT: float[] off = new float[4]; - off[0] = v.getTop().getFloatValue(); - off[1] = v.getRight().getFloatValue(); - off[2] = v.getBottom().getFloatValue(); - off[3] = v.getLeft().getFloatValue(); + RectValue rect = v.getRectValue(); + off[0] = rect.getTop().getFloatValue(); + off[1] = rect.getRight().getFloatValue(); + off[2] = rect.getBottom().getFloatValue(); + off[3] = rect.getLeft().getFloatValue(); return off; - case CSSPrimitiveValue.CSS_IDENT: + case IDENT: return null; // 'auto' means no offsets default: // can't be reached - throw new IllegalStateException("Unexpected primitiveType:" + primitiveType); + throw new IllegalStateException("Unexpected primitiveType: " + v.getPrimitiveType()); } } @@ -619,13 +616,13 @@ public static float[] convertClip(Element e) { */ public static Filter convertFilter(Element filteredElement, GraphicsNode filteredNode, BridgeContext ctx) { Value v = getComputedStyle(filteredElement, SVGCSSEngine.FILTER_INDEX); - int primitiveType = v.getPrimitiveType(); + Type primitiveType = v.getPrimitiveType(); switch (primitiveType) { - case CSSPrimitiveValue.CSS_IDENT: + case IDENT: return null; // 'filter:none' - case CSSPrimitiveValue.CSS_URI: - String uri = v.getStringValue(); + case URI: + String uri = v.getURIValue(); Element filter = ctx.getReferencedElement(filteredElement, uri); if (filter == null) { return null; // Missing reference @@ -666,13 +663,13 @@ public static Filter convertFilter(Element filteredElement, GraphicsNode filtere */ public static ClipRable convertClipPath(Element clippedElement, GraphicsNode clippedNode, BridgeContext ctx) { Value v = getComputedStyle(clippedElement, SVGCSSEngine.CLIP_PATH_INDEX); - int primitiveType = v.getPrimitiveType(); + Type primitiveType = v.getPrimitiveType(); switch (primitiveType) { - case CSSPrimitiveValue.CSS_IDENT: + case IDENT: return null; // 'clip-path:none' - case CSSPrimitiveValue.CSS_URI: - String uri = v.getStringValue(); + case URI: + String uri = v.getURIValue(); Element cp = ctx.getReferencedElement(clippedElement, uri); if (cp == null) { return null; // Missing reference @@ -706,7 +703,7 @@ public static ClipRable convertClipPath(Element clippedElement, GraphicsNode cli */ public static int convertClipRule(Element e) { Value v = getComputedStyle(e, SVGCSSEngine.CLIP_RULE_INDEX); - return (v.getStringValue().charAt(0) == 'n') ? Path2D.WIND_NON_ZERO : Path2D.WIND_EVEN_ODD; + return (v.getIdentifierValue().charAt(0) == 'n') ? Path2D.WIND_NON_ZERO : Path2D.WIND_EVEN_ODD; } ///////////////////////////////////////////////////////////////////////// @@ -723,13 +720,13 @@ public static int convertClipRule(Element e) { */ public static Mask convertMask(Element maskedElement, GraphicsNode maskedNode, BridgeContext ctx) { Value v = getComputedStyle(maskedElement, SVGCSSEngine.MASK_INDEX); - int primitiveType = v.getPrimitiveType(); + Type primitiveType = v.getPrimitiveType(); switch (primitiveType) { - case CSSPrimitiveValue.CSS_IDENT: + case IDENT: return null; // 'mask:none' - case CSSPrimitiveValue.CSS_URI: - String uri = v.getStringValue(); + case URI: + String uri = v.getURIValue(); Element m = ctx.getReferencedElement(maskedElement, uri); if (m == null) { return null; // Missing reference @@ -763,7 +760,7 @@ public static Mask convertMask(Element maskedElement, GraphicsNode maskedNode, B */ public static int convertFillRule(Element e) { Value v = getComputedStyle(e, SVGCSSEngine.FILL_RULE_INDEX); - return (v.getStringValue().charAt(0) == 'n') ? Path2D.WIND_NON_ZERO : Path2D.WIND_EVEN_ODD; + return (v.getIdentifierValue().charAt(0) == 'n') ? Path2D.WIND_NON_ZERO : Path2D.WIND_EVEN_ODD; } ///////////////////////////////////////////////////////////////////////// @@ -779,8 +776,8 @@ public static int convertFillRule(Element e) { */ public static Color convertLightingColor(Element e, BridgeContext ctx) { Value v = getComputedStyle(e, SVGCSSEngine.LIGHTING_COLOR_INDEX); - if (v.getCssValueType() == CSSValue.CSS_PRIMITIVE_VALUE) { - return PaintServer.convertColor(v, 1); + if (v.getCssValueType() != CssType.LIST) { + return PaintServer.convertColor(v.getColorValue(), 1); } else { return PaintServer.convertRGBICCColor(e, v.item(0), v.item(1), 1, ctx); } @@ -801,8 +798,8 @@ public static Color convertFloodColor(Element e, BridgeContext ctx) { Value v = getComputedStyle(e, SVGCSSEngine.FLOOD_COLOR_INDEX); Value o = getComputedStyle(e, SVGCSSEngine.FLOOD_OPACITY_INDEX); float f = PaintServer.convertOpacity(o); - if (v.getCssValueType() == CSSValue.CSS_PRIMITIVE_VALUE) { - return PaintServer.convertColor(v, f); + if (v.getCssValueType() != CssType.LIST) { + return PaintServer.convertColor(v.getColorValue(), f); } else { return PaintServer.convertRGBICCColor(e, v.item(0), v.item(1), f, ctx); } @@ -824,8 +821,8 @@ public static Color convertStopColor(Element e, float opacity, BridgeContext ctx Value v = getComputedStyle(e, SVGCSSEngine.STOP_COLOR_INDEX); Value o = getComputedStyle(e, SVGCSSEngine.STOP_OPACITY_INDEX); opacity *= PaintServer.convertOpacity(o); - if (v.getCssValueType() == CSSValue.CSS_PRIMITIVE_VALUE) { - return PaintServer.convertColor(v, opacity); + if (v.getCssValueType() != CssType.LIST) { + return PaintServer.convertColor(v.getColorValue(), opacity); } else { return PaintServer.convertRGBICCColor(e, v.item(0), v.item(1), opacity, ctx); } @@ -865,13 +862,13 @@ public static void computeStyleAndURIs(Element refElement, Element localRefEleme ///////////////////////////////////////////////////////////////////////// /** - * Returns the winding rule represented by the specified CSSValue. + * Returns the winding rule represented by the specified Value. * * @param v the value that represents the rule * @return GeneralPath.WIND_NON_ZERO | GeneralPath.WIND_EVEN_ODD */ - protected static int rule(CSSValue v) { - return (((CSSPrimitiveValue) v).getStringValue().charAt(0) == 'n') ? Path2D.WIND_NON_ZERO + protected static int rule(Value v) { + return v.getIdentifierValue().charAt(0) == 'n' ? Path2D.WIND_NON_ZERO : Path2D.WIND_EVEN_ODD; } diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/CursorManager.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/CursorManager.java index 125bd59bb..89114b1b7 100644 --- a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/CursorManager.java +++ b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/CursorManager.java @@ -37,11 +37,11 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; -import org.w3c.dom.css.CSSPrimitiveValue; -import org.w3c.dom.css.CSSValue; import org.w3c.dom.svg.SVGDocument; import org.w3c.dom.svg.SVGPreserveAspectRatio; +import io.sf.carte.echosvg.css.dom.CSSValue.CssType; +import io.sf.carte.echosvg.css.dom.CSSValue.Type; import io.sf.carte.echosvg.css.engine.SVGCSSEngine; import io.sf.carte.echosvg.css.engine.value.Value; import io.sf.carte.echosvg.dom.AbstractNode; @@ -174,18 +174,17 @@ public Cursor convertCursor(Element e) { String cursorStr = SVGConstants.SVG_AUTO_VALUE; if (cursorValue != null) { - if (cursorValue.getCssValueType() == CSSValue.CSS_PRIMITIVE_VALUE - && cursorValue.getPrimitiveType() == CSSPrimitiveValue.CSS_IDENT) { + if (cursorValue.getPrimitiveType() == Type.IDENT) { // Single Value : should be one of the predefined cursors or // 'inherit' - cursorStr = cursorValue.getStringValue(); + cursorStr = cursorValue.getIdentifierValue(); return convertBuiltInCursor(e, cursorStr); - } else if (cursorValue.getCssValueType() == CSSValue.CSS_VALUE_LIST) { + } else if (cursorValue.getCssValueType() == CssType.LIST) { int nValues = cursorValue.getLength(); if (nValues == 1) { cursorValue = cursorValue.item(0); - if (cursorValue.getPrimitiveType() == CSSPrimitiveValue.CSS_IDENT) { - cursorStr = cursorValue.getStringValue(); + if (cursorValue.getPrimitiveType() == Type.IDENT) { + cursorStr = cursorValue.getIdentifierValue(); return convertBuiltInCursor(e, cursorStr); } } else if (nValues > 1) { @@ -273,8 +272,8 @@ public Cursor convertSVGCursor(Element e, Value l) { Element cursorElement = null; for (int i = 0; i < nValues - 1; i++) { Value cursorValue = l.item(i); - if (cursorValue.getPrimitiveType() == CSSPrimitiveValue.CSS_URI) { - String uri = cursorValue.getStringValue(); + if (cursorValue.getPrimitiveType() == Type.URI) { + String uri = cursorValue.getURIValue(); // If the uri does not resolve to a cursor element, // then, this is not a type of cursor uri we can handle: @@ -310,8 +309,8 @@ public Cursor convertSVGCursor(Element e, Value l) { // Fallback on the built in cursor property. Value cursorValue = l.item(nValues - 1); String cursorStr = SVGConstants.SVG_AUTO_VALUE; - if (cursorValue.getPrimitiveType() == CSSPrimitiveValue.CSS_IDENT) { - cursorStr = cursorValue.getStringValue(); + if (cursorValue.getPrimitiveType() == Type.IDENT) { + cursorStr = cursorValue.getIdentifierValue(); } return convertBuiltInCursor(e, cursorStr); diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/ErrorConstants.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/ErrorConstants.java index ba8a534ba..0a0415691 100644 --- a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/ErrorConstants.java +++ b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/ErrorConstants.java @@ -74,6 +74,19 @@ public interface ErrorConstants { */ String ERR_CSS_URI_BAD_TARGET = "css.uri.badTarget"; + /** + * The error code when a URI specified in a CSS property referenced a bad + * element. + * + * 
+	 * {0} = the uri
+	 * {1} = the line
+	 * {2} = the local name
+	 * {3} = the exception
+	 *
+ */ + String ERR_CSS_VALUE_ERROR = "css.badValue"; + /** * The error code when a specified URI references a bad element. * diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/PaintServer.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/PaintServer.java index 1d758d341..f2b508f76 100644 --- a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/PaintServer.java +++ b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/PaintServer.java @@ -23,25 +23,25 @@ import java.awt.Paint; import java.awt.Shape; import java.awt.Stroke; +import java.awt.color.ColorSpace; +import java.awt.color.ICC_ColorSpace; import java.awt.color.ICC_Profile; import java.io.IOException; +import java.io.InputStream; -import io.sf.graphics.java2d.color.CIELabColorSpace; -import io.sf.graphics.java2d.color.ColorSpaces; -import io.sf.graphics.java2d.color.ColorWithAlternatives; -import io.sf.graphics.java2d.color.DeviceCMYKColorSpace; -import io.sf.graphics.java2d.color.ICCColorSpaceWithIntent; -import io.sf.graphics.java2d.color.NamedColorSpace; -import io.sf.graphics.java2d.color.profile.NamedColorProfile; -import io.sf.graphics.java2d.color.profile.NamedColorProfileParser; +import org.w3c.css.om.typed.CSSStyleValueList; +import org.w3c.css.om.unit.CSSUnit; import org.w3c.dom.Element; -import org.w3c.dom.css.CSSPrimitiveValue; -import org.w3c.dom.css.CSSValue; +import io.sf.carte.echosvg.css.dom.CSSValue.CssType; +import io.sf.carte.echosvg.css.dom.CSSValue.Type; import io.sf.carte.echosvg.css.engine.SVGCSSEngine; +import io.sf.carte.echosvg.css.engine.value.ColorFunction; +import io.sf.carte.echosvg.css.engine.value.ColorValue; +import io.sf.carte.echosvg.css.engine.value.NumericValue; +import io.sf.carte.echosvg.css.engine.value.RGBColorValue; import io.sf.carte.echosvg.css.engine.value.Value; import io.sf.carte.echosvg.css.engine.value.svg.ICCColor; -import io.sf.carte.echosvg.css.engine.value.svg12.CIELabColor; import io.sf.carte.echosvg.css.engine.value.svg12.DeviceColor; import io.sf.carte.echosvg.css.engine.value.svg12.ICCNamedColor; import io.sf.carte.echosvg.gvt.CompositeShapePainter; @@ -54,6 +54,13 @@ import io.sf.carte.echosvg.gvt.StrokeShapePainter; import io.sf.carte.echosvg.util.CSSConstants; import io.sf.carte.echosvg.util.SVGConstants; +import io.sf.graphics.java2d.color.ColorSpaces; +import io.sf.graphics.java2d.color.ColorWithAlternatives; +import io.sf.graphics.java2d.color.DeviceCMYKColorSpace; +import io.sf.graphics.java2d.color.ICCColorSpaceWithIntent; +import io.sf.graphics.java2d.color.NamedColorSpace; +import io.sf.graphics.java2d.color.profile.NamedColorProfile; +import io.sf.graphics.java2d.color.profile.NamedColorProfileParser; /** * A collection of utility methods to deliver java.awt.Paint, @@ -61,10 +68,13 @@ * This class also provides additional methods the deliver SVG Paint using the * ShapePainter interface. * - * @author Thierry Kormann - * @author For later modifications, see Git history. + *

+ * Original author: Thierry Kormann. + * For later modifications, see Git history. + *

* @version $Id$ */ +@SuppressWarnings("deprecation") public abstract class PaintServer implements SVGConstants, CSSConstants, ErrorConstants { /** @@ -119,10 +129,10 @@ public static ShapePainter convertMarkers(Element e, ShapeNode node, BridgeConte */ public static Marker convertMarker(Element e, Value v, BridgeContext ctx) { - if (v.getPrimitiveType() == CSSPrimitiveValue.CSS_IDENT) { + if (v.getPrimitiveType() == Type.IDENT) { return null; // 'none' } else { - String uri = v.getStringValue(); + String uri = v.getURIValue(); Element markerElement = ctx.getReferencedElement(e, uri); if (markerElement == null) { return null; // Missing reference @@ -245,51 +255,57 @@ public static Paint convertFillPaint(Element filledElement, GraphicsNode filledN */ public static Paint convertPaint(Element paintedElement, GraphicsNode paintedNode, Value paintDef, float opacity, BridgeContext ctx) { - if (paintDef.getCssValueType() == CSSValue.CSS_PRIMITIVE_VALUE) { + if (paintDef.getCssValueType() == CssType.TYPED) { switch (paintDef.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_IDENT: + case IDENT: return null; // none - - case CSSPrimitiveValue.CSS_RGBCOLOR: - return convertColor(paintDef, opacity); - - case CSSPrimitiveValue.CSS_URI: + case COLOR: + return convertColor(paintDef.getColorValue(), opacity); + case URI: return convertURIPaint(paintedElement, paintedNode, paintDef, opacity, ctx); - default: - throw new IllegalArgumentException("Paint argument is not an appropriate CSS value"); + break; } } else { // List Value v = paintDef.item(0); switch (v.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_RGBCOLOR: - return convertRGBICCColor(paintedElement, v, paintDef.item(1), opacity, ctx); + case COLOR: + switch ((v.getColorValue()).getCSSColorSpace()) { + case ColorValue.RGB_FUNCTION: + return convertRGBICCColor(paintedElement, v, paintDef.item(1), opacity, ctx); + } + break; - case CSSPrimitiveValue.CSS_URI: { + case URI: Paint result = silentConvertURIPaint(paintedElement, paintedNode, v, opacity, ctx); - if (result != null) + if (result != null) { return result; + } v = paintDef.item(1); switch (v.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_IDENT: + case IDENT: return null; // none - - case CSSPrimitiveValue.CSS_RGBCOLOR: - if (paintDef.getLength() == 2) { - return convertColor(v, opacity); - } else { - return convertRGBICCColor(paintedElement, v, paintDef.item(2), opacity, ctx); + case COLOR: + ColorValue color = v.getColorValue(); + switch (color.getCSSColorSpace()) { + case ColorValue.RGB_FUNCTION: + if (paintDef.getLength() == 2) { + return convertColor((RGBColorValue) color, opacity); + } else { + return convertRGBICCColor(paintedElement, v, paintDef.item(2), opacity, ctx); + } } + break; default: - throw new IllegalArgumentException("Paint argument is not an appropriate CSS value"); + break; } - } + default: - // can't be reached - throw new IllegalArgumentException("Paint argument is not an appropriate CSS value"); + break; } } + throw new IllegalArgumentException("Paint argument is not an appropriate CSS value"); } /** @@ -326,7 +342,7 @@ public static Paint silentConvertURIPaint(Element paintedElement, GraphicsNode p public static Paint convertURIPaint(Element paintedElement, GraphicsNode paintedNode, Value paintDef, float opacity, BridgeContext ctx) { - String uri = paintDef.getStringValue(); + String uri = paintDef.getURIValue(); Element paintElement = ctx.getReferencedElement(paintedElement, uri); if (paintElement == null) { return null; // Missing reference @@ -369,14 +385,12 @@ public static Color convertRGBICCColor(Element paintedElement, Value colorDef, V color = convertICCColor(paintedElement, (ICCColor) iccColor, opacity, ctx); } else if (iccColor instanceof ICCNamedColor) { color = convertICCNamedColor(paintedElement, (ICCNamedColor) iccColor, opacity, ctx); - } else if (iccColor instanceof CIELabColor) { - color = convertCIELabColor(paintedElement, (CIELabColor) iccColor, opacity, ctx); } else if (iccColor instanceof DeviceColor) { color = convertDeviceColor(paintedElement, colorDef, (DeviceColor) iccColor, opacity, ctx); } } if (color == null) { - color = convertColor(colorDef, opacity); + color = convertColor(colorDef.getColorValue(), opacity); } return color; } @@ -482,22 +496,6 @@ public static Color convertICCNamedColor(Element e, ICCNamedColor c, float opaci return null; } - /** - * Returns a Color object that corresponds to the input Paint's CIE Lab color - * value. - * - * @param e the element using the color - * @param c the CIE Lab color definition - * @param opacity the opacity - * @param ctx the bridge context to use - */ - public static Color convertCIELabColor(Element e, CIELabColor c, float opacity, BridgeContext ctx) { - CIELabColorSpace cs = new CIELabColorSpace(c.getWhitePoint()); - float[] lab = c.getColorValues(); - Color specColor = cs.toColor(lab[0], lab[1], lab[2], opacity); - return specColor; - } - /** * Returns a Color object that corresponds to the input Paint's device-specific * color value. @@ -509,8 +507,9 @@ public static Color convertCIELabColor(Element e, CIELabColor c, float opacity, * @param ctx the bridge context to use */ public static Color convertDeviceColor(Element e, Value srgb, DeviceColor c, float opacity, BridgeContext ctx) { + ColorValue color = srgb.getColorValue(); if (c.isNChannel()) { - return convertColor(srgb, opacity); // NYI + return convertColor(color, opacity); // NYI } else { if (c.getNumberOfColors() == 4) { DeviceCMYKColorSpace cmykCs = ColorSpaces.getDeviceCMYKColorSpace(); @@ -519,15 +518,16 @@ public static Color convertDeviceColor(Element e, Value srgb, DeviceColor c, flo comps[i] = c.getColor(i); } Color cmyk = new ColorWithAlternatives(cmykCs, comps, opacity, null); - int r = resolveColorComponent(srgb.getRed()); - int g = resolveColorComponent(srgb.getGreen()); - int b = resolveColorComponent(srgb.getBlue()); + RGBColorValue rgb = (RGBColorValue) color; + int r = resolveColorComponent(rgb.getR()); + int g = resolveColorComponent(rgb.getG()); + int b = resolveColorComponent(rgb.getB()); float a = resolveAlphaComponent(c.getAlpha()); Color specColor = new ColorWithAlternatives(r, g, b, Math.round(a * opacity * 255f), new Color[] { cmyk }); return specColor; } else { - return convertColor(srgb, opacity); // NYI + return convertColor(color, opacity); // NYI } } } @@ -538,14 +538,127 @@ public static Color convertDeviceColor(Element e, Value srgb, DeviceColor c, flo * @param c The CSS color to convert. * @param opacity The opacity value (0 <= o <= 1). */ - public static Color convertColor(Value c, float opacity) { - int r = resolveColorComponent(c.getRed()); - int g = resolveColorComponent(c.getGreen()); - int b = resolveColorComponent(c.getBlue()); + public static Color convertColor(ColorValue c, float opacity) { + switch (c.getCSSColorSpace()) { + case ColorValue.RGB_FUNCTION: + return convertColor((RGBColorValue) c, opacity); + case ColorValue.LAB: + case ColorValue.LCH: + throw new UnsupportedOperationException(); + default: + // Color() function + return convertColor((ColorFunction) c, opacity); + } + } + + /** + * Converts the given Value and opacity to a Color object. + * + * @param c The CSS color to convert. + * @param opacity The opacity value (0 <= o <= 1). + */ + public static Color convertColor(RGBColorValue c, float opacity) { + int r = resolveColorComponent(c.getR()); + int g = resolveColorComponent(c.getG()); + int b = resolveColorComponent(c.getB()); float a = resolveAlphaComponent(c.getAlpha()); return new Color(r, g, b, Math.round(a * opacity * 255f)); } + /** + * Converts the given Value and opacity to a Color object. + * + * @param c The CSS color to convert. + * @param opacity The opacity value (0 <= o <= 1). + */ + public static Color convertColor(ColorFunction c, float opacity) { + switch (c.getCSSColorSpace()) { + case ColorValue.CS_DISPLAY_P3: + return convertProfiledColor("color/profiles/Display P3.icc", c, opacity); + case ColorValue.CS_A98_RGB: + return convertProfiledColor("color/profiles/ClayRGB-elle-V4-g22.icc", c, opacity); + case ColorValue.CS_PROPHOTO_RGB: + return convertProfiledColor("color/profiles/LargeRGB-elle-V4-g18.icc", c, opacity); + case ColorValue.CS_REC2020: + return convertProfiledColor("color/profiles/ITU-R_BT2020.icc", c, opacity); + case ColorValue.CS_SRGB_LINEAR: + ColorSpace cs = ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB); + return convert3Color(cs, c, opacity); + case ColorValue.CS_XYZ: + case ColorValue.CS_XYZ_D65: + CSSStyleValueList chs = c.getChannels(); + float[] ch = new float[3]; + ch[0] = resolveColorFunctionComponent(chs.item(0)); + ch[1] = resolveColorFunctionComponent(chs.item(1)); + ch[2] = resolveColorFunctionComponent(chs.item(2)); + float[] xyzd50 = d65xyzToD50(ch); + float a = resolveAlphaComponent(c.getAlpha()); + cs = ColorSpace.getInstance(ColorSpace.CS_CIEXYZ); + return new Color(cs, xyzd50, a * opacity); + case ColorValue.CS_XYZ_D50: + cs = ColorSpace.getInstance(ColorSpace.CS_CIEXYZ); + return convert3Color(cs, c, opacity); + default: + throw new UnsupportedOperationException(); + } + } + + private static Color convertProfiledColor(String profilePath, ColorFunction c, float opacity) { + ICC_Profile icc; + try (InputStream is = PaintServer.class.getResourceAsStream(profilePath)) { + icc = ICC_Profile.getInstance(is); + } catch (IOException e) { + e.printStackTrace(); + return null; + } + ICC_ColorSpace space = new ICC_ColorSpace(icc); + return convert3Color(space, c, opacity); + } + + private static Color convert3Color(ColorSpace space, ColorFunction c, float opacity) { + CSSStyleValueList chs = c.getChannels(); + float[] ch = new float[3]; + ch[0] = resolveColorFunctionComponent(chs.item(0)); + ch[1] = resolveColorFunctionComponent(chs.item(1)); + ch[2] = resolveColorFunctionComponent(chs.item(2)); + float a = resolveAlphaComponent(c.getAlpha()); + return new Color(space, ch, a * opacity); + } + + private static float resolveColorFunctionComponent(NumericValue item) { + float f = item.getFloatValue(); + switch (item.getCSSUnit()) { + case CSSUnit.CSS_NUMBER: + if (f < 0f) { + f = 0f; + } else if (f > 1f) { + f = 1f; + } + return f; + case CSSUnit.CSS_PERCENTAGE: + if (f < 0f) { + f = 0f; + } else if (f > 100f) { + f = 100f; + } + return f * 0.01f; + } + throw new IllegalArgumentException("Invalid color component: " + item.getCssText()); + } + + private static float[] d65xyzToD50(float[] xyz) { + // Chromatic adjustment: D65 to D50, Bradford + // See http://www.brucelindbloom.com/index.html?Eqn_ChromAdapt.html + float[] xyzadj = new float[3]; + xyzadj[0] = (float) (1.0478112436606313d * xyz[0] + 0.022886602481693052d * xyz[1] + - 0.05012697596852886d * xyz[2]); + xyzadj[1] = (float) (0.029542398290574905d * xyz[0] + 0.9904844034904394d * xyz[1] + - 0.017049095628961564d * xyz[2]); + xyzadj[2] = (float) (-0.009234489723309473d * xyz[0] + 0.015043616793498756d * xyz[1] + + 0.7521316354746059d * xyz[2]); + return xyzadj; + } + ///////////////////////////////////////////////////////////////////////// // java.awt.stroke ///////////////////////////////////////////////////////////////////////// @@ -611,7 +724,7 @@ public static Stroke convertStroke(Element e) { */ public static float[] convertStrokeDasharray(Value v) { float[] dasharray = null; - if (v.getCssValueType() == CSSValue.CSS_VALUE_LIST) { + if (v.getCssValueType() == CssType.LIST) { int length = v.getLength(); dasharray = new float[length]; float sum = 0; @@ -646,7 +759,7 @@ public static float convertStrokeMiterlimit(Value v) { * @param v the CSS value describing the linecap property */ public static int convertStrokeLinecap(Value v) { - String s = v.getStringValue(); + String s = v.getIdentifierValue(); switch (s.charAt(0)) { case 'b': return BasicStroke.CAP_BUTT; @@ -665,7 +778,7 @@ public static int convertStrokeLinecap(Value v) { * @param v the CSS value describing the linejoin property */ public static int convertStrokeLinejoin(Value v) { - String s = v.getStringValue(); + String s = v.getIdentifierValue(); switch (s.charAt(0)) { case 'm': return BasicStroke.JOIN_MITER; @@ -689,12 +802,12 @@ public static int convertStrokeLinejoin(Value v) { */ public static int resolveColorComponent(Value v) { float f; - switch (v.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_PERCENTAGE: + switch (v.getCSSUnit()) { + case CSSUnit.CSS_PERCENTAGE: f = v.getFloatValue(); f = (f > 100f) ? 100f : (f < 0f) ? 0f : f; return Math.round(255f * f / 100f); - case CSSPrimitiveValue.CSS_NUMBER: + case CSSUnit.CSS_NUMBER: f = v.getFloatValue(); f = (f > 255f) ? 255f : (f < 0f) ? 0f : f; return Math.round(f); @@ -705,12 +818,12 @@ public static int resolveColorComponent(Value v) { private static float resolveAlphaComponent(Value v) { float f; - switch (v.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_PERCENTAGE: + switch (v.getCSSUnit()) { + case CSSUnit.CSS_PERCENTAGE: f = v.getFloatValue(); f = (f > 100f) ? 100f : (f < 0f) ? 0f : f; return f * 0.01f; - case CSSPrimitiveValue.CSS_NUMBER: + case CSSUnit.CSS_NUMBER: f = v.getFloatValue(); f = (f > 1f) ? 1f : (f < 0f) ? 0f : f; return f; diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/SVGAnimationEngine.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/SVGAnimationEngine.java index 38b03f225..7ca09dc38 100644 --- a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/SVGAnimationEngine.java +++ b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/SVGAnimationEngine.java @@ -28,11 +28,10 @@ import java.util.LinkedList; import java.util.Set; +import org.w3c.css.om.unit.CSSUnit; import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.w3c.dom.css.CSSPrimitiveValue; import org.w3c.dom.css.CSSStyleDeclaration; -import org.w3c.dom.css.CSSValue; import org.w3c.dom.events.EventTarget; import org.w3c.dom.svg.SVGAngle; import org.w3c.dom.svg.SVGLength; @@ -66,11 +65,11 @@ import io.sf.carte.echosvg.anim.values.AnimatableStringValue; import io.sf.carte.echosvg.anim.values.AnimatableValue; import io.sf.carte.echosvg.constants.XMLConstants; +import io.sf.carte.echosvg.css.dom.CSSValue.CssType; +import io.sf.carte.echosvg.css.dom.CSSValue.Type; import io.sf.carte.echosvg.css.engine.CSSEngine; import io.sf.carte.echosvg.css.engine.CSSStylableElement; import io.sf.carte.echosvg.css.engine.StyleMap; -import io.sf.carte.echosvg.css.engine.value.FloatValue; -import io.sf.carte.echosvg.css.engine.value.StringValue; import io.sf.carte.echosvg.css.engine.value.Value; import io.sf.carte.echosvg.css.engine.value.ValueManager; import io.sf.carte.echosvg.parser.DefaultLengthHandler; @@ -93,8 +92,10 @@ /** * An AnimationEngine for SVG documents. * - * @author Cameron McCormack - * @author For later modifications, see Git history. + *

+ * Original author: Cameron McCormack. + * For later modifications, see Git history. + *

* @version $Id$ */ public class SVGAnimationEngine extends AnimationEngine { @@ -1090,7 +1091,7 @@ protected Value computeValue(CSSStylableElement elt, String pn, Value v) { ValueManager[] vms = cssEngine.getValueManagers(); int idx = cssEngine.getPropertyIndex(pn); if (idx != -1) { - if (v.getCssValueType() == CSSValue.CSS_INHERIT) { + if (v.getPrimitiveType() == Type.INHERIT) { elt = CSSEngine.getParentCSSStylableElement(elt); if (elt != null) { return cssEngine.getComputedStyle(elt, null, idx); @@ -1200,10 +1201,10 @@ public AnimatableValue createValue(AnimationTarget target, String ns, String ln, */ @Override public AnimatableValue createValue(AnimationTarget target, String pn, Value v) { - switch (v.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_PERCENTAGE: + switch (v.getCSSUnit()) { + case CSSUnit.CSS_PERCENTAGE: return new AnimatableNumberOrPercentageValue(target, v.getFloatValue(), true); - case CSSPrimitiveValue.CSS_NUMBER: + case CSSUnit.CSS_NUMBER: return new AnimatableNumberOrPercentageValue(target, v.getFloatValue()); } // XXX Do something better than returning null. @@ -1760,12 +1761,11 @@ protected class AnimatableLengthOrIdentFactory extends CSSValueFactory { @Override protected AnimatableValue createAnimatableValue(AnimationTarget target, String pn, Value v) { - if (v instanceof StringValue) { - return new AnimatableLengthOrIdentValue(target, v.getStringValue()); + if (v.getPrimitiveType() == Type.IDENT) { + return new AnimatableLengthOrIdentValue(target, v.getIdentifierValue()); } short pcInterp = target.getPercentageInterpretation(null, pn, true); - FloatValue fv = (FloatValue) v; - return new AnimatableLengthOrIdentValue(target, fv.getPrimitiveType(), fv.getFloatValue(), pcInterp); + return new AnimatableLengthOrIdentValue(target, v.getCSSUnit(), v.getFloatValue(), pcInterp); } } @@ -1787,11 +1787,10 @@ public AnimatableNumberOrIdentFactory(boolean numericIdents) { @Override protected AnimatableValue createAnimatableValue(AnimationTarget target, String pn, Value v) { - if (v instanceof StringValue) { - return new AnimatableNumberOrIdentValue(target, v.getStringValue()); + if (v.getPrimitiveType() == Type.IDENT) { + return new AnimatableNumberOrIdentValue(target, v.getIdentifierValue()); } - FloatValue fv = (FloatValue) v; - return new AnimatableNumberOrIdentValue(target, fv.getFloatValue(), numericIdents); + return new AnimatableNumberOrIdentValue(target, v.getFloatValue(), numericIdents); } } @@ -1803,24 +1802,23 @@ protected class AnimatableAngleValueFactory extends CSSValueFactory { @Override protected AnimatableValue createAnimatableValue(AnimationTarget target, String pn, Value v) { - FloatValue fv = (FloatValue) v; short unit; - switch (fv.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_NUMBER: - case CSSPrimitiveValue.CSS_DEG: + switch (v.getCSSUnit()) { + case CSSUnit.CSS_NUMBER: + case CSSUnit.CSS_DEG: unit = SVGAngle.SVG_ANGLETYPE_DEG; break; - case CSSPrimitiveValue.CSS_RAD: + case CSSUnit.CSS_RAD: unit = SVGAngle.SVG_ANGLETYPE_RAD; break; - case CSSPrimitiveValue.CSS_GRAD: + case CSSUnit.CSS_GRAD: unit = SVGAngle.SVG_ANGLETYPE_GRAD; break; default: // XXX Do something better than returning null. return null; } - return new AnimatableAngleValue(target, fv.getFloatValue(), unit); + return new AnimatableAngleValue(target, v.getFloatValue(), unit); } } @@ -1832,27 +1830,26 @@ protected class AnimatableAngleOrIdentFactory extends CSSValueFactory { @Override protected AnimatableValue createAnimatableValue(AnimationTarget target, String pn, Value v) { - if (v instanceof StringValue) { - return new AnimatableAngleOrIdentValue(target, v.getStringValue()); + if (v.getPrimitiveType() == Type.IDENT) { + return new AnimatableAngleOrIdentValue(target, v.getIdentifierValue()); } - FloatValue fv = (FloatValue) v; short unit; - switch (fv.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_NUMBER: - case CSSPrimitiveValue.CSS_DEG: + switch (v.getCSSUnit()) { + case CSSUnit.CSS_NUMBER: + case CSSUnit.CSS_DEG: unit = SVGAngle.SVG_ANGLETYPE_DEG; break; - case CSSPrimitiveValue.CSS_RAD: + case CSSUnit.CSS_RAD: unit = SVGAngle.SVG_ANGLETYPE_RAD; break; - case CSSPrimitiveValue.CSS_GRAD: + case CSSUnit.CSS_GRAD: unit = SVGAngle.SVG_ANGLETYPE_GRAD; break; default: // XXX Do something better than returning null. return null; } - return new AnimatableAngleOrIdentValue(target, fv.getFloatValue(), unit); + return new AnimatableAngleOrIdentValue(target, v.getFloatValue(), unit); } } @@ -1891,35 +1888,32 @@ protected AnimatablePaintValue createColorPaintValue(AnimationTarget t, Color c) @Override protected AnimatableValue createAnimatableValue(AnimationTarget target, String pn, Value v) { - if (v.getCssValueType() == CSSValue.CSS_PRIMITIVE_VALUE) { + if (v.getCssValueType() != CssType.LIST) { switch (v.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_IDENT: + case IDENT: return AnimatablePaintValue.createNonePaintValue(target); - case CSSPrimitiveValue.CSS_RGBCOLOR: { + case COLOR: { Paint p = PaintServer.convertPaint(target.getElement(), null, v, 1.0f, ctx); return createColorPaintValue(target, (Color) p); } - case CSSPrimitiveValue.CSS_URI: - return AnimatablePaintValue.createURIPaintValue(target, v.getStringValue()); + case URI: + return AnimatablePaintValue.createURIPaintValue(target, v.getURIValue()); } } else { Value v1 = v.item(0); switch (v1.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_RGBCOLOR: { + case COLOR: Paint p = PaintServer.convertPaint(target.getElement(), null, v, 1.0f, ctx); return createColorPaintValue(target, (Color) p); - } - case CSSPrimitiveValue.CSS_URI: { + case URI: Value v2 = v.item(1); switch (v2.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_IDENT: - return AnimatablePaintValue.createURINonePaintValue(target, v1.getStringValue()); - case CSSPrimitiveValue.CSS_RGBCOLOR: { - Paint p = PaintServer.convertPaint(target.getElement(), null, v.item(1), 1.0f, ctx); + case IDENT: + return AnimatablePaintValue.createURINonePaintValue(target, v1.getIdentifierValue()); + case COLOR: + p = PaintServer.convertPaint(target.getElement(), null, v.item(1), 1.0f, ctx); return createColorPaintValue(target, (Color) p); } - } - } } } // XXX Indicate that the specified Value wasn't a Color? diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/SVGGVTFont.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/SVGGVTFont.java index ba1ac0c2f..43b9a29f2 100644 --- a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/SVGGVTFont.java +++ b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/SVGGVTFont.java @@ -117,7 +117,7 @@ public SVGGVTFont(float fontSize, GVTFontFace fontFace, String[] glyphUnicodes, this.language = XMLSupport.getXMLLang(textElement); Value v = CSSUtilities.getComputedStyle(textElement, SVGCSSEngine.WRITING_MODE_INDEX); - if (v.getStringValue().startsWith(CSS_TB_VALUE)) { + if (v.getIdentifierValue().startsWith(CSS_TB_VALUE)) { // top to bottom, so set orientation to "v" this.orientation = SVG_V_VALUE; } else { diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/SVGTextElementBridge.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/SVGTextElementBridge.java index e6d2b21fa..ee9cd9aa7 100644 --- a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/SVGTextElementBridge.java +++ b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/SVGTextElementBridge.java @@ -40,10 +40,9 @@ import java.util.Set; import java.util.WeakHashMap; +import org.w3c.css.om.unit.CSSUnit; import org.w3c.dom.Element; import org.w3c.dom.Node; -import org.w3c.dom.css.CSSPrimitiveValue; -import org.w3c.dom.css.CSSValue; import org.w3c.dom.events.Event; import org.w3c.dom.events.EventListener; import org.w3c.dom.events.MutationEvent; @@ -52,6 +51,7 @@ import org.w3c.dom.svg.SVGTextContentElement; import org.w3c.dom.svg.SVGTextPositioningElement; +import io.sf.carte.doc.style.css.property.NumberValue; import io.sf.carte.echosvg.anim.dom.AbstractSVGAnimatedLength; import io.sf.carte.echosvg.anim.dom.AnimatedLiveAttributeValue; import io.sf.carte.echosvg.anim.dom.SVGOMAnimatedEnumeration; @@ -61,11 +61,11 @@ import io.sf.carte.echosvg.anim.dom.SVGOMTextPositioningElement; import io.sf.carte.echosvg.bridge.StrokingTextPainter.TextRun; import io.sf.carte.echosvg.constants.XMLConstants; +import io.sf.carte.echosvg.css.dom.CSSValue.Type; import io.sf.carte.echosvg.css.engine.CSSEngineEvent; import io.sf.carte.echosvg.css.engine.CSSStylableElement; import io.sf.carte.echosvg.css.engine.SVGCSSEngine; import io.sf.carte.echosvg.css.engine.StyleMap; -import io.sf.carte.echosvg.css.engine.value.ListValue; import io.sf.carte.echosvg.css.engine.value.Value; import io.sf.carte.echosvg.dom.events.NodeEventTarget; import io.sf.carte.echosvg.dom.svg.LiveAttributeException; @@ -1379,7 +1379,8 @@ protected List getFontList(BridgeContext ctx, Element element, Map getAttributeMap(BridgeContext ctx, Element elem // Unicode-bidi mode Value val = CSSUtilities.getComputedStyle(element, SVGCSSEngine.UNICODE_BIDI_INDEX); - s = val.getStringValue(); + s = val.getIdentifierValue(); if (s.charAt(0) == 'n') { if (bidiLevel != null) result.put(TextAttribute.BIDI_EMBEDDING, bidiLevel); @@ -1498,7 +1499,7 @@ protected Map getAttributeMap(BridgeContext ctx, Element elem // normal writing direction for a string/substring. val = CSSUtilities.getComputedStyle(element, SVGCSSEngine.DIRECTION_INDEX); - String rs = val.getStringValue(); + String rs = val.getIdentifierValue(); int cbidi = 0; if (bidiLevel != null) cbidi = bidiLevel; @@ -1537,7 +1538,7 @@ protected Map getAttributeMap(BridgeContext ctx, Element elem // Writing mode val = CSSUtilities.getComputedStyle(element, SVGCSSEngine.WRITING_MODE_INDEX); - s = val.getStringValue(); + s = val.getIdentifierValue(); switch (s.charAt(0)) { case 'l': result.put(GVTAttributedCharacterIterator.TextAttribute.WRITING_MODE, @@ -1556,53 +1557,58 @@ protected Map getAttributeMap(BridgeContext ctx, Element elem // glyph-orientation-vertical val = CSSUtilities.getComputedStyle(element, SVGCSSEngine.GLYPH_ORIENTATION_VERTICAL_INDEX); - int primitiveType = val.getPrimitiveType(); + Type primitiveType = val.getPrimitiveType(); switch (primitiveType) { - case CSSPrimitiveValue.CSS_IDENT: // auto + case IDENT: // auto result.put(GVTAttributedCharacterIterator.TextAttribute.VERTICAL_ORIENTATION, GVTAttributedCharacterIterator.TextAttribute.ORIENTATION_AUTO); break; - case CSSPrimitiveValue.CSS_DEG: - result.put(GVTAttributedCharacterIterator.TextAttribute.VERTICAL_ORIENTATION, - GVTAttributedCharacterIterator.TextAttribute.ORIENTATION_ANGLE); - result.put(GVTAttributedCharacterIterator.TextAttribute.VERTICAL_ORIENTATION_ANGLE, val.getFloatValue()); - break; - case CSSPrimitiveValue.CSS_RAD: - result.put(GVTAttributedCharacterIterator.TextAttribute.VERTICAL_ORIENTATION, - GVTAttributedCharacterIterator.TextAttribute.ORIENTATION_ANGLE); - result.put(GVTAttributedCharacterIterator.TextAttribute.VERTICAL_ORIENTATION_ANGLE, - (float) Math.toDegrees(val.getFloatValue())); - break; - case CSSPrimitiveValue.CSS_GRAD: - result.put(GVTAttributedCharacterIterator.TextAttribute.VERTICAL_ORIENTATION, - GVTAttributedCharacterIterator.TextAttribute.ORIENTATION_ANGLE); - result.put(GVTAttributedCharacterIterator.TextAttribute.VERTICAL_ORIENTATION_ANGLE, - val.getFloatValue() * 9 / 5); + case NUMERIC: + switch (val.getCSSUnit()) { + case CSSUnit.CSS_DEG: + case CSSUnit.CSS_NUMBER: + result.put(GVTAttributedCharacterIterator.TextAttribute.VERTICAL_ORIENTATION, + GVTAttributedCharacterIterator.TextAttribute.ORIENTATION_ANGLE); + result.put(GVTAttributedCharacterIterator.TextAttribute.VERTICAL_ORIENTATION_ANGLE, val.getFloatValue()); + break; + case CSSUnit.CSS_RAD: + result.put(GVTAttributedCharacterIterator.TextAttribute.VERTICAL_ORIENTATION, + GVTAttributedCharacterIterator.TextAttribute.ORIENTATION_ANGLE); + result.put(GVTAttributedCharacterIterator.TextAttribute.VERTICAL_ORIENTATION_ANGLE, + (float) Math.toDegrees(val.getFloatValue())); + break; + case CSSUnit.CSS_GRAD: + result.put(GVTAttributedCharacterIterator.TextAttribute.VERTICAL_ORIENTATION, + GVTAttributedCharacterIterator.TextAttribute.ORIENTATION_ANGLE); + result.put(GVTAttributedCharacterIterator.TextAttribute.VERTICAL_ORIENTATION_ANGLE, + val.getFloatValue() * 9 / 5); + break; + default: + if (CSSUnit.isAngleUnitType(val.getCSSUnit())) { + float f = NumberValue.floatValueConversion(val.getFloatValue(), val.getCSSUnit(), CSSUnit.CSS_DEG); + result.put(GVTAttributedCharacterIterator.TextAttribute.VERTICAL_ORIENTATION, + GVTAttributedCharacterIterator.TextAttribute.ORIENTATION_ANGLE); + result.put(GVTAttributedCharacterIterator.TextAttribute.VERTICAL_ORIENTATION_ANGLE, f); + break; + } + throw new IllegalStateException("unexpected value (V):" + val.getCssText()); + } break; default: - // Cannot happen throw new IllegalStateException("unexpected primitiveType (V):" + primitiveType); } // glyph-orientation-horizontal val = CSSUtilities.getComputedStyle(element, SVGCSSEngine.GLYPH_ORIENTATION_HORIZONTAL_INDEX); - primitiveType = val.getPrimitiveType(); - switch (primitiveType) { - case CSSPrimitiveValue.CSS_DEG: + short unit = val.getCSSUnit(); + if (unit == CSSUnit.CSS_NUMBER || unit == CSSUnit.CSS_DEG) { result.put(GVTAttributedCharacterIterator.TextAttribute.HORIZONTAL_ORIENTATION_ANGLE, val.getFloatValue()); - break; - case CSSPrimitiveValue.CSS_RAD: - result.put(GVTAttributedCharacterIterator.TextAttribute.HORIZONTAL_ORIENTATION_ANGLE, - (float) Math.toDegrees(val.getFloatValue())); - break; - case CSSPrimitiveValue.CSS_GRAD: - result.put(GVTAttributedCharacterIterator.TextAttribute.HORIZONTAL_ORIENTATION_ANGLE, - val.getFloatValue() * 9 / 5); - break; - default: - // Cannot happen - throw new IllegalStateException("unexpected primitiveType (H):" + primitiveType); + } else if (CSSUnit.isAngleUnitType(unit)) { + float f = NumberValue.floatValueConversion(val.getFloatValue(), val.getCSSUnit(), CSSUnit.CSS_DEG); + result.put(GVTAttributedCharacterIterator.TextAttribute.HORIZONTAL_ORIENTATION_ANGLE, f); + } else { + throw new IllegalStateException("unexpected value (H):" + val.getCssText()); } // text spacing properties... @@ -1730,13 +1736,11 @@ public void setDecorationTextPaintInfo(TextPaintInfo pi, Element element) { Value val = CSSUtilities.getComputedStyle(element, SVGCSSEngine.TEXT_DECORATION_INDEX); switch (val.getCssValueType()) { - case CSSValue.CSS_VALUE_LIST: - ListValue lst = (ListValue) val; - - int len = lst.getLength(); + case LIST: + int len = val.getLength(); for (int i = 0; i < len; i++) { - Value v = lst.item(i); - String s = v.getStringValue(); + Value v = val.item(i); + String s = v.getIdentifierValue(); switch (s.charAt(0)) { case 'u': if (pi.fillPaint != null) { diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/TextUtilities.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/TextUtilities.java index a72e9b321..95f0b5e34 100644 --- a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/TextUtilities.java +++ b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/TextUtilities.java @@ -24,8 +24,8 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; -import org.w3c.dom.css.CSSPrimitiveValue; +import io.sf.carte.echosvg.css.dom.CSSValue.Type; import io.sf.carte.echosvg.css.engine.SVGCSSEngine; import io.sf.carte.echosvg.css.engine.value.Value; import io.sf.carte.echosvg.util.CSSConstants; @@ -135,7 +135,7 @@ public static Float convertFontSize(Element e) { */ public static Float convertFontStyle(Element e) { Value v = CSSUtilities.getComputedStyle(e, SVGCSSEngine.FONT_STYLE_INDEX); - switch (v.getStringValue().charAt(0)) { + switch (v.getIdentifierValue().charAt(0)) { case 'n': return TextAttribute.POSTURE_REGULAR; default: @@ -150,7 +150,7 @@ public static Float convertFontStyle(Element e) { */ public static Float convertFontStretch(Element e) { Value v = CSSUtilities.getComputedStyle(e, SVGCSSEngine.FONT_STRETCH_INDEX); - String s = v.getStringValue(); + String s = v.getIdentifierValue(); switch (s.charAt(0)) { case 'u': if (s.charAt(6) == 'c') { @@ -234,7 +234,7 @@ public static Float convertFontWeight(Element e) { */ public static TextNode.Anchor convertTextAnchor(Element e) { Value v = CSSUtilities.getComputedStyle(e, SVGCSSEngine.TEXT_ANCHOR_INDEX); - switch (v.getStringValue().charAt(0)) { + switch (v.getIdentifierValue().charAt(0)) { case 's': return TextNode.Anchor.START; case 'm': @@ -252,8 +252,8 @@ public static TextNode.Anchor convertTextAnchor(Element e) { */ public static Object convertBaselineShift(Element e) { Value v = CSSUtilities.getComputedStyle(e, SVGCSSEngine.BASELINE_SHIFT_INDEX); - if (v.getPrimitiveType() == CSSPrimitiveValue.CSS_IDENT) { - String s = v.getStringValue(); + if (v.getPrimitiveType() == Type.IDENT) { + String s = v.getIdentifierValue(); switch (s.charAt(2)) { case 'p': // suPerscript return TextAttribute.SUPERSCRIPT_SUPER; @@ -276,7 +276,7 @@ public static Object convertBaselineShift(Element e) { */ public static Float convertKerning(Element e) { Value v = CSSUtilities.getComputedStyle(e, SVGCSSEngine.KERNING_INDEX); - if (v.getPrimitiveType() == CSSPrimitiveValue.CSS_IDENT) { + if (v.getPrimitiveType() == Type.IDENT) { return null; } return v.getFloatValue(); @@ -290,7 +290,7 @@ public static Float convertKerning(Element e) { */ public static Float convertLetterSpacing(Element e) { Value v = CSSUtilities.getComputedStyle(e, SVGCSSEngine.LETTER_SPACING_INDEX); - if (v.getPrimitiveType() == CSSPrimitiveValue.CSS_IDENT) { + if (v.getPrimitiveType() == Type.IDENT) { return null; } return v.getFloatValue(); @@ -304,7 +304,7 @@ public static Float convertLetterSpacing(Element e) { */ public static Float convertWordSpacing(Element e) { Value v = CSSUtilities.getComputedStyle(e, SVGCSSEngine.WORD_SPACING_INDEX); - if (v.getPrimitiveType() == CSSPrimitiveValue.CSS_IDENT) { + if (v.getPrimitiveType() == Type.IDENT) { return null; } return v.getFloatValue(); diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/Viewport.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/Viewport.java index 987dffd53..612c859b7 100644 --- a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/Viewport.java +++ b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/Viewport.java @@ -22,20 +22,12 @@ /** * Defines a viewport. * - * @author Thierry Kormann - * @author For later modifications, see Git history. + *

+ * Original author: Thierry Kormann. + * For later modifications, see Git history. + *

* @version $Id$ */ -public interface Viewport { - - /** - * Returns the width of this viewport. - */ - float getWidth(); - - /** - * Returns the height of this viewport. - */ - float getHeight(); +public interface Viewport extends io.sf.carte.echosvg.css.Viewport { } diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/svg12/SVGSolidColorElementBridge.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/svg12/SVGSolidColorElementBridge.java index 5cce3d879..b18cae155 100644 --- a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/svg12/SVGSolidColorElementBridge.java +++ b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/svg12/SVGSolidColorElementBridge.java @@ -24,7 +24,6 @@ import java.util.Map; import org.w3c.dom.Element; -import org.w3c.dom.css.CSSValue; import io.sf.carte.echosvg.anim.dom.SVGOMDocument; import io.sf.carte.echosvg.bridge.AnimatableGenericSVGBridge; @@ -34,6 +33,7 @@ import io.sf.carte.echosvg.bridge.ErrorConstants; import io.sf.carte.echosvg.bridge.PaintBridge; import io.sf.carte.echosvg.bridge.PaintServer; +import io.sf.carte.echosvg.css.dom.CSSValue.CssType; import io.sf.carte.echosvg.css.engine.CSSEngine; import io.sf.carte.echosvg.css.engine.CSSStylableElement; import io.sf.carte.echosvg.css.engine.StyleMap; @@ -48,8 +48,10 @@ /** * Bridge class for a regular polygon element. * - * @author Thomas Deweese - * @author For later modifications, see Git history. + *

+ * Original author: Thomas Deweese. + * For later modifications, see Git history. + *

* @version $Id$ */ public class SVGSolidColorElementBridge extends AnimatableGenericSVGBridge implements PaintBridge { @@ -143,8 +145,8 @@ protected static Color extractColor(Element paintElement, float opacity, BridgeC StyleMap sm = ((CSSStylableElement) paintElement).getComputedStyleMap(null); if (!sm.isNullCascaded(pidx)) { // It was explicit... - if (colorDef.getCssValueType() == CSSValue.CSS_PRIMITIVE_VALUE) { - return PaintServer.convertColor(colorDef, opacity); + if (colorDef.getCssValueType() != CssType.LIST) { + return PaintServer.convertColor(colorDef.getColorValue(), opacity); } else { return PaintServer.convertRGBICCColor(paintElement, colorDef.item(0), colorDef.item(1), opacity, ctx); diff --git a/echosvg-bridge/src/main/resources/io/sf/carte/echosvg/bridge/color/profiles/ClayRGB-elle-V4-g22.icc b/echosvg-bridge/src/main/resources/io/sf/carte/echosvg/bridge/color/profiles/ClayRGB-elle-V4-g22.icc new file mode 100644 index 0000000000000000000000000000000000000000..8c9e01cbaf764681e42a8313f360582202af2c52 GIT binary patch literal 1164 zcmZ`&O=}ZT6g_EDx{2r_3zaTrQG=DFlQeBncP5l72tv{pD=wVOOeTSu$uKh-i+@2u z5Wz(ke&EinTM_&Tg1Qj#2e=d5Xc^CaGj)PA?=kP4ym#-p_uYE}lpeaK7nK@-=f`1p ztF7JKyQM9B$2F zxe8}9t}y~~g|v1sL=26-4K%TV8u4bvt)a)eF?`0+a9&x)^t=q6)2FxGSo|Dv*_;vj zTwVH1n2X8Xqvf(Bg^H-p+%X?44Xp7bm`VTT_ z4jPgOgO-MdAZm!Ht;wmtrQ~+*dx0#Md1BbAIxo9Qjd z`w15<+f>bDF-2JsAKmCwx_kS@(LPO!S*=d}IC_-4D_`EM?!N|SyQ%@vm(7_P)qcrC z8Z#`wB@-)q7886x95Coo#5KVMhtC9O9KNzO>!}239*8BasAh><#B!!DU+CjK;A2FNF{h#i<OH=m+rBie6NDDE$HjFIJ}iw=3>N@WFfYn>YV?Z+2#Z?AgnTvG||}xLy?0 zmJGG}c1;ca!Z0Q=juF7LLVtPXRUNcyy`f6Q64kes0WMF#2>hI`mdonLxzQ@@e*E^~ z;PlV&{Ohl`%DZ8#)ebEnqqw|g`9Vb9CBNH_eBpoOiROlIwjdnvfaED*JK_0Qlkgki zUf*@7Sr?AlR+r5E$Xi{rMSf3y9@J}P@_<~h6FwAfCVV99_WC?qZ1RQqw%1tUxIlk| zD(Yxp8Z{^w+{I(fh}unNOmZT(es(gvs76>utt0ZOd1tNTHhA)VfwcJ$eXwraR1$Zt0$Gs;hubo6c9d z>i8P!E7cL4T_QUg$Rkr7jx|-m8)J4)yV&|l$mFTwJO@PHSB;(!ZI%`zf-9uwI$-V* zb4WD-YmDczV{NEGrR&;f-qj-*SMjN{?!lAdn~}}e)eH&}*)W;(Q0n&>NUui8J*Mkk}u=tz{#N?%z~WOs^UdG2(iat4VOO@3kC&vz zPpN_izb#4UUvfBq#y?}9q8pFfc6cZImEt7>Udvw8e$G>SZ1d1r$S!nmo)BgKzvX^u zh<{B_WNYeXPdnIKungfXb^{_!i^gP%_4xa~(?tf}fT?(QQ&8k`SMc0|X$STu{D%HV p7y2=sPSlrjlRo=Ce`|U(O=K`ll#o(W8#c>i9vQf}dyH3M)j#}T$^ZZW literal 0 HcmV?d00001 diff --git a/echosvg-bridge/src/main/resources/io/sf/carte/echosvg/bridge/color/profiles/NOTICE.txt b/echosvg-bridge/src/main/resources/io/sf/carte/echosvg/bridge/color/profiles/NOTICE.txt new file mode 100644 index 000000000..529f0b486 --- /dev/null +++ b/echosvg-bridge/src/main/resources/io/sf/carte/echosvg/bridge/color/profiles/NOTICE.txt @@ -0,0 +1,7 @@ +The files that have "elle" in the filename are licensed as shown in the +'ElleStone-legalcode.txt' file. + +The Display P3 profile was made by Apple and was obtained from color.org (ICC). + +The profile for the ITU-R Recommendation BT.2020 was also obtained from +color.org (ICC). diff --git a/echosvg-bridge/src/main/resources/io/sf/carte/echosvg/bridge/resources/Messages.properties b/echosvg-bridge/src/main/resources/io/sf/carte/echosvg/bridge/resources/Messages.properties index 8030d99c7..77e5fca02 100644 --- a/echosvg-bridge/src/main/resources/io/sf/carte/echosvg/bridge/resources/Messages.properties +++ b/echosvg-bridge/src/main/resources/io/sf/carte/echosvg/bridge/resources/Messages.properties @@ -39,6 +39,11 @@ length.negative = \ {0}:{1}\n\ The attribute "{3}" of the element <{2}> cannot be negative +css.badValue = \ +{0}:{1}\n\ +Error in a computed value for the element <{2}>:\n\ +{3} + css.length.negative = \ {0}:{1}\n\ The CSS property "{3}" found on the element <{2}> cannot be negative diff --git a/echosvg-css/build.gradle b/echosvg-css/build.gradle index e1b82473b..a1f3d484b 100644 --- a/echosvg-css/build.gradle +++ b/echosvg-css/build.gradle @@ -5,6 +5,7 @@ plugins { dependencies { api project(':echosvg-util') implementation project(':echosvg-i18n') + api "io.sf.w3:domview-api:${domViewVersion}" api "io.sf.carte:svgom-api:${svgomVersion}" api "io.sf.carte:css4j:${css4jVersion}" testImplementation "org.junit.jupiter:junit-jupiter:${junitVersion}" diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/Viewport.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/Viewport.java new file mode 100644 index 000000000..fa8ef9425 --- /dev/null +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/Viewport.java @@ -0,0 +1,39 @@ +/* + + 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; + +/** + * A viewport. + * + * @version $Id$ + */ +public interface Viewport { + + /** + * @return the width of this viewport. + */ + float getWidth(); + + /** + * @return the height of this viewport. + */ + float getHeight(); + +} diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMComputedStyle.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMComputedStyle.java index 780ff0ea9..4cfa82f2c 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMComputedStyle.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMComputedStyle.java @@ -21,10 +21,9 @@ import java.util.HashMap; import java.util.Map; +import org.w3c.css.om.CSSRule; +import org.w3c.css.om.CSSStyleDeclaration; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSRule; -import org.w3c.dom.css.CSSStyleDeclaration; -import org.w3c.dom.css.CSSValue; import io.sf.carte.echosvg.css.engine.CSSEngine; import io.sf.carte.echosvg.css.engine.CSSStylableElement; @@ -33,8 +32,10 @@ /** * This class represents the computed style of an element. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public class CSSOMComputedStyle implements CSSStyleDeclaration { @@ -108,12 +109,12 @@ public String getPropertyValue(String propertyName) { return v.getCssText(); } - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSStyleDeclaration#getPropertyCSSValue(String)}. - */ @Override - public CSSValue getPropertyCSSValue(String propertyName) { + public CSSValue getCSSStyleValue(String propertyName) { + return getCSSValue(propertyName); + } + + public CSSValue getCSSValue(String propertyName) { CSSValue result = values.get(propertyName); if (result == null) { int idx = cssEngine.getPropertyIndex(propertyName); diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMSVGColor.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMSVGColor.java index bd78f4f54..63c91db66 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMSVGColor.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMSVGColor.java @@ -18,33 +18,33 @@ */ package io.sf.carte.echosvg.css.dom; -import java.util.ArrayList; - +import org.w3c.css.om.typed.CSSColorValue; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; -import org.w3c.dom.css.CSSValue; -import org.w3c.dom.css.Counter; import org.w3c.dom.css.RGBColor; -import org.w3c.dom.css.Rect; import org.w3c.dom.svg.SVGColor; import org.w3c.dom.svg.SVGICCColor; import org.w3c.dom.svg.SVGNumber; import org.w3c.dom.svg.SVGNumberList; -import io.sf.carte.echosvg.css.engine.value.FloatValue; +import io.sf.carte.echosvg.css.engine.value.ColorFunction; +import io.sf.carte.echosvg.css.engine.value.ColorValue; +import io.sf.carte.echosvg.css.engine.value.NumericValue; import io.sf.carte.echosvg.css.engine.value.RGBColorValue; import io.sf.carte.echosvg.css.engine.value.Value; -import io.sf.carte.echosvg.css.engine.value.svg.ICCColor; +import io.sf.carte.echosvg.css.engine.value.ValueModificationHandler; import io.sf.carte.echosvg.util.CSSConstants; /** * This class implements the {@link SVGColor} interface. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ -public class CSSOMSVGColor implements SVGColor, RGBColor, SVGICCColor, SVGNumberList { +@SuppressWarnings("removal") +public class CSSOMSVGColor implements CSSValue, CSSColorValue, SVGICCColor, SVGNumberList { /** * The associated value. @@ -54,27 +54,7 @@ public class CSSOMSVGColor implements SVGColor, RGBColor, SVGICCColor, SVGNumber /** * The modifications handler. */ - protected ModificationHandler handler; - - /** - * The red component, if this value is a RGBColor. - */ - protected RedComponent redComponent; - - /** - * The green component, if this value is a RGBColor. - */ - protected GreenComponent greenComponent; - - /** - * The blue component, if this value is a RGBColor. - */ - protected BlueComponent blueComponent; - - /** - * To store the ICC color list. - */ - protected ArrayList iccColors; + protected ValueModificationHandler handler; /** * Creates a new CSSOMSVGColor. @@ -86,110 +66,166 @@ public CSSOMSVGColor(ValueProvider vp) { /** * Sets the modification handler of this value. */ - public void setModificationHandler(ModificationHandler h) { + public void setModificationHandler(ValueModificationHandler h) { handler = h; } - /** - * DOM: Implements {@link org.w3c.dom.css.CSSValue#getCssText()}. - */ @Override public String getCssText() { return valueProvider.getValue().getCssText(); } - /** - * DOM: Implements {@link org.w3c.dom.css.CSSValue#setCssText(String)}. - */ @Override public void setCssText(String cssText) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - iccColors = null; - handler.textChanged(cssText); - } + throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); + } + + @Override + public String toString() { + return getCssText(); + } + + @Override + public CssType getCssValueType() { + return CssType.TYPED; + } + + @Override + public Type getPrimitiveType() { + return valueProvider.getValue().getPrimitiveType(); + } + + @Override + public float getFloatValue() { + return valueProvider.getValue().getFloatValue(); + } + + @Override + public int getLength() { + return valueProvider.getValue().getLength(); + } + + @Override + public Value item(int index) { + valueProvider.getValue().setModificationHandler(handler); + return valueProvider.getValue().item(index); } - /** - * DOM: Implements {@link org.w3c.dom.css.CSSValue#getCssValueType()}. - */ @Override - public short getCssValueType() { - return CSS_CUSTOM; + public String getIdentifierValue() throws DOMException { + return valueProvider.getValue().getIdentifierValue(); + } + + @Override + public String getStringValue() throws DOMException { + return valueProvider.getValue().getStringValue(); + } + + @Override + public String getURIValue() throws DOMException { + return valueProvider.getValue().getURIValue(); } /** * DOM: Implements {@link org.w3c.dom.svg.SVGColor#getColorType()}. */ - @Override + @SuppressWarnings("deprecation") public short getColorType() { Value value = valueProvider.getValue(); - int cssValueType = value.getCssValueType(); - switch (cssValueType) { - case CSSValue.CSS_PRIMITIVE_VALUE: - int primitiveType = value.getPrimitiveType(); - switch (primitiveType) { - case CSSPrimitiveValue.CSS_IDENT: { - if (value.getStringValue().equalsIgnoreCase(CSSConstants.CSS_CURRENTCOLOR_VALUE)) - return SVG_COLORTYPE_CURRENTCOLOR; - return SVG_COLORTYPE_RGBCOLOR; - } - case CSSPrimitiveValue.CSS_RGBCOLOR: - return SVG_COLORTYPE_RGBCOLOR; + switch (value.getCssValueType()) { + case TYPED: + switch (value.getPrimitiveType()) { + case IDENT: { + if (CSSConstants.CSS_CURRENTCOLOR_VALUE.equalsIgnoreCase(value.getIdentifierValue())) + return SVGColor.SVG_COLORTYPE_CURRENTCOLOR; + return SVGColor.SVG_COLORTYPE_RGBCOLOR; + } + case COLOR: + ColorValue color = value.getColorValue(); + switch (color.getCSSColorSpace()) { + case ColorValue.RGB_FUNCTION: + return SVGColor.SVG_COLORTYPE_RGBCOLOR; + default: + throw new IllegalStateException("Found unexpected color type:" + color.getCSSColorSpace()); + } + default: + // there was no case for this primitiveType, prevent throwing the other + // exception + throw new IllegalStateException("Found unexpected PrimitiveType:" + value.getPrimitiveType()); } - // there was no case for this primitiveType, prevent throwing the other - // exception - throw new IllegalStateException("Found unexpected PrimitiveType:" + primitiveType); - case CSSValue.CSS_VALUE_LIST: - return SVG_COLORTYPE_RGBCOLOR_ICCCOLOR; + case LIST: + return SVGColor.SVG_COLORTYPE_RGBCOLOR_ICCCOLOR; + default: + // should not happen + throw new IllegalStateException("Found unexpected CssValueType:" + value.getCssValueType()); } - // should not happen - throw new IllegalStateException("Found unexpected CssValueType:" + cssValueType); } /** * DOM: Implements {@link org.w3c.dom.svg.SVGColor#getRGBColor()}. */ - @Override public RGBColor getRGBColor() { - return this; + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Legacy value API not supported."); } /** - * Returns the RGBColor value for this SVGColor. For the SVG 1.1 ECMAScript + * Returns the CSSColorValue value for this SVGColor. For the SVG ECMAScript * binding. */ - public RGBColor getRgbColor() { - return this; + public ColorValue getCSSColorValue() { + valueProvider.getValue().setModificationHandler(handler); + return valueProvider.getValue().getColorValue(); + } + + public String getCSSColorSpace() { + return getCSSColorValue().getCSSColorSpace(); + } + + public NumericValue getAlpha() { + return getCSSColorValue().getAlpha(); } /** - * DOM: Implements {@link org.w3c.dom.svg.SVGColor#setRGBColor(String)}. + * Sets the alpha channel as a percentage. + * + * @param alpha the alpha channel as a percentage. */ - @Override - public void setRGBColor(String color) { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - handler.rgbColorChanged(color); + public void setAlpha(double alpha) { + getCSSColorValue().setAlpha(alpha); + } + + public NumericValue getR() { + return getRGBColorValue().getR(); + } + + RGBColorValue getRGBColorValue() { + ColorValue color = getCSSColorValue(); + if (ColorValue.RGB_FUNCTION.equals(color.getCSSColorSpace())) { + return (RGBColorValue) color; } + throw new DOMException(DOMException.INVALID_ACCESS_ERR, "Not an RGB color."); + } + + public NumericValue getG() { + return getRGBColorValue().getG(); + } + + public NumericValue getB() { + return getRGBColorValue().getB(); } /** - * DOM: Implements {@link org.w3c.dom.svg.SVGColor#getICCColor()}. + * DOM: Implements {@link org.w3c.dom.svg.SVGColor#setRGBColor(String)}. */ - @Override - public SVGICCColor getICCColor() { - return this; + public void setRGBColor(String color) { + throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); } /** - * Returns the SVGICCColor value of this SVGColor. For the SVG 1.1 ECMAScript - * binding. + * DOM: Implements {@link org.w3c.dom.svg.SVGColor#getICCColor()}. */ - public SVGICCColor getIccColor() { + public SVGICCColor getICCColor() { return this; } @@ -197,80 +233,23 @@ public SVGICCColor getIccColor() { * DOM: Implements * {@link org.w3c.dom.svg.SVGColor#setRGBColorICCColor(String,String)}. */ - @Override public void setRGBColorICCColor(String rgb, String icc) { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - iccColors = null; - handler.rgbColorICCColorChanged(rgb, icc); - } + throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); } /** * DOM: Implements * {@link org.w3c.dom.svg.SVGColor#setColor(short,String,String)}. */ - @Override public void setColor(short type, String rgb, String icc) { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - iccColors = null; - handler.colorChanged(type, rgb, icc); - } - } - - // RGBColor /////////////////////////////////////////////////// - - /** - * DOM: Implements {@link org.w3c.dom.css.RGBColor#getRed()}. - */ - @Override - public CSSPrimitiveValue getRed() { - valueProvider.getValue().getRed(); - if (redComponent == null) { - redComponent = new RedComponent(); - } - return redComponent; - } - - /** - * DOM: Implements {@link org.w3c.dom.css.RGBColor#getGreen()}. - */ - @Override - public CSSPrimitiveValue getGreen() { - valueProvider.getValue().getGreen(); - if (greenComponent == null) { - greenComponent = new GreenComponent(); - } - return greenComponent; - } - - /** - * DOM: Implements {@link org.w3c.dom.css.RGBColor#getBlue()}. - */ - @Override - public CSSPrimitiveValue getBlue() { - valueProvider.getValue().getBlue(); - if (blueComponent == null) { - blueComponent = new BlueComponent(); - } - return blueComponent; + throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); } // SVGICCColor ////////////////////////////////////////////////// - /** - * DOM: Implements {@link org.w3c.dom.svg.SVGICCColor#getColorProfile()}. - */ @Override public String getColorProfile() { - if (getColorType() != SVG_COLORTYPE_RGBCOLOR_ICCCOLOR) { - throw new DOMException(DOMException.SYNTAX_ERR, ""); - } - Value value = valueProvider.getValue(); - return ((ICCColor) value.item(1)).getColorProfile(); + return getCSSColorValue().getCSSColorSpace(); } /** @@ -278,11 +257,7 @@ public String getColorProfile() { */ @Override public void setColorProfile(String colorProfile) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - handler.colorProfileChanged(colorProfile); - } + throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); } /** @@ -300,11 +275,11 @@ public SVGNumberList getColors() { */ @Override public int getNumberOfItems() { - if (getColorType() != SVG_COLORTYPE_RGBCOLOR_ICCCOLOR) { - throw new DOMException(DOMException.SYNTAX_ERR, ""); + ColorValue value = getCSSColorValue(); + if (!(value instanceof ColorFunction)) { + throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); } - Value value = valueProvider.getValue(); - return ((ICCColor) value.item(1)).getNumberOfColors(); + return ((ColorFunction) value).getChannels().getLength(); } /** @@ -312,12 +287,7 @@ public int getNumberOfItems() { */ @Override public void clear() throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - iccColors = null; - handler.colorsCleared(); - } + throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); } /** @@ -325,40 +295,28 @@ public void clear() throws DOMException { */ @Override public SVGNumber initialize(SVGNumber newItem) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - float f = newItem.getValue(); - iccColors = new ArrayList<>(); - SVGNumber result = new ColorNumber(f); - iccColors.add(result); - handler.colorsInitialized(f); - return result; - } + throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); } /** * DOM: Implements {@link SVGNumberList#getItem(int)}. */ + @SuppressWarnings("deprecation") @Override public SVGNumber getItem(int index) throws DOMException { - if (getColorType() != SVG_COLORTYPE_RGBCOLOR_ICCCOLOR) { + if (getColorType() != SVGColor.SVG_COLORTYPE_RGBCOLOR_ICCCOLOR) { throw new DOMException(DOMException.INDEX_SIZE_ERR, ""); } int n = getNumberOfItems(); if (index < 0 || index >= n) { throw new DOMException(DOMException.INDEX_SIZE_ERR, ""); } - if (iccColors == null) { - iccColors = new ArrayList<>(n); - for (int i = iccColors.size(); i < n; i++) { - iccColors.add(null); - } + ColorValue value = getCSSColorValue(); + if (!(value instanceof ColorFunction)) { + throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); } - Value value = valueProvider.getValue().item(1); - float f = ((ICCColor) value).getColor(index); + float f = ((ColorFunction) value).getChannels().item(index).getFloatValue(); SVGNumber result = new ColorNumber(f); - iccColors.set(index, result); return result; } @@ -367,25 +325,7 @@ public SVGNumber getItem(int index) throws DOMException { */ @Override public SVGNumber insertItemBefore(SVGNumber newItem, int index) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - int n = getNumberOfItems(); - if (index < 0 || index > n) { - throw new DOMException(DOMException.INDEX_SIZE_ERR, ""); - } - if (iccColors == null) { - iccColors = new ArrayList<>(n); - for (int i = iccColors.size(); i < n; i++) { - iccColors.add(null); - } - } - float f = newItem.getValue(); - SVGNumber result = new ColorNumber(f); - iccColors.add(index, result); - handler.colorInsertedBefore(f, index); - return result; - } + throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); } /** @@ -393,25 +333,7 @@ public SVGNumber insertItemBefore(SVGNumber newItem, int index) throws DOMExcept */ @Override public SVGNumber replaceItem(SVGNumber newItem, int index) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - int n = getNumberOfItems(); - if (index < 0 || index >= n) { - throw new DOMException(DOMException.INDEX_SIZE_ERR, ""); - } - if (iccColors == null) { - iccColors = new ArrayList<>(n); - for (int i = iccColors.size(); i < n; i++) { - iccColors.add(null); - } - } - float f = newItem.getValue(); - SVGNumber result = new ColorNumber(f); - iccColors.set(index, result); - handler.colorReplaced(f, index); - return result; - } + throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); } /** @@ -419,24 +341,7 @@ public SVGNumber replaceItem(SVGNumber newItem, int index) throws DOMException { */ @Override public SVGNumber removeItem(int index) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - int n = getNumberOfItems(); - if (index < 0 || index >= n) { - throw new DOMException(DOMException.INDEX_SIZE_ERR, ""); - } - SVGNumber result = null; - if (iccColors != null) { - result = iccColors.get(index); - } - if (result == null) { - Value value = valueProvider.getValue().item(1); - result = new ColorNumber(((ICCColor) value).getColor(index)); - } - handler.colorRemoved(index); - return result; - } + throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); } /** @@ -444,22 +349,7 @@ public SVGNumber removeItem(int index) throws DOMException { */ @Override public SVGNumber appendItem(SVGNumber newItem) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - if (iccColors == null) { - int n = getNumberOfItems(); - iccColors = new ArrayList<>(n); - for (int i = 0; i < n; i++) { - iccColors.add(null); - } - } - float f = newItem.getValue(); - SVGNumber result = new ColorNumber(f); - iccColors.add(result); - handler.colorAppend(f); - return result; - } + throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); } /** @@ -484,15 +374,7 @@ public ColorNumber(float f) { */ @Override public float getValue() { - if (iccColors == null) { - return value; - } - int idx = iccColors.indexOf(this); - if (idx == -1) { - return value; - } - Value value = valueProvider.getValue().item(1); - return ((ICCColor) value).getColor(idx); + return value; } /** @@ -500,19 +382,7 @@ public float getValue() { */ @Override public void setValue(float f) { - value = f; - if (iccColors == null) { - return; - } - int idx = iccColors.indexOf(this); - if (idx == -1) { - return; - } - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - handler.colorReplaced(f, idx); - } + throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); } } @@ -529,720 +399,4 @@ public interface ValueProvider { } - /** - * To manage the modifications on a CSS value. - */ - public interface ModificationHandler { - - /** - * Called when the value text has changed. - */ - void textChanged(String text) throws DOMException; - - /** - * Called when the red value text has changed. - */ - void redTextChanged(String text) throws DOMException; - - /** - * Called when the red float value has changed. - */ - void redFloatValueChanged(short unit, float value) throws DOMException; - - /** - * Called when the green value text has changed. - */ - void greenTextChanged(String text) throws DOMException; - - /** - * Called when the green float value has changed. - */ - void greenFloatValueChanged(short unit, float value) throws DOMException; - - /** - * Called when the blue value text has changed. - */ - void blueTextChanged(String text) throws DOMException; - - /** - * Called when the blue float value has changed. - */ - void blueFloatValueChanged(short unit, float value) throws DOMException; - - /** - * Called when the alpha value text has changed. - */ - void alphaTextChanged(String text) throws DOMException; - - /** - * Called when the alpha float value has changed. - */ - void alphaFloatValueChanged(short unit, float value) throws DOMException; - - /** - * Called when the RGBColor text has changed. - */ - void rgbColorChanged(String text) throws DOMException; - - /** - * Called when the RGBColor and the ICCColor text has changed. - */ - void rgbColorICCColorChanged(String rgb, String icc) throws DOMException; - - /** - * Called when the SVGColor has changed. - */ - void colorChanged(short type, String rgb, String icc) throws DOMException; - - /** - * Called when the ICC color profile has changed. - */ - void colorProfileChanged(String cp) throws DOMException; - - /** - * Called when the ICC colors has changed. - */ - void colorsCleared() throws DOMException; - - /** - * Called when the ICC colors has been initialized. - */ - void colorsInitialized(float f) throws DOMException; - - /** - * Called when the ICC color has been inserted. - */ - void colorInsertedBefore(float f, int idx) throws DOMException; - - /** - * Called when the ICC color has been replaced. - */ - void colorReplaced(float f, int idx) throws DOMException; - - /** - * Called when the ICC color has been removed. - */ - void colorRemoved(int idx) throws DOMException; - - /** - * Called when the ICC color has been append. - */ - void colorAppend(float f) throws DOMException; - - } - - /** - * Provides an abstract implementation of a ModificationHandler. - */ - public abstract class AbstractModificationHandler implements ModificationHandler { - - /** - * Returns the associated value. - */ - protected abstract Value getValue(); - - /** - * Called when the red value text has changed. - */ - @Override - public void redTextChanged(String text) throws DOMException { - switch (getColorType()) { - case SVG_COLORTYPE_RGBCOLOR: - text = RGBColorValue.toString(text, getValue().getGreen().getCssText(), - getValue().getBlue().getCssText(), getValue().getAlpha().getCssText()); - break; - - case SVG_COLORTYPE_RGBCOLOR_ICCCOLOR: - text = RGBColorValue.toString(text, getValue().item(0).getGreen().getCssText(), - getValue().item(0).getBlue().getCssText(), getValue().item(0).getAlpha().getCssText()) + ' ' - + getValue().item(1).getCssText(); - break; - - default: - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } - textChanged(text); - } - - /** - * Called when the red float value has changed. - */ - @Override - public void redFloatValueChanged(short unit, float fValue) throws DOMException { - redTextChanged(FloatValue.getCssText(unit, fValue)); - } - - /** - * Called when the green value text has changed. - */ - @Override - public void greenTextChanged(String text) throws DOMException { - switch (getColorType()) { - case SVG_COLORTYPE_RGBCOLOR: - text = RGBColorValue.toString(getValue().getRed().getCssText(), text, getValue().getBlue().getCssText(), - getValue().getAlpha().getCssText()); - break; - - case SVG_COLORTYPE_RGBCOLOR_ICCCOLOR: - text = RGBColorValue.toString(getValue().item(0).getRed().getCssText(), text, - getValue().item(0).getBlue().getCssText(), getValue().item(0).getAlpha().getCssText()) + ' ' - + getValue().item(1).getCssText(); - break; - - default: - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } - textChanged(text); - } - - /** - * Called when the green float value has changed. - */ - @Override - public void greenFloatValueChanged(short unit, float fValue) throws DOMException { - greenTextChanged(FloatValue.getCssText(unit, fValue)); - } - - /** - * Called when the blue value text has changed. - */ - @Override - public void blueTextChanged(String text) throws DOMException { - switch (getColorType()) { - case SVG_COLORTYPE_RGBCOLOR: - text = RGBColorValue.toString(getValue().getRed().getCssText(), getValue().getGreen().getCssText(), - text, getValue().getAlpha().getCssText()); - break; - - case SVG_COLORTYPE_RGBCOLOR_ICCCOLOR: - text = RGBColorValue.toString(getValue().item(0).getRed().getCssText(), - getValue().item(0).getGreen().getCssText(), text, getValue().item(0).getAlpha().getCssText()) - + ' ' + getValue().item(1).getCssText(); - break; - - default: - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } - textChanged(text); - } - - /** - * Called when the blue float value has changed. - */ - @Override - public void blueFloatValueChanged(short unit, float fValue) throws DOMException { - blueTextChanged(FloatValue.getCssText(unit, fValue)); - } - - @Override - public void alphaTextChanged(String text) throws DOMException { - switch (getColorType()) { - case SVG_COLORTYPE_RGBCOLOR: - text = RGBColorValue.toString(getValue().getRed().getCssText(), getValue().getGreen().getCssText(), - getValue().getBlue().getCssText(), text); - break; - - case SVG_COLORTYPE_RGBCOLOR_ICCCOLOR: - text = RGBColorValue.toString(getValue().item(0).getRed().getCssText(), - getValue().item(0).getGreen().getCssText(), getValue().item(0).getBlue().getCssText(), text) - + ' ' + getValue().item(1).getCssText(); - break; - - default: - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } - textChanged(text); - } - - @Override - public void alphaFloatValueChanged(short unit, float fValue) throws DOMException { - alphaTextChanged(FloatValue.getCssText(unit, fValue)); - } - - /** - * Called when the RGBColor text has changed. - */ - @Override - public void rgbColorChanged(String text) throws DOMException { - switch (getColorType()) { - case SVG_COLORTYPE_RGBCOLOR: - break; - - case SVG_COLORTYPE_RGBCOLOR_ICCCOLOR: - text += getValue().item(1).getCssText(); - break; - - default: - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } - textChanged(text); - } - - /** - * Called when the RGBColor and the ICCColor text has changed. - */ - @Override - public void rgbColorICCColorChanged(String rgb, String icc) throws DOMException { - switch (getColorType()) { - case SVG_COLORTYPE_RGBCOLOR_ICCCOLOR: - textChanged(rgb + ' ' + icc); - break; - - default: - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } - } - - /** - * Called when the SVGColor has changed. - */ - @Override - public void colorChanged(short type, String rgb, String icc) throws DOMException { - switch (type) { - case SVG_COLORTYPE_CURRENTCOLOR: - textChanged(CSSConstants.CSS_CURRENTCOLOR_VALUE); - break; - - case SVG_COLORTYPE_RGBCOLOR: - textChanged(rgb); - break; - - case SVG_COLORTYPE_RGBCOLOR_ICCCOLOR: - textChanged(rgb + ' ' + icc); - break; - - default: - throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); - } - } - - /** - * Called when the ICC color profile has changed. - */ - @Override - public void colorProfileChanged(String cp) throws DOMException { - Value value = getValue(); - switch (getColorType()) { - case SVG_COLORTYPE_RGBCOLOR_ICCCOLOR: - StringBuilder sb = new StringBuilder(value.item(0).getCssText()); - sb.append(" icc-color("); - sb.append(cp); - ICCColor iccc = (ICCColor) value.item(1); - for (int i = 0; i < iccc.getLength(); i++) { - sb.append(','); - sb.append(iccc.getColor(i)); - } - sb.append(')'); - textChanged(sb.toString()); - break; - - default: - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } - } - - /** - * Called when the ICC colors has changed. - */ - @Override - public void colorsCleared() throws DOMException { - Value value = getValue(); - switch (getColorType()) { - case SVG_COLORTYPE_RGBCOLOR_ICCCOLOR: - StringBuilder sb = new StringBuilder(value.item(0).getCssText()); - sb.append(" icc-color("); - ICCColor iccc = (ICCColor) value.item(1); - sb.append(iccc.getColorProfile()); - sb.append(')'); - textChanged(sb.toString()); - break; - - default: - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } - } - - /** - * Called when the ICC colors has been initialized. - */ - @Override - public void colorsInitialized(float f) throws DOMException { - Value value = getValue(); - switch (getColorType()) { - case SVG_COLORTYPE_RGBCOLOR_ICCCOLOR: - StringBuilder sb = new StringBuilder(value.item(0).getCssText()); - sb.append(" icc-color("); - ICCColor iccc = (ICCColor) value.item(1); - sb.append(iccc.getColorProfile()); - sb.append(','); - sb.append(f); - sb.append(')'); - textChanged(sb.toString()); - break; - - default: - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } - } - - /** - * Called when the ICC color has been inserted. - */ - @Override - public void colorInsertedBefore(float f, int idx) throws DOMException { - Value value = getValue(); - switch (getColorType()) { - case SVG_COLORTYPE_RGBCOLOR_ICCCOLOR: - StringBuilder sb = new StringBuilder(value.item(0).getCssText()); - sb.append(" icc-color("); - ICCColor iccc = (ICCColor) value.item(1); - sb.append(iccc.getColorProfile()); - for (int i = 0; i < idx; i++) { - sb.append(','); - sb.append(iccc.getColor(i)); - } - sb.append(','); - sb.append(f); - for (int i = idx; i < iccc.getLength(); i++) { - sb.append(','); - sb.append(iccc.getColor(i)); - } - sb.append(')'); - textChanged(sb.toString()); - break; - - default: - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } - } - - /** - * Called when the ICC color has been replaced. - */ - @Override - public void colorReplaced(float f, int idx) throws DOMException { - Value value = getValue(); - switch (getColorType()) { - case SVG_COLORTYPE_RGBCOLOR_ICCCOLOR: - StringBuilder sb = new StringBuilder(value.item(0).getCssText()); - sb.append(" icc-color("); - ICCColor iccc = (ICCColor) value.item(1); - sb.append(iccc.getColorProfile()); - for (int i = 0; i < idx; i++) { - sb.append(','); - sb.append(iccc.getColor(i)); - } - sb.append(','); - sb.append(f); - for (int i = idx + 1; i < iccc.getLength(); i++) { - sb.append(','); - sb.append(iccc.getColor(i)); - } - sb.append(')'); - textChanged(sb.toString()); - break; - - default: - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } - } - - /** - * Called when the ICC color has been removed. - */ - @Override - public void colorRemoved(int idx) throws DOMException { - Value value = getValue(); - switch (getColorType()) { - case SVG_COLORTYPE_RGBCOLOR_ICCCOLOR: - StringBuilder sb = new StringBuilder(value.item(0).getCssText()); - sb.append(" icc-color("); - ICCColor iccc = (ICCColor) value.item(1); - sb.append(iccc.getColorProfile()); - for (int i = 0; i < idx; i++) { - sb.append(','); - sb.append(iccc.getColor(i)); - } - for (int i = idx + 1; i < iccc.getLength(); i++) { - sb.append(','); - sb.append(iccc.getColor(i)); - } - sb.append(')'); - textChanged(sb.toString()); - break; - - default: - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } - } - - /** - * Called when the ICC color has been append. - */ - @Override - public void colorAppend(float f) throws DOMException { - Value value = getValue(); - switch (getColorType()) { - case SVG_COLORTYPE_RGBCOLOR_ICCCOLOR: - StringBuilder sb = new StringBuilder(value.item(0).getCssText()); - sb.append(" icc-color("); - ICCColor iccc = (ICCColor) value.item(1); - sb.append(iccc.getColorProfile()); - for (int i = 0; i < iccc.getLength(); i++) { - sb.append(','); - sb.append(iccc.getColor(i)); - } - sb.append(','); - sb.append(f); - sb.append(')'); - textChanged(sb.toString()); - break; - - default: - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } - } - - } - - /** - * To store a component. - */ - protected abstract class AbstractComponent implements CSSPrimitiveValue { - - /** - * The returns the actual value of this component. - */ - protected abstract Value getValue(); - - /** - * DOM: Implements {@link org.w3c.dom.css.CSSValue#getCssText()}. - */ - @Override - public String getCssText() { - return getValue().getCssText(); - } - - /** - * DOM: Implements {@link org.w3c.dom.css.CSSValue#getCssValueType()}. - */ - @Override - public short getCssValueType() { - return getValue().getCssValueType(); - } - - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#getPrimitiveType()}. - */ - @Override - public short getPrimitiveType() { - return getValue().getPrimitiveType(); - } - - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#getFloatValue(short)}. - */ - @Override - public float getFloatValue(short unitType) throws DOMException { - return CSSOMValue.convertFloatValue(unitType, getValue()); - } - - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#getStringValue()}. - */ - @Override - public String getStringValue() throws DOMException { - return valueProvider.getValue().getStringValue(); - } - - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#getCounterValue()}. - */ - @Override - public Counter getCounterValue() throws DOMException { - throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); - } - - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#getRectValue()}. - */ - @Override - public Rect getRectValue() throws DOMException { - throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); - } - - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#getRGBColorValue()}. - */ - @Override - public RGBColor getRGBColorValue() throws DOMException { - throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); - } - - // CSSValueList /////////////////////////////////////////////////////// - - /** - * DOM: Implements {@link org.w3c.dom.css.CSSValueList#getLength()}. - */ - public int getLength() { - throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); - } - - /** - * DOM: Implements {@link org.w3c.dom.css.CSSValueList#item(int)}. - */ - public CSSValue item(int index) { - throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); - } - - } - - /** - * To store a Float component. - */ - protected abstract class FloatComponent extends AbstractComponent { - - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#setStringValue(short,String)}. - */ - @Override - public void setStringValue(short stringType, String stringValue) throws DOMException { - throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); - } - - } - - /** - * To represents a red component. - */ - protected class RedComponent extends FloatComponent { - - /** - * The returns the actual value of this component. - */ - @Override - protected Value getValue() { - return valueProvider.getValue().getRed(); - } - - /** - * DOM: Implements {@link org.w3c.dom.css.CSSValue#setCssText(String)}. - */ - @Override - public void setCssText(String cssText) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - getValue(); - handler.redTextChanged(cssText); - } - } - - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#setFloatValue(short,float)}. - */ - @Override - public void setFloatValue(short unitType, float floatValue) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - getValue(); - handler.redFloatValueChanged(unitType, floatValue); - } - } - - } - - /** - * To represents a green component. - */ - protected class GreenComponent extends FloatComponent { - - /** - * The returns the actual value of this component. - */ - @Override - protected Value getValue() { - return valueProvider.getValue().getGreen(); - } - - /** - * DOM: Implements {@link org.w3c.dom.css.CSSValue#setCssText(String)}. - */ - @Override - public void setCssText(String cssText) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - getValue(); - handler.greenTextChanged(cssText); - } - } - - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#setFloatValue(short,float)}. - */ - @Override - public void setFloatValue(short unitType, float floatValue) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - getValue(); - handler.greenFloatValueChanged(unitType, floatValue); - } - } - - } - - /** - * To represents a blue component. - */ - protected class BlueComponent extends FloatComponent { - - /** - * The returns the actual value of this component. - */ - @Override - protected Value getValue() { - return valueProvider.getValue().getBlue(); - } - - /** - * DOM: Implements {@link org.w3c.dom.css.CSSValue#setCssText(String)}. - */ - @Override - public void setCssText(String cssText) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - getValue(); - handler.blueTextChanged(cssText); - } - } - - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#setFloatValue(short,float)}. - */ - @Override - public void setFloatValue(short unitType, float floatValue) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - getValue(); - handler.blueFloatValueChanged(unitType, floatValue); - } - } - - } - } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMSVGComputedStyle.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMSVGComputedStyle.java index c7a77277c..1dd5ee7de 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMSVGComputedStyle.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMSVGComputedStyle.java @@ -18,8 +18,6 @@ */ package io.sf.carte.echosvg.css.dom; -import org.w3c.dom.css.CSSValue; - import io.sf.carte.echosvg.css.engine.CSSEngine; import io.sf.carte.echosvg.css.engine.CSSStylableElement; import io.sf.carte.echosvg.css.engine.SVGCSSEngine; diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMSVGPaint.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMSVGPaint.java index 2e9a92cb1..6ff79fcbf 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMSVGPaint.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMSVGPaint.java @@ -19,24 +19,25 @@ package io.sf.carte.echosvg.css.dom; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; -import org.w3c.dom.css.CSSValue; import org.w3c.dom.svg.SVGPaint; -import io.sf.carte.echosvg.css.engine.value.FloatValue; -import io.sf.carte.echosvg.css.engine.value.RGBColorValue; +import io.sf.carte.echosvg.css.engine.value.AbstractValueModificationHandler; +import io.sf.carte.echosvg.css.engine.value.ColorValue; import io.sf.carte.echosvg.css.engine.value.Value; -import io.sf.carte.echosvg.css.engine.value.svg.ICCColor; +import io.sf.carte.echosvg.css.engine.value.ValueModificationHandler; import io.sf.carte.echosvg.util.CSSConstants; /** * This class implements the {@link SVGPaint} interface. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ -public class CSSOMSVGPaint extends CSSOMSVGColor implements SVGPaint { +@SuppressWarnings("deprecation") +public class CSSOMSVGPaint extends CSSOMSVGColor { /** * Creates a new CSSOMSVGPaint. @@ -49,7 +50,7 @@ public CSSOMSVGPaint(ValueProvider vp) { * Sets the modification handler of this value. */ @Override - public void setModificationHandler(ModificationHandler h) { + public void setModificationHandler(ValueModificationHandler h) { if (!(h instanceof PaintModificationHandler)) { throw new IllegalArgumentException(); } @@ -67,74 +68,96 @@ public short getColorType() { /** * DOM: Implements {@link org.w3c.dom.svg.SVGPaint#getPaintType()}. */ - @Override public short getPaintType() { Value value = valueProvider.getValue(); switch (value.getCssValueType()) { - case CSSValue.CSS_PRIMITIVE_VALUE: + case TYPED: switch (value.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_IDENT: { - String str = value.getStringValue(); + case IDENT: + String str = value.getIdentifierValue(); if (str.equalsIgnoreCase(CSSConstants.CSS_NONE_VALUE)) { - return SVG_PAINTTYPE_NONE; + return SVGPaint.SVG_PAINTTYPE_NONE; } else if (str.equalsIgnoreCase(CSSConstants.CSS_CURRENTCOLOR_VALUE)) { - return SVG_PAINTTYPE_CURRENTCOLOR; + return SVGPaint.SVG_PAINTTYPE_CURRENTCOLOR; } - return SVG_PAINTTYPE_RGBCOLOR; - } - case CSSPrimitiveValue.CSS_RGBCOLOR: - return SVG_PAINTTYPE_RGBCOLOR; - - case CSSPrimitiveValue.CSS_URI: - return SVG_PAINTTYPE_URI; + return SVGPaint.SVG_PAINTTYPE_RGBCOLOR; + case COLOR: + ColorValue color = value.getColorValue(); + switch (color.getCSSColorSpace()) { + case ColorValue.RGB_FUNCTION: + return SVGPaint.SVG_PAINTTYPE_RGBCOLOR; + default: + break; + } + break; + case URI: + return SVGPaint.SVG_PAINTTYPE_URI; } break; - case CSSValue.CSS_VALUE_LIST: + case LIST: Value v0 = value.item(0); Value v1 = value.item(1); switch (v0.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_IDENT: - return SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR; - case CSSPrimitiveValue.CSS_URI: - if (v1.getCssValueType() == CSSValue.CSS_VALUE_LIST) - // Should probably check this more deeply... - return SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR; + case IDENT: + return SVGPaint.SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR; + case URI: + if (v1.getCssValueType() == Value.CssType.LIST) + // FIXME: Should probably check this more deeply... + return SVGPaint.SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR; switch (v1.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_IDENT: { - String str = v1.getStringValue(); + case IDENT: + String str = v1.getIdentifierValue(); if (str.equalsIgnoreCase(CSSConstants.CSS_NONE_VALUE)) { - return SVG_PAINTTYPE_URI_NONE; + return SVGPaint.SVG_PAINTTYPE_URI_NONE; } else if (str.equalsIgnoreCase(CSSConstants.CSS_CURRENTCOLOR_VALUE)) { - return SVG_PAINTTYPE_URI_CURRENTCOLOR; + return SVGPaint.SVG_PAINTTYPE_URI_CURRENTCOLOR; + } + return SVGPaint.SVG_PAINTTYPE_URI_RGBCOLOR; + case COLOR: + ColorValue color = v1.getColorValue(); + switch (color.getCSSColorSpace()) { + case ColorValue.RGB_FUNCTION: + return SVGPaint.SVG_PAINTTYPE_URI_RGBCOLOR; + default: + break; } - return SVG_PAINTTYPE_URI_RGBCOLOR; - } - case CSSPrimitiveValue.CSS_RGBCOLOR: - return SVG_PAINTTYPE_URI_RGBCOLOR; } - case CSSPrimitiveValue.CSS_RGBCOLOR: - return SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR; + break; + case COLOR: + ColorValue color = v0.getColorValue(); + switch (color.getCSSColorSpace()) { + case ColorValue.RGB_FUNCTION: + return SVGPaint.SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR; + default: + break; + } } + } - return SVG_PAINTTYPE_UNKNOWN; + + return SVGPaint.SVG_PAINTTYPE_UNKNOWN; + } + + @Override + public String getURIValue() throws DOMException { + return getUri(); } /** * DOM: Implements {@link org.w3c.dom.svg.SVGPaint#getUri()}. */ - @Override public String getUri() { switch (getPaintType()) { - case SVG_PAINTTYPE_URI: - return valueProvider.getValue().getStringValue(); + case SVGPaint.SVG_PAINTTYPE_URI: + return valueProvider.getValue().getURIValue(); - case SVG_PAINTTYPE_URI_NONE: - case SVG_PAINTTYPE_URI_CURRENTCOLOR: - case SVG_PAINTTYPE_URI_RGBCOLOR: - case SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR: + case SVGPaint.SVG_PAINTTYPE_URI_NONE: + case SVGPaint.SVG_PAINTTYPE_URI_CURRENTCOLOR: + case SVGPaint.SVG_PAINTTYPE_URI_RGBCOLOR: + case SVGPaint.SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR: return valueProvider.getValue().item(0).getStringValue(); } throw new InternalError(); @@ -143,12 +166,11 @@ public String getUri() { /** * DOM: Implements {@link org.w3c.dom.svg.SVGPaint#setUri(String)}. */ - @Override public void setUri(String uri) { if (handler == null) { throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); } else { - ((PaintModificationHandler) handler).uriChanged(uri); + ((PaintModificationHandler) handler).uriValueChanged(uri); } } @@ -156,7 +178,6 @@ public void setUri(String uri) { * DOM: Implements * {@link org.w3c.dom.svg.SVGPaint#setPaint(short,String,String,String)}. */ - @Override public void setPaint(short paintType, String uri, String rgbColor, String iccColor) { if (handler == null) { throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); @@ -168,12 +189,12 @@ public void setPaint(short paintType, String uri, String rgbColor, String iccCol /** * To manage the modifications on a SVGPaint value. */ - public interface PaintModificationHandler extends ModificationHandler { + public interface PaintModificationHandler extends ValueModificationHandler { /** * Called when the URI has been modified. */ - void uriChanged(String uri); + void uriValueChanged(String uri); /** * Called when the paint value has beem modified. @@ -185,559 +206,15 @@ public interface PaintModificationHandler extends ModificationHandler { /** * Provides an abstract implementation of a PaintModificationHandler. */ - public abstract class AbstractModificationHandler implements PaintModificationHandler { - - /** - * Returns the associated value. - */ - protected abstract Value getValue(); - - /** - * Called when the red value text has changed. - */ - @Override - public void redTextChanged(String text) throws DOMException { - switch (getPaintType()) { - case SVG_PAINTTYPE_RGBCOLOR: - text = RGBColorValue.toString(text, getValue().getGreen().getCssText(), - getValue().getBlue().getCssText(), getValue().getAlpha().getCssText()); - break; - - case SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR: - text = RGBColorValue.toString(text, getValue().item(0).getGreen().getCssText(), - getValue().item(0).getBlue().getCssText(), getValue().item(0).getAlpha().getCssText()) + ' ' - + getValue().item(1).getCssText(); - break; - - case SVG_PAINTTYPE_URI_RGBCOLOR: - text = getValue().item(0).getCssText() + ' ' - + RGBColorValue.toString(text, getValue().item(1).getGreen().getCssText(), - getValue().item(1).getBlue().getCssText(), getValue().item(1).getAlpha().getCssText()); - break; - - case SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR: - text = getValue().item(0).getCssText() + ' ' - + RGBColorValue.toString(text, getValue().item(1).getGreen().getCssText(), - getValue().item(1).getBlue().getCssText(), getValue().item(1).getAlpha().getCssText()) - + ' ' + getValue().item(2).getCssText(); - break; - - default: - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } - textChanged(text); - } - - /** - * Called when the red float value has changed. - */ - @Override - public void redFloatValueChanged(short unit, float value) throws DOMException { - redTextChanged(FloatValue.getCssText(unit, value)); - } - - /** - * Called when the green value text has changed. - */ - @Override - public void greenTextChanged(String text) throws DOMException { - switch (getPaintType()) { - case SVG_PAINTTYPE_RGBCOLOR: - text = RGBColorValue.toString(getValue().getRed().getCssText(), text, getValue().getBlue().getCssText(), - getValue().getAlpha().getCssText()); - break; - - case SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR: - text = RGBColorValue.toString(getValue().item(0).getRed().getCssText(), text, - getValue().item(0).getBlue().getCssText(), getValue().item(0).getAlpha().getCssText()) + ' ' - + getValue().item(1).getCssText(); - break; - - case SVG_PAINTTYPE_URI_RGBCOLOR: - text = getValue().item(0).getCssText() + ' ' - + RGBColorValue.toString(getValue().item(1).getRed().getCssText(), text, - getValue().item(1).getBlue().getCssText(), getValue().item(1).getAlpha().getCssText()); - break; - - case SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR: - text = getValue().item(0).getCssText() + ' ' - + RGBColorValue.toString(getValue().item(1).getRed().getCssText(), text, - getValue().item(1).getBlue().getCssText(), getValue().item(1).getAlpha().getCssText()) - + ' ' + getValue().item(2).getCssText(); - break; - - default: - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } - textChanged(text); - } - - /** - * Called when the green float value has changed. - */ - @Override - public void greenFloatValueChanged(short unit, float value) throws DOMException { - greenTextChanged(FloatValue.getCssText(unit, value)); - } - - /** - * Called when the blue value text has changed. - */ - @Override - public void blueTextChanged(String text) throws DOMException { - switch (getPaintType()) { - case SVG_PAINTTYPE_RGBCOLOR: - text = RGBColorValue.toString(getValue().getRed().getCssText(), getValue().getGreen().getCssText(), - text, getValue().getAlpha().getCssText()); - break; - - case SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR: - text = RGBColorValue.toString(getValue().item(0).getRed().getCssText(), - getValue().item(0).getGreen().getCssText(), text, getValue().item(0).getAlpha().getCssText()) - + ' ' + getValue().item(1).getCssText(); - break; - - case SVG_PAINTTYPE_URI_RGBCOLOR: - text = getValue().item(0).getCssText() + ' ' - + RGBColorValue.toString(getValue().item(1).getRed().getCssText(), - getValue().item(1).getGreen().getCssText(), text, - getValue().item(1).getAlpha().getCssText()); - break; - - case SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR: - text = getValue().item(0).getCssText() + ' ' - + RGBColorValue.toString(getValue().item(1).getRed().getCssText(), - getValue().item(1).getGreen().getCssText(), text, - getValue().item(1).getAlpha().getCssText()) - + ' ' + getValue().item(2).getCssText(); - break; - - default: - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } - textChanged(text); - } - - /** - * Called when the blue float value has changed. - */ - @Override - public void blueFloatValueChanged(short unit, float value) throws DOMException { - blueTextChanged(FloatValue.getCssText(unit, value)); - } - - @Override - public void alphaTextChanged(String text) throws DOMException { - switch (getPaintType()) { - case SVG_PAINTTYPE_RGBCOLOR: - text = RGBColorValue.toString(getValue().getRed().getCssText(), getValue().getGreen().getCssText(), - getValue().getBlue().getCssText(), text); - break; - - case SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR: - text = RGBColorValue.toString(getValue().item(0).getRed().getCssText(), - getValue().item(0).getGreen().getCssText(), getValue().item(0).getBlue().getCssText(), text) - + ' ' + getValue().item(1).getCssText(); - break; - - case SVG_PAINTTYPE_URI_RGBCOLOR: - text = getValue().item(0).getCssText() + ' ' - + RGBColorValue.toString(getValue().item(1).getRed().getCssText(), - getValue().item(1).getGreen().getCssText(), getValue().item(1).getBlue().getCssText(), - text); - break; - - case SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR: - text = getValue().item(0).getCssText() + ' ' - + RGBColorValue.toString(getValue().item(1).getRed().getCssText(), - getValue().item(1).getGreen().getCssText(), getValue().item(1).getBlue().getCssText(), - text) - + ' ' + getValue().item(2).getCssText(); - break; - - default: - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } - textChanged(text); - } - - @Override - public void alphaFloatValueChanged(short unit, float value) throws DOMException { - alphaTextChanged(FloatValue.getCssText(unit, value)); - } - - /** - * Called when the RGBColor text has changed. - */ - @Override - public void rgbColorChanged(String text) throws DOMException { - switch (getPaintType()) { - case SVG_PAINTTYPE_RGBCOLOR: - break; - - case SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR: - text += getValue().item(1).getCssText(); - break; - - case SVG_PAINTTYPE_URI_RGBCOLOR: - text = getValue().item(0).getCssText() + ' ' + text; - break; - - case SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR: - text = getValue().item(0).getCssText() + ' ' + text + ' ' + getValue().item(2).getCssText(); - break; - - default: - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } - textChanged(text); - } - - /** - * Called when the RGBColor and the ICCColor text has changed. - */ - @Override - public void rgbColorICCColorChanged(String rgb, String icc) throws DOMException { - switch (getPaintType()) { - case SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR: - textChanged(rgb + ' ' + icc); - break; - - case SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR: - textChanged(getValue().item(0).getCssText() + ' ' + rgb + ' ' + icc); - break; - - default: - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } - } - - /** - * Called when the SVGColor has changed. - */ - @Override - public void colorChanged(short type, String rgb, String icc) throws DOMException { - switch (type) { - case SVG_PAINTTYPE_CURRENTCOLOR: - textChanged("currentcolor"); - break; - - case SVG_PAINTTYPE_RGBCOLOR: - textChanged(rgb); - break; - - case SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR: - textChanged(rgb + ' ' + icc); - break; - - default: - throw new DOMException(DOMException.NOT_SUPPORTED_ERR, ""); - } - } - - /** - * Called when the ICC color profile has changed. - */ - @Override - public void colorProfileChanged(String cp) throws DOMException { - switch (getPaintType()) { - case SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR: - StringBuilder sb = new StringBuilder(getValue().item(0).getCssText()); - sb.append(" icc-color("); - sb.append(cp); - ICCColor iccc = (ICCColor) getValue().item(1); - for (int i = 0; i < iccc.getLength(); i++) { - sb.append(','); - sb.append(iccc.getColor(i)); - } - sb.append(')'); - textChanged(sb.toString()); - break; - - case SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR: - sb = new StringBuilder(getValue().item(0).getCssText()); - sb.append(' '); - sb.append(getValue().item(1).getCssText()); - sb.append(" icc-color("); - sb.append(cp); - iccc = (ICCColor) getValue().item(1); - for (int i = 0; i < iccc.getLength(); i++) { - sb.append(','); - sb.append(iccc.getColor(i)); - } - sb.append(')'); - textChanged(sb.toString()); - break; - - default: - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } - } - - /** - * Called when the ICC colors has changed. - */ - @Override - public void colorsCleared() throws DOMException { - switch (getPaintType()) { - case SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR: - StringBuilder sb = new StringBuilder(getValue().item(0).getCssText()); - sb.append(" icc-color("); - ICCColor iccc = (ICCColor) getValue().item(1); - sb.append(iccc.getColorProfile()); - sb.append(')'); - textChanged(sb.toString()); - break; - - case SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR: - sb = new StringBuilder(getValue().item(0).getCssText()); - sb.append(' '); - sb.append(getValue().item(1).getCssText()); - sb.append(" icc-color("); - iccc = (ICCColor) getValue().item(1); - sb.append(iccc.getColorProfile()); - sb.append(')'); - textChanged(sb.toString()); - break; - - default: - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } - } - - /** - * Called when the ICC colors has been initialized. - */ - @Override - public void colorsInitialized(float f) throws DOMException { - switch (getPaintType()) { - case SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR: - StringBuilder sb = new StringBuilder(getValue().item(0).getCssText()); - sb.append(" icc-color("); - ICCColor iccc = (ICCColor) getValue().item(1); - sb.append(iccc.getColorProfile()); - sb.append(','); - sb.append(f); - sb.append(')'); - textChanged(sb.toString()); - break; - - case SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR: - sb = new StringBuilder(getValue().item(0).getCssText()); - sb.append(' '); - sb.append(getValue().item(1).getCssText()); - sb.append(" icc-color("); - iccc = (ICCColor) getValue().item(1); - sb.append(iccc.getColorProfile()); - sb.append(','); - sb.append(f); - sb.append(')'); - textChanged(sb.toString()); - break; - - default: - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } - } - - /** - * Called when the ICC color has been inserted. - */ - @Override - public void colorInsertedBefore(float f, int idx) throws DOMException { - switch (getPaintType()) { - case SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR: - StringBuilder sb = new StringBuilder(getValue().item(0).getCssText()); - sb.append(" icc-color("); - ICCColor iccc = (ICCColor) getValue().item(1); - sb.append(iccc.getColorProfile()); - for (int i = 0; i < idx; i++) { - sb.append(','); - sb.append(iccc.getColor(i)); - } - sb.append(','); - sb.append(f); - for (int i = idx; i < iccc.getLength(); i++) { - sb.append(','); - sb.append(iccc.getColor(i)); - } - sb.append(')'); - textChanged(sb.toString()); - break; - - case SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR: - sb = new StringBuilder(getValue().item(0).getCssText()); - sb.append(' '); - sb.append(getValue().item(1).getCssText()); - sb.append(" icc-color("); - iccc = (ICCColor) getValue().item(1); - sb.append(iccc.getColorProfile()); - for (int i = 0; i < idx; i++) { - sb.append(','); - sb.append(iccc.getColor(i)); - } - sb.append(','); - sb.append(f); - for (int i = idx; i < iccc.getLength(); i++) { - sb.append(','); - sb.append(iccc.getColor(i)); - } - sb.append(')'); - textChanged(sb.toString()); - break; - - default: - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } - } - - /** - * Called when the ICC color has been replaced. - */ - @Override - public void colorReplaced(float f, int idx) throws DOMException { - switch (getPaintType()) { - case SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR: - StringBuilder sb = new StringBuilder(getValue().item(0).getCssText()); - sb.append(" icc-color("); - ICCColor iccc = (ICCColor) getValue().item(1); - sb.append(iccc.getColorProfile()); - for (int i = 0; i < idx; i++) { - sb.append(','); - sb.append(iccc.getColor(i)); - } - sb.append(','); - sb.append(f); - for (int i = idx + 1; i < iccc.getLength(); i++) { - sb.append(','); - sb.append(iccc.getColor(i)); - } - sb.append(')'); - textChanged(sb.toString()); - break; - - case SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR: - sb = new StringBuilder(getValue().item(0).getCssText()); - sb.append(' '); - sb.append(getValue().item(1).getCssText()); - sb.append(" icc-color("); - iccc = (ICCColor) getValue().item(1); - sb.append(iccc.getColorProfile()); - for (int i = 0; i < idx; i++) { - sb.append(','); - sb.append(iccc.getColor(i)); - } - sb.append(','); - sb.append(f); - for (int i = idx + 1; i < iccc.getLength(); i++) { - sb.append(','); - sb.append(iccc.getColor(i)); - } - sb.append(')'); - textChanged(sb.toString()); - break; - - default: - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } - } - - /** - * Called when the ICC color has been removed. - */ - @Override - public void colorRemoved(int idx) throws DOMException { - switch (getPaintType()) { - case SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR: - StringBuilder sb = new StringBuilder(getValue().item(0).getCssText()); - sb.append(" icc-color("); - ICCColor iccc = (ICCColor) getValue().item(1); - sb.append(iccc.getColorProfile()); - for (int i = 0; i < idx; i++) { - sb.append(','); - sb.append(iccc.getColor(i)); - } - for (int i = idx + 1; i < iccc.getLength(); i++) { - sb.append(','); - sb.append(iccc.getColor(i)); - } - sb.append(')'); - textChanged(sb.toString()); - break; - - case SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR: - sb = new StringBuilder(getValue().item(0).getCssText()); - sb.append(' '); - sb.append(getValue().item(1).getCssText()); - sb.append(" icc-color("); - iccc = (ICCColor) getValue().item(1); - sb.append(iccc.getColorProfile()); - for (int i = 0; i < idx; i++) { - sb.append(','); - sb.append(iccc.getColor(i)); - } - for (int i = idx + 1; i < iccc.getLength(); i++) { - sb.append(','); - sb.append(iccc.getColor(i)); - } - sb.append(')'); - textChanged(sb.toString()); - break; - - default: - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } - } - - /** - * Called when the ICC color has been append. - */ - @Override - public void colorAppend(float f) throws DOMException { - switch (getPaintType()) { - case SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR: - StringBuilder sb = new StringBuilder(getValue().item(0).getCssText()); - sb.append(" icc-color("); - ICCColor iccc = (ICCColor) getValue().item(1); - sb.append(iccc.getColorProfile()); - for (int i = 0; i < iccc.getLength(); i++) { - sb.append(','); - sb.append(iccc.getColor(i)); - } - sb.append(','); - sb.append(f); - sb.append(')'); - textChanged(sb.toString()); - break; - - case SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR: - sb = new StringBuilder(getValue().item(0).getCssText()); - sb.append(' '); - sb.append(getValue().item(1).getCssText()); - sb.append(" icc-color("); - iccc = (ICCColor) getValue().item(1); - sb.append(iccc.getColorProfile()); - for (int i = 0; i < iccc.getLength(); i++) { - sb.append(','); - sb.append(iccc.getColor(i)); - } - sb.append(','); - sb.append(f); - sb.append(')'); - textChanged(sb.toString()); - break; - - default: - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } - } + public abstract class AbstractModificationHandler extends AbstractValueModificationHandler + implements PaintModificationHandler { /** * Called when the URI has been modified. */ @Override - public void uriChanged(String uri) { - textChanged("url(" + uri + ") none"); + public void uriValueChanged(String uri) { + setPropertyText("url(" + uri + ") none"); } /** @@ -746,40 +223,40 @@ public void uriChanged(String uri) { @Override public void paintChanged(short type, String uri, String rgb, String icc) { switch (type) { - case SVG_PAINTTYPE_NONE: - textChanged("none"); + case SVGPaint.SVG_PAINTTYPE_NONE: + setPropertyText("none"); break; - case SVG_PAINTTYPE_CURRENTCOLOR: - textChanged("currentcolor"); + case SVGPaint.SVG_PAINTTYPE_CURRENTCOLOR: + setPropertyText("currentcolor"); break; - case SVG_PAINTTYPE_RGBCOLOR: - textChanged(rgb); + case SVGPaint.SVG_PAINTTYPE_RGBCOLOR: + setPropertyText(rgb); break; - case SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR: - textChanged(rgb + ' ' + icc); + case SVGPaint.SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR: + setPropertyText(rgb + ' ' + icc); break; - case SVG_PAINTTYPE_URI: - textChanged("url(" + uri + ')'); + case SVGPaint.SVG_PAINTTYPE_URI: + setPropertyText("url(" + uri + ')'); break; - case SVG_PAINTTYPE_URI_NONE: - textChanged("url(" + uri + ") none"); + case SVGPaint.SVG_PAINTTYPE_URI_NONE: + setPropertyText("url(" + uri + ") none"); break; - case SVG_PAINTTYPE_URI_CURRENTCOLOR: - textChanged("url(" + uri + ") currentcolor"); + case SVGPaint.SVG_PAINTTYPE_URI_CURRENTCOLOR: + setPropertyText("url(" + uri + ") currentcolor"); break; - case SVG_PAINTTYPE_URI_RGBCOLOR: - textChanged("url(" + uri + ") " + rgb); + case SVGPaint.SVG_PAINTTYPE_URI_RGBCOLOR: + setPropertyText("url(" + uri + ") " + rgb); break; - case SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR: - textChanged("url(" + uri + ") " + rgb + ' ' + icc); + case SVGPaint.SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR: + setPropertyText("url(" + uri + ") " + rgb + ' ' + icc); } } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMSVGStyleDeclaration.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMSVGStyleDeclaration.java index 0ac061739..d942e17e5 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMSVGStyleDeclaration.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMSVGStyleDeclaration.java @@ -18,12 +18,12 @@ */ package io.sf.carte.echosvg.css.dom; +import org.w3c.css.om.CSSRule; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSRule; -import org.w3c.dom.css.CSSValue; import io.sf.carte.echosvg.css.engine.CSSEngine; import io.sf.carte.echosvg.css.engine.SVGCSSEngine; +import io.sf.carte.echosvg.css.engine.value.AbstractValueModificationHandler; import io.sf.carte.echosvg.css.engine.value.Value; import io.sf.carte.echosvg.css.engine.value.svg.SVGColorManager; import io.sf.carte.echosvg.css.engine.value.svg.SVGPaintManager; @@ -31,8 +31,10 @@ /** * This class represents a SVG style declaration. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public class CSSOMSVGStyleDeclaration extends CSSOMStyleDeclaration { @@ -94,14 +96,14 @@ public class StyleDeclarationColorValue extends CSSOMSVGColor implements CSSOMSV public StyleDeclarationColorValue(String prop) { super(null); valueProvider = this; - setModificationHandler(new AbstractModificationHandler() { + setModificationHandler(new AbstractValueModificationHandler() { @Override protected Value getValue() { return StyleDeclarationColorValue.this.getValue(); } @Override - public void textChanged(String text) throws DOMException { + protected void setPropertyText(String text) throws DOMException { if (handler == null) { throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); } @@ -148,7 +150,7 @@ protected Value getValue() { } @Override - public void textChanged(String text) throws DOMException { + protected void setPropertyText(String text) throws DOMException { if (handler == null) { throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMSVGViewCSS.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMSVGViewCSS.java index a7aca0835..e6d45f4e8 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMSVGViewCSS.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMSVGViewCSS.java @@ -18,8 +18,8 @@ */ package io.sf.carte.echosvg.css.dom; +import org.w3c.css.om.CSSStyleDeclaration; import org.w3c.dom.Element; -import org.w3c.dom.css.CSSStyleDeclaration; import io.sf.carte.echosvg.css.engine.CSSEngine; import io.sf.carte.echosvg.css.engine.CSSStylableElement; diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMStyleDeclaration.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMStyleDeclaration.java index 75d3f324e..1ed9456d5 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMStyleDeclaration.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMStyleDeclaration.java @@ -21,18 +21,20 @@ import java.util.HashMap; import java.util.Map; +import org.w3c.css.om.CSSRule; +import org.w3c.css.om.CSSStyleDeclaration; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSRule; -import org.w3c.dom.css.CSSStyleDeclaration; -import org.w3c.dom.css.CSSValue; +import io.sf.carte.echosvg.css.engine.value.AbstractValueModificationHandler; import io.sf.carte.echosvg.css.engine.value.Value; /** * This class represents a style declaration. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public class CSSOMStyleDeclaration implements CSSStyleDeclaration { @@ -72,19 +74,11 @@ public void setModificationHandler(ModificationHandler h) { handler = h; } - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSStyleDeclaration#getCssText()}. - */ @Override public String getCssText() { return valueProvider.getText(); } - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSStyleDeclaration#setCssText(String)}. - */ @Override public void setCssText(String cssText) throws DOMException { if (handler == null) { @@ -95,10 +89,6 @@ public void setCssText(String cssText) throws DOMException { } } - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSStyleDeclaration#getPropertyValue(String)}. - */ @Override public String getPropertyValue(String propertyName) { Value value = valueProvider.getValue(propertyName); @@ -108,12 +98,8 @@ public String getPropertyValue(String propertyName) { return value.getCssText(); } - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSStyleDeclaration#getPropertyCSSValue(String)}. - */ @Override - public CSSValue getPropertyCSSValue(String propertyName) { + public CSSValue getCSSStyleValue(String propertyName) { Value value = valueProvider.getValue(propertyName); if (value == null) { return null; @@ -121,10 +107,6 @@ public CSSValue getPropertyCSSValue(String propertyName) { return getCSSValue(propertyName); } - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSStyleDeclaration#removeProperty(String)}. - */ @Override public String removeProperty(String propertyName) throws DOMException { String result = getPropertyValue(propertyName); @@ -141,19 +123,11 @@ public String removeProperty(String propertyName) throws DOMException { return result; } - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSStyleDeclaration#getPropertyPriority(String)}. - */ @Override public String getPropertyPriority(String propertyName) { return (valueProvider.isImportant(propertyName)) ? "important" : ""; } - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSStyleDeclaration#setProperty(String,String,String)}. - */ @Override public void setProperty(String propertyName, String value, String prio) throws DOMException { if (handler == null) { @@ -163,10 +137,6 @@ public void setProperty(String propertyName, String value, String prio) throws D } } - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSStyleDeclaration#getLength()}. - */ @Override public int getLength() { return valueProvider.getLength(); @@ -180,10 +150,6 @@ public String item(int index) { return valueProvider.item(index); } - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSStyleDeclaration#getParentRule()}. - */ @Override public CSSRule getParentRule() { return parentRule; @@ -247,12 +213,12 @@ public interface ValueProvider { } /** - * To manage the modifications on a CSS value. + * To manage the modifications on a CSS style declaration. */ public interface ModificationHandler { /** - * Called when the value text has changed. + * Called when the declaration text has changed. */ void textChanged(String text) throws DOMException; @@ -284,14 +250,14 @@ public class StyleDeclarationValue extends CSSOMValue implements CSSOMValue.Valu public StyleDeclarationValue(String prop) { super(null); this.valueProvider = this; - this.setModificationHandler(new AbstractModificationHandler() { + this.setModificationHandler(new AbstractValueModificationHandler() { @Override protected Value getValue() { return StyleDeclarationValue.this.getValue(); } @Override - public void textChanged(String text) throws DOMException { + protected void setPropertyText(String text) throws DOMException { if (values == null || StyleDeclarationValue.this.handler == null) { throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMValue.java index 2b111d58b..1c089c02f 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMValue.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMValue.java @@ -18,30 +18,25 @@ */ package io.sf.carte.echosvg.css.dom; +import org.w3c.css.om.typed.CSSCounterValue; +import org.w3c.css.om.unit.CSSUnit; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; -import org.w3c.dom.css.CSSValue; -import org.w3c.dom.css.CSSValueList; -import org.w3c.dom.css.Counter; -import org.w3c.dom.css.RGBColor; -import org.w3c.dom.css.Rect; -import io.sf.carte.echosvg.css.engine.value.FloatValue; -import io.sf.carte.echosvg.css.engine.value.ListValue; -import io.sf.carte.echosvg.css.engine.value.RGBColorValue; -import io.sf.carte.echosvg.css.engine.value.StringValue; +import io.sf.carte.echosvg.css.engine.value.ColorValue; +import io.sf.carte.echosvg.css.engine.value.RectValue; import io.sf.carte.echosvg.css.engine.value.Value; +import io.sf.carte.echosvg.css.engine.value.ValueModificationHandler; /** - * This class implements the {@link org.w3c.dom.css.CSSValue}, - * {@link org.w3c.dom.css.CSSPrimitiveValue}, - * {@link org.w3c.dom.css.CSSValueList} interfaces. - * - * @author Stephane Hillion - * @author For later modifications, see Git history. + * This class implements the {@link org.w3c.css.om.typed.CSSStyleValue} + * interface. + *

+ * Original author Stephane Hillion + *

+ * * @version $Id$ */ -public class CSSOMValue implements CSSPrimitiveValue, CSSValueList, Counter, Rect, RGBColor { +public class CSSOMValue implements Value { /** * The associated value. @@ -51,52 +46,7 @@ public class CSSOMValue implements CSSPrimitiveValue, CSSValueList, Counter, Rec /** * The modifications handler. */ - protected ModificationHandler handler; - - /** - * The left component, if this value is a Rect. - */ - protected LeftComponent leftComponent; - - /** - * The right component, if this value is a Rect. - */ - protected RightComponent rightComponent; - - /** - * The bottom component, if this value is a Rect. - */ - protected BottomComponent bottomComponent; - - /** - * The top component, if this value is a Rect. - */ - protected TopComponent topComponent; - - /** - * The red component, if this value is a RGBColor. - */ - protected RedComponent redComponent; - - /** - * The green component, if this value is a RGBColor. - */ - protected GreenComponent greenComponent; - - /** - * The blue component, if this value is a RGBColor. - */ - protected BlueComponent blueComponent; - - /** - * The alpha component, if this value is a RGBColor. - */ - protected AlphaComponent alphaComponent; - - /** - * The list items. - */ - protected CSSValue[] items; + protected ValueModificationHandler handler; /** * Creates a new CSSOMValue. @@ -108,7 +58,7 @@ public CSSOMValue(ValueProvider vp) { /** * Sets the modification handler of this value. */ - public void setModificationHandler(ModificationHandler h) { + public void setModificationHandler(ValueModificationHandler h) { handler = h; } @@ -120,55 +70,38 @@ public String getCssText() { return valueProvider.getValue().getCssText(); } - /** - * DOM: Implements {@link org.w3c.dom.css.CSSValue#setCssText(String)}. - */ @Override public void setCssText(String cssText) throws DOMException { if (handler == null) { throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); } else { - handler.textChanged(cssText); + valueProvider.getValue().setCssText(cssText); + handler.valueChanged(valueProvider.getValue()); } } - /** - * DOM: Implements {@link org.w3c.dom.css.CSSValue#getCssValueType()}. - */ @Override - public short getCssValueType() { + public CssType getCssValueType() { return valueProvider.getValue().getCssValueType(); } - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#getPrimitiveType()}. - */ @Override - public short getPrimitiveType() { + public Type getPrimitiveType() { return valueProvider.getValue().getPrimitiveType(); } - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#setFloatValue(short,float)}. - */ @Override - public void setFloatValue(short unitType, float floatValue) throws DOMException { + public void setFloatValue(float floatValue) throws DOMException { if (handler == null) { throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); } else { - handler.floatValueChanged(unitType, floatValue); + handler.valueChanged(this); } } - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#getFloatValue(short)}. - */ @Override - public float getFloatValue(short unitType) throws DOMException { - return convertFloatValue(unitType, valueProvider.getValue()); + public float getFloatValue() throws DOMException { + return valueProvider.getValue().getFloatValue(); } /** @@ -176,39 +109,39 @@ public float getFloatValue(short unitType) throws DOMException { */ public static float convertFloatValue(short unitType, Value value) { switch (unitType) { - case CSSPrimitiveValue.CSS_NUMBER: - case CSSPrimitiveValue.CSS_PERCENTAGE: - case CSSPrimitiveValue.CSS_EMS: - case CSSPrimitiveValue.CSS_EXS: - case CSSPrimitiveValue.CSS_DIMENSION: - case CSSPrimitiveValue.CSS_PX: - if (value.getPrimitiveType() == unitType) { + case CSSUnit.CSS_NUMBER: + case CSSUnit.CSS_PERCENTAGE: + case CSSUnit.CSS_EM: + case CSSUnit.CSS_EX: + case CSSUnit.CSS_OTHER: + case CSSUnit.CSS_PX: + if (value.getCSSUnit() == unitType) { return value.getFloatValue(); } break; - case CSSPrimitiveValue.CSS_CM: + case CSSUnit.CSS_CM: return toCentimeters(value); - case CSSPrimitiveValue.CSS_MM: + case CSSUnit.CSS_MM: return toMillimeters(value); - case CSSPrimitiveValue.CSS_IN: + case CSSUnit.CSS_IN: return toInches(value); - case CSSPrimitiveValue.CSS_PT: + case CSSUnit.CSS_PT: return toPoints(value); - case CSSPrimitiveValue.CSS_PC: + case CSSUnit.CSS_PC: return toPicas(value); - case CSSPrimitiveValue.CSS_DEG: + case CSSUnit.CSS_DEG: return toDegrees(value); - case CSSPrimitiveValue.CSS_RAD: + case CSSUnit.CSS_RAD: return toRadians(value); - case CSSPrimitiveValue.CSS_GRAD: + case CSSUnit.CSS_GRAD: return toGradians(value); - case CSSPrimitiveValue.CSS_MS: + case CSSUnit.CSS_MS: return toMilliseconds(value); - case CSSPrimitiveValue.CSS_S: + case CSSUnit.CSS_S: return toSeconds(value); - case CSSPrimitiveValue.CSS_HZ: + case CSSUnit.CSS_HZ: return toHertz(value); - case CSSPrimitiveValue.CSS_KHZ: + case CSSUnit.CSS_KHZ: return tokHertz(value); } throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); @@ -218,16 +151,16 @@ public static float convertFloatValue(short unitType, Value value) { * Converts the current value into centimeters. */ protected static float toCentimeters(Value value) { - switch (value.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_CM: + switch (value.getCSSUnit()) { + case CSSUnit.CSS_CM: return value.getFloatValue(); - case CSSPrimitiveValue.CSS_MM: + case CSSUnit.CSS_MM: return (value.getFloatValue() / 10); - case CSSPrimitiveValue.CSS_IN: + case CSSUnit.CSS_IN: return (value.getFloatValue() * 2.54f); - case CSSPrimitiveValue.CSS_PT: + case CSSUnit.CSS_PT: return (value.getFloatValue() * 2.54f / 72); - case CSSPrimitiveValue.CSS_PC: + case CSSUnit.CSS_PC: return (value.getFloatValue() * 2.54f / 6); default: throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); @@ -238,16 +171,16 @@ protected static float toCentimeters(Value value) { * Converts the current value into inches. */ protected static float toInches(Value value) { - switch (value.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_CM: + switch (value.getCSSUnit()) { + case CSSUnit.CSS_CM: return (value.getFloatValue() / 2.54f); - case CSSPrimitiveValue.CSS_MM: + case CSSUnit.CSS_MM: return (value.getFloatValue() / 25.4f); - case CSSPrimitiveValue.CSS_IN: + case CSSUnit.CSS_IN: return value.getFloatValue(); - case CSSPrimitiveValue.CSS_PT: + case CSSUnit.CSS_PT: return (value.getFloatValue() / 72); - case CSSPrimitiveValue.CSS_PC: + case CSSUnit.CSS_PC: return (value.getFloatValue() / 6); default: throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); @@ -258,16 +191,16 @@ protected static float toInches(Value value) { * Converts the current value into millimeters. */ protected static float toMillimeters(Value value) { - switch (value.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_CM: + switch (value.getCSSUnit()) { + case CSSUnit.CSS_CM: return (value.getFloatValue() * 10); - case CSSPrimitiveValue.CSS_MM: + case CSSUnit.CSS_MM: return value.getFloatValue(); - case CSSPrimitiveValue.CSS_IN: + case CSSUnit.CSS_IN: return (value.getFloatValue() * 25.4f); - case CSSPrimitiveValue.CSS_PT: + case CSSUnit.CSS_PT: return (value.getFloatValue() * 25.4f / 72); - case CSSPrimitiveValue.CSS_PC: + case CSSUnit.CSS_PC: return (value.getFloatValue() * 25.4f / 6); default: throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); @@ -278,16 +211,16 @@ protected static float toMillimeters(Value value) { * Converts the current value into points. */ protected static float toPoints(Value value) { - switch (value.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_CM: + switch (value.getCSSUnit()) { + case CSSUnit.CSS_CM: return (value.getFloatValue() * 72 / 2.54f); - case CSSPrimitiveValue.CSS_MM: + case CSSUnit.CSS_MM: return (value.getFloatValue() * 72 / 25.4f); - case CSSPrimitiveValue.CSS_IN: + case CSSUnit.CSS_IN: return (value.getFloatValue() * 72); - case CSSPrimitiveValue.CSS_PT: + case CSSUnit.CSS_PT: return value.getFloatValue(); - case CSSPrimitiveValue.CSS_PC: + case CSSUnit.CSS_PC: return (value.getFloatValue() * 12); default: throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); @@ -298,16 +231,16 @@ protected static float toPoints(Value value) { * Converts the current value into picas. */ protected static float toPicas(Value value) { - switch (value.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_CM: + switch (value.getCSSUnit()) { + case CSSUnit.CSS_CM: return (value.getFloatValue() * 6 / 2.54f); - case CSSPrimitiveValue.CSS_MM: + case CSSUnit.CSS_MM: return (value.getFloatValue() * 6 / 25.4f); - case CSSPrimitiveValue.CSS_IN: + case CSSUnit.CSS_IN: return (value.getFloatValue() * 6); - case CSSPrimitiveValue.CSS_PT: + case CSSUnit.CSS_PT: return (value.getFloatValue() / 12); - case CSSPrimitiveValue.CSS_PC: + case CSSUnit.CSS_PC: return value.getFloatValue(); default: throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); @@ -318,12 +251,12 @@ protected static float toPicas(Value value) { * Converts the current value into degrees. */ protected static float toDegrees(Value value) { - switch (value.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_DEG: + switch (value.getCSSUnit()) { + case CSSUnit.CSS_DEG: return value.getFloatValue(); - case CSSPrimitiveValue.CSS_RAD: + case CSSUnit.CSS_RAD: return (float) Math.toDegrees(value.getFloatValue()); - case CSSPrimitiveValue.CSS_GRAD: + case CSSUnit.CSS_GRAD: return (value.getFloatValue() * 9 / 5); default: throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); @@ -334,12 +267,12 @@ protected static float toDegrees(Value value) { * Converts the current value into radians. */ protected static float toRadians(Value value) { - switch (value.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_DEG: + switch (value.getCSSUnit()) { + case CSSUnit.CSS_DEG: return (value.getFloatValue() * 5 / 9); // todo ?? - case CSSPrimitiveValue.CSS_RAD: + case CSSUnit.CSS_RAD: return value.getFloatValue(); - case CSSPrimitiveValue.CSS_GRAD: + case CSSUnit.CSS_GRAD: return (float) (value.getFloatValue() * 100 / Math.PI); default: throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); @@ -350,12 +283,12 @@ protected static float toRadians(Value value) { * Converts the current value into gradians. */ protected static float toGradians(Value value) { - switch (value.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_DEG: + switch (value.getCSSUnit()) { + case CSSUnit.CSS_DEG: return (float) (value.getFloatValue() * Math.PI / 180); // todo ???? - case CSSPrimitiveValue.CSS_RAD: + case CSSUnit.CSS_RAD: return (float) (value.getFloatValue() * Math.PI / 100); - case CSSPrimitiveValue.CSS_GRAD: + case CSSUnit.CSS_GRAD: return value.getFloatValue(); default: throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); @@ -366,10 +299,10 @@ protected static float toGradians(Value value) { * Converts the current value into milliseconds. */ protected static float toMilliseconds(Value value) { - switch (value.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_MS: + switch (value.getCSSUnit()) { + case CSSUnit.CSS_MS: return value.getFloatValue(); - case CSSPrimitiveValue.CSS_S: + case CSSUnit.CSS_S: return (value.getFloatValue() * 1000); default: throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); @@ -380,10 +313,10 @@ protected static float toMilliseconds(Value value) { * Converts the current value into seconds. */ protected static float toSeconds(Value value) { - switch (value.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_MS: + switch (value.getCSSUnit()) { + case CSSUnit.CSS_MS: return (value.getFloatValue() / 1000); - case CSSPrimitiveValue.CSS_S: + case CSSUnit.CSS_S: return value.getFloatValue(); default: throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); @@ -394,10 +327,10 @@ protected static float toSeconds(Value value) { * Converts the current value into Hertz. */ protected static float toHertz(Value value) { - switch (value.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_HZ: + switch (value.getCSSUnit()) { + case CSSUnit.CSS_HZ: return value.getFloatValue(); - case CSSPrimitiveValue.CSS_KHZ: + case CSSUnit.CSS_KHZ: return (value.getFloatValue() / 1000); default: throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); @@ -408,94 +341,72 @@ protected static float toHertz(Value value) { * Converts the current value into kHertz. */ protected static float tokHertz(Value value) { - switch (value.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_HZ: + switch (value.getCSSUnit()) { + case CSSUnit.CSS_HZ: return (value.getFloatValue() * 1000); - case CSSPrimitiveValue.CSS_KHZ: + case CSSUnit.CSS_KHZ: return value.getFloatValue(); default: throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); } } - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#setStringValue(short,String)}. - */ @Override - public void setStringValue(short stringType, String stringValue) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - handler.stringValueChanged(stringType, stringValue); - } + public String getIdentifierValue() throws DOMException { + return valueProvider.getValue().getIdentifierValue(); + } + + @Override + public short getCSSUnit() { + return valueProvider.getValue().getCSSUnit(); } - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#getStringValue()}. - */ @Override public String getStringValue() throws DOMException { return valueProvider.getValue().getStringValue(); } - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#getCounterValue()}. - */ @Override - public Counter getCounterValue() throws DOMException { - return this; + public ValueModificationHandler getModificationHandler() { + return handler; } - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#getRectValue()}. - */ @Override - public Rect getRectValue() throws DOMException { - return this; + public String getURIValue() throws DOMException { + return valueProvider.getValue().getIdentifierValue(); + } + + @Override + public CSSCounterValue getCounterValue() throws DOMException { + return valueProvider.getValue().getCounterValue(); + } + + @Override + public RectValue getRectValue() throws DOMException { + return valueProvider.getValue().getRectValue(); } - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#getRGBColorValue()}. - */ @Override - public RGBColor getRGBColorValue() throws DOMException { - return this; + public ColorValue getColorValue() throws DOMException { + return valueProvider.getValue().getColorValue(); } // CSSValueList /////////////////////////////////////////////////////// - /** - * DOM: Implements {@link org.w3c.dom.css.CSSValueList#getLength()}. - */ @Override public int getLength() { return valueProvider.getValue().getLength(); } - /** - * DOM: Implements {@link org.w3c.dom.css.CSSValueList#item(int)}. - */ @Override - public CSSValue item(int index) { + public Value item(int index) { int len = valueProvider.getValue().getLength(); if (index < 0 || index >= len) { return null; } - if (items == null) { - items = new CSSValue[valueProvider.getValue().getLength()]; - } else if (items.length < len) { - CSSValue[] nitems = new CSSValue[len]; - System.arraycopy(items, 0, nitems, 0, items.length); - items = nitems; - } - CSSValue result = items[index]; - if (result == null) { - items[index] = result = new ListComponent(index); + Value result = valueProvider.getValue().item(index); + if (result.getModificationHandler() == null) { + result.setModificationHandler(handler); } return result; } @@ -507,123 +418,11 @@ public CSSValue item(int index) { */ @Override public String getIdentifier() { - return valueProvider.getValue().getIdentifier(); - } - - /** - * DOM: Implements {@link org.w3c.dom.css.Counter#getListStyle()}. - */ - @Override - public String getListStyle() { - return valueProvider.getValue().getListStyle(); - } - - /** - * DOM: Implements {@link org.w3c.dom.css.Counter#getSeparator()}. - */ - @Override - public String getSeparator() { - return valueProvider.getValue().getSeparator(); - } - - // Rect /////////////////////////////////////////////////////////////// - - /** - * DOM: Implements {@link org.w3c.dom.css.Rect#getTop()}. - */ - @Override - public CSSPrimitiveValue getTop() { - valueProvider.getValue().getTop(); - if (topComponent == null) { - topComponent = new TopComponent(); - } - return topComponent; - } - - /** - * DOM: Implements {@link org.w3c.dom.css.Rect#getRight()}. - */ - @Override - public CSSPrimitiveValue getRight() { - valueProvider.getValue().getRight(); - if (rightComponent == null) { - rightComponent = new RightComponent(); - } - return rightComponent; - } - - /** - * DOM: Implements {@link org.w3c.dom.css.Rect#getBottom()}. - */ - @Override - public CSSPrimitiveValue getBottom() { - valueProvider.getValue().getBottom(); - if (bottomComponent == null) { - bottomComponent = new BottomComponent(); - } - return bottomComponent; - } - - /** - * DOM: Implements {@link org.w3c.dom.css.Rect#getLeft()}. - */ - @Override - public CSSPrimitiveValue getLeft() { - valueProvider.getValue().getLeft(); - if (leftComponent == null) { - leftComponent = new LeftComponent(); - } - return leftComponent; - } - - // RGBColor /////////////////////////////////////////////////// - - /** - * DOM: Implements {@link org.w3c.dom.css.RGBColor#getRed()}. - */ - @Override - public CSSPrimitiveValue getRed() { - valueProvider.getValue().getRed(); - if (redComponent == null) { - redComponent = new RedComponent(); - } - return redComponent; - } - - /** - * DOM: Implements {@link org.w3c.dom.css.RGBColor#getGreen()}. - */ - @Override - public CSSPrimitiveValue getGreen() { - valueProvider.getValue().getGreen(); - if (greenComponent == null) { - greenComponent = new GreenComponent(); - } - return greenComponent; - } - - /** - * DOM: Implements {@link org.w3c.dom.css.RGBColor#getBlue()}. - */ - @Override - public CSSPrimitiveValue getBlue() { - valueProvider.getValue().getBlue(); - if (blueComponent == null) { - blueComponent = new BlueComponent(); - } - return blueComponent; - } - - public CSSPrimitiveValue getAlpha() { - valueProvider.getValue().getAlpha(); - if (alphaComponent == null) { - alphaComponent = new AlphaComponent(); - } - return alphaComponent; + return valueProvider.getValue().getIdentifierValue(); } /** - * To provides the actual value. + * To provide the actual value. */ public interface ValueProvider { @@ -635,888 +434,62 @@ public interface ValueProvider { } /** - * To manage the modifications on a CSS value. - */ - public interface ModificationHandler { - - /** - * Called when the value text has changed. - */ - void textChanged(String text) throws DOMException; - - /** - * Called when the float value has changed. - */ - void floatValueChanged(short unit, float value) throws DOMException; - - /** - * Called when the string value has changed. - */ - void stringValueChanged(short type, String value) throws DOMException; - - /** - * Called when the left value text has changed. - */ - void leftTextChanged(String text) throws DOMException; - - /** - * Called when the left float value has changed. - */ - void leftFloatValueChanged(short unit, float value) throws DOMException; - - /** - * Called when the top value text has changed. - */ - void topTextChanged(String text) throws DOMException; - - /** - * Called when the top float value has changed. - */ - void topFloatValueChanged(short unit, float value) throws DOMException; - - /** - * Called when the right value text has changed. - */ - void rightTextChanged(String text) throws DOMException; - - /** - * Called when the right float value has changed. - */ - void rightFloatValueChanged(short unit, float value) throws DOMException; - - /** - * Called when the bottom value text has changed. - */ - void bottomTextChanged(String text) throws DOMException; - - /** - * Called when the bottom float value has changed. - */ - void bottomFloatValueChanged(short unit, float value) throws DOMException; - - /** - * Called when the red value text has changed. - */ - void redTextChanged(String text) throws DOMException; - - /** - * Called when the red float value has changed. - */ - void redFloatValueChanged(short unit, float value) throws DOMException; - - /** - * Called when the green value text has changed. - */ - void greenTextChanged(String text) throws DOMException; - - /** - * Called when the green float value has changed. - */ - void greenFloatValueChanged(short unit, float value) throws DOMException; - - /** - * Called when the blue value text has changed. - */ - void blueTextChanged(String text) throws DOMException; - - /** - * Called when the blue float value has changed. - */ - void blueFloatValueChanged(short unit, float value) throws DOMException; - - /** - * Called when the alpha value text has changed. - */ - void alphaTextChanged(String text) throws DOMException; - - /** - * Called when the alpha float value has changed. - */ - void alphaFloatValueChanged(short unit, float value) throws DOMException; - - /** - * Called when the list value text has changed. - */ - void listTextChanged(int idx, String text) throws DOMException; - - /** - * Called when the list float value has changed. - */ - void listFloatValueChanged(int idx, short unit, float value) throws DOMException; - - /** - * Called when the list string value has changed. - */ - void listStringValueChanged(int idx, short unit, String value) throws DOMException; - - } - - /** - * This class provides an abstract implementation of a ModificationHandler. + * To store a component. */ - public abstract static class AbstractModificationHandler implements ModificationHandler { + protected abstract class AbstractComponent implements Value { /** - * Returns the associated value. + * The returns the actual value of this component. */ protected abstract Value getValue(); - /** - * Called when the float value has changed. - */ - @Override - public void floatValueChanged(short unit, float value) throws DOMException { - textChanged(FloatValue.getCssText(unit, value)); - } - - /** - * Called when the string value has changed. - */ - @Override - public void stringValueChanged(short type, String value) throws DOMException { - textChanged(StringValue.getCssText(type, value)); - } - - /** - * Called when the left value text has changed. - */ - @Override - public void leftTextChanged(String text) throws DOMException { - final Value val = getValue(); - text = "rect(" + val.getTop().getCssText() + ", " + val.getRight().getCssText() + ", " - + val.getBottom().getCssText() + ", " + text + ')'; - textChanged(text); - } - - /** - * Called when the left float value has changed. - */ - @Override - public void leftFloatValueChanged(short unit, float value) throws DOMException { - final Value val = getValue(); - String text = "rect(" + val.getTop().getCssText() + ", " + val.getRight().getCssText() + ", " - + val.getBottom().getCssText() + ", " + FloatValue.getCssText(unit, value) + ')'; - textChanged(text); - } - - /** - * Called when the top value text has changed. - */ - @Override - public void topTextChanged(String text) throws DOMException { - final Value val = getValue(); - text = "rect(" + text + ", " + val.getRight().getCssText() + ", " + val.getBottom().getCssText() + ", " - + val.getLeft().getCssText() + ')'; - textChanged(text); - } - - /** - * Called when the top float value has changed. - */ - @Override - public void topFloatValueChanged(short unit, float value) throws DOMException { - final Value val = getValue(); - String text = "rect(" + FloatValue.getCssText(unit, value) + ", " + val.getRight().getCssText() + ", " - + val.getBottom().getCssText() + ", " + val.getLeft().getCssText() + ')'; - textChanged(text); - } - - /** - * Called when the right value text has changed. - */ - @Override - public void rightTextChanged(String text) throws DOMException { - final Value val = getValue(); - text = "rect(" + val.getTop().getCssText() + ", " + text + ", " + val.getBottom().getCssText() + ", " - + val.getLeft().getCssText() + ')'; - textChanged(text); - } - - /** - * Called when the right float value has changed. - */ @Override - public void rightFloatValueChanged(short unit, float value) throws DOMException { - final Value val = getValue(); - String text = "rect(" + val.getTop().getCssText() + ", " + FloatValue.getCssText(unit, value) + ", " - + val.getBottom().getCssText() + ", " + val.getLeft().getCssText() + ')'; - textChanged(text); + public String getCssText() { + return valueProvider.getValue().getCssText(); } - /** - * Called when the bottom value text has changed. - */ @Override - public void bottomTextChanged(String text) throws DOMException { - final Value val = getValue(); - text = "rect(" + val.getTop().getCssText() + ", " + val.getRight().getCssText() + ", " + text + ", " - + val.getLeft().getCssText() + ')'; - textChanged(text); + public CssType getCssValueType() { + return valueProvider.getValue().getCssValueType(); } - /** - * Called when the bottom float value has changed. - */ @Override - public void bottomFloatValueChanged(short unit, float value) throws DOMException { - final Value val = getValue(); - String text = "rect(" + val.getTop().getCssText() + ", " + val.getRight().getCssText() + ", " - + FloatValue.getCssText(unit, value) + ", " + val.getLeft().getCssText() + ')'; - textChanged(text); + public Type getPrimitiveType() { + return valueProvider.getValue().getPrimitiveType(); } - /** - * Called when the red value text has changed. - */ @Override - public void redTextChanged(String text) throws DOMException { - final Value val = getValue(); - text = RGBColorValue.toString(text, val.getGreen().getCssText(), val.getBlue().getCssText(), - val.getAlpha().getCssText()); - textChanged(text); + public float getFloatValue() throws DOMException { + return valueProvider.getValue().getFloatValue(); } - /** - * Called when the red float value has changed. - */ @Override - public void redFloatValueChanged(short unit, float value) throws DOMException { - redTextChanged(FloatValue.getCssText(unit, value)); + public String getStringValue() throws DOMException { + return valueProvider.getValue().getStringValue(); } - /** - * Called when the green value text has changed. - */ @Override - public void greenTextChanged(String text) throws DOMException { - final Value val = getValue(); - text = RGBColorValue.toString(val.getRed().getCssText(), text, val.getBlue().getCssText(), - val.getAlpha().getCssText()); - textChanged(text); + public CSSCounterValue getCounterValue() throws DOMException { + throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); } - /** - * Called when the green float value has changed. - */ @Override - public void greenFloatValueChanged(short unit, float value) throws DOMException { - greenTextChanged(FloatValue.getCssText(unit, value)); + public RectValue getRectValue() throws DOMException { + throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); } - /** - * Called when the blue value text has changed. - */ @Override - public void blueTextChanged(String text) throws DOMException { - final Value val = getValue(); - text = RGBColorValue.toString(val.getRed().getCssText(), val.getGreen().getCssText(), text, - val.getAlpha().getCssText()); - textChanged(text); + public ColorValue getColorValue() throws DOMException { + throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); } - /** - * Called when the blue float value has changed. - */ - @Override - public void blueFloatValueChanged(short unit, float value) throws DOMException { - blueTextChanged(FloatValue.getCssText(unit, value)); - } + // CSSStyleValueList /////////////////////////////////////////////////// @Override - public void alphaTextChanged(String text) throws DOMException { - final Value val = getValue(); - text = RGBColorValue.toString(val.getRed().getCssText(), val.getGreen().getCssText(), - val.getBlue().getCssText(), text); - textChanged(text); - } - - @Override - public void alphaFloatValueChanged(short unit, float value) throws DOMException { - alphaTextChanged(FloatValue.getCssText(unit, value)); - } - - /** - * Called when the list value text has changed. - */ - @Override - public void listTextChanged(int idx, String text) throws DOMException { - ListValue lv = (ListValue) getValue(); - int len = lv.getLength(); - StringBuilder sb = new StringBuilder(len * 8); - for (int i = 0; i < idx; i++) { - sb.append(lv.item(i).getCssText()); - sb.append(lv.getSeparatorChar()); - } - sb.append(text); - for (int i = idx + 1; i < len; i++) { - sb.append(lv.getSeparatorChar()); - sb.append(lv.item(i).getCssText()); - } - text = sb.toString(); - textChanged(text); - } - - /** - * Called when the list float value has changed. - */ - @Override - public void listFloatValueChanged(int idx, short unit, float value) throws DOMException { - ListValue lv = (ListValue) getValue(); - int len = lv.getLength(); - StringBuilder sb = new StringBuilder(len * 8); - for (int i = 0; i < idx; i++) { - sb.append(lv.item(i).getCssText()); - sb.append(lv.getSeparatorChar()); - } - sb.append(FloatValue.getCssText(unit, value)); - for (int i = idx + 1; i < len; i++) { - sb.append(lv.getSeparatorChar()); - sb.append(lv.item(i).getCssText()); - } - textChanged(sb.toString()); - } - - /** - * Called when the list string value has changed. - */ - @Override - public void listStringValueChanged(int idx, short unit, String value) throws DOMException { - ListValue lv = (ListValue) getValue(); - int len = lv.getLength(); - StringBuilder sb = new StringBuilder(len * 8); - for (int i = 0; i < idx; i++) { - sb.append(lv.item(i).getCssText()); - sb.append(lv.getSeparatorChar()); - } - sb.append(StringValue.getCssText(unit, value)); - for (int i = idx + 1; i < len; i++) { - sb.append(lv.getSeparatorChar()); - sb.append(lv.item(i).getCssText()); - } - textChanged(sb.toString()); - } - - } - - /** - * To store a component. - */ - protected abstract class AbstractComponent implements CSSPrimitiveValue { - - /** - * The returns the actual value of this component. - */ - protected abstract Value getValue(); - - /** - * DOM: Implements {@link org.w3c.dom.css.CSSValue#getCssText()}. - */ - @Override - public String getCssText() { - return getValue().getCssText(); - } - - /** - * DOM: Implements {@link org.w3c.dom.css.CSSValue#getCssValueType()}. - */ - @Override - public short getCssValueType() { - return getValue().getCssValueType(); - } - - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#getPrimitiveType()}. - */ - @Override - public short getPrimitiveType() { - return getValue().getPrimitiveType(); - } - - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#getFloatValue(short)}. - */ - @Override - public float getFloatValue(short unitType) throws DOMException { - return convertFloatValue(unitType, getValue()); - } - - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#getStringValue()}. - */ - @Override - public String getStringValue() throws DOMException { - return valueProvider.getValue().getStringValue(); - } - - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#getCounterValue()}. - */ - @Override - public Counter getCounterValue() throws DOMException { - throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); - } - - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#getRectValue()}. - */ - @Override - public Rect getRectValue() throws DOMException { - throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); - } - - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#getRGBColorValue()}. - */ - @Override - public RGBColor getRGBColorValue() throws DOMException { - throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); - } - - // CSSValueList /////////////////////////////////////////////////////// - - /** - * DOM: Implements {@link org.w3c.dom.css.CSSValueList#getLength()}. - */ public int getLength() { throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); } - /** - * DOM: Implements {@link org.w3c.dom.css.CSSValueList#item(int)}. - */ - public CSSValue item(int index) { - throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); - } - - } - - /** - * To store a Float component. - */ - protected abstract class FloatComponent extends AbstractComponent { - - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#setStringValue(short,String)}. - */ - @Override - public void setStringValue(short stringType, String stringValue) throws DOMException { - throw new DOMException(DOMException.INVALID_ACCESS_ERR, ""); - } - - } - - /** - * To represents a left component. - */ - protected class LeftComponent extends FloatComponent { - - /** - * The returns the actual value of this component. - */ - @Override - protected Value getValue() { - return valueProvider.getValue().getLeft(); - } - - /** - * DOM: Implements {@link org.w3c.dom.css.CSSValue#setCssText(String)}. - */ - @Override - public void setCssText(String cssText) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - getValue(); - handler.leftTextChanged(cssText); - } - } - - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#setFloatValue(short,float)}. - */ - @Override - public void setFloatValue(short unitType, float floatValue) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - getValue(); - handler.leftFloatValueChanged(unitType, floatValue); - } - } - - } - - /** - * To represents a top component. - */ - protected class TopComponent extends FloatComponent { - - /** - * The returns the actual value of this component. - */ - @Override - protected Value getValue() { - return valueProvider.getValue().getTop(); - } - - /** - * DOM: Implements {@link org.w3c.dom.css.CSSValue#setCssText(String)}. - */ - @Override - public void setCssText(String cssText) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - getValue(); - handler.topTextChanged(cssText); - } - } - - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#setFloatValue(short,float)}. - */ - @Override - public void setFloatValue(short unitType, float floatValue) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - getValue(); - handler.topFloatValueChanged(unitType, floatValue); - } - } - - } - - /** - * To represents a right component. - */ - protected class RightComponent extends FloatComponent { - - /** - * The returns the actual value of this component. - */ - @Override - protected Value getValue() { - return valueProvider.getValue().getRight(); - } - - /** - * DOM: Implements {@link org.w3c.dom.css.CSSValue#setCssText(String)}. - */ - @Override - public void setCssText(String cssText) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - getValue(); - handler.rightTextChanged(cssText); - } - } - - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#setFloatValue(short,float)}. - */ - @Override - public void setFloatValue(short unitType, float floatValue) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - getValue(); - handler.rightFloatValueChanged(unitType, floatValue); - } - } - - } - - /** - * To represents a bottom component. - */ - protected class BottomComponent extends FloatComponent { - - /** - * The returns the actual value of this component. - */ - @Override - protected Value getValue() { - return valueProvider.getValue().getBottom(); - } - - /** - * DOM: Implements {@link org.w3c.dom.css.CSSValue#setCssText(String)}. - */ - @Override - public void setCssText(String cssText) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - getValue(); - handler.bottomTextChanged(cssText); - } - } - - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#setFloatValue(short,float)}. - */ - @Override - public void setFloatValue(short unitType, float floatValue) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - getValue(); - handler.bottomFloatValueChanged(unitType, floatValue); - } - } - - } - - /** - * To represents a red component. - */ - protected class RedComponent extends FloatComponent { - - /** - * The returns the actual value of this component. - */ - @Override - protected Value getValue() { - return valueProvider.getValue().getRed(); - } - - /** - * DOM: Implements {@link org.w3c.dom.css.CSSValue#setCssText(String)}. - */ - @Override - public void setCssText(String cssText) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - getValue(); - handler.redTextChanged(cssText); - } - } - - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#setFloatValue(short,float)}. - */ - @Override - public void setFloatValue(short unitType, float floatValue) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - getValue(); - handler.redFloatValueChanged(unitType, floatValue); - } - } - - } - - /** - * To represents a green component. - */ - protected class GreenComponent extends FloatComponent { - - /** - * The returns the actual value of this component. - */ - @Override - protected Value getValue() { - return valueProvider.getValue().getGreen(); - } - - /** - * DOM: Implements {@link org.w3c.dom.css.CSSValue#setCssText(String)}. - */ - @Override - public void setCssText(String cssText) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - getValue(); - handler.greenTextChanged(cssText); - } - } - - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#setFloatValue(short,float)}. - */ - @Override - public void setFloatValue(short unitType, float floatValue) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - getValue(); - handler.greenFloatValueChanged(unitType, floatValue); - } - } - - } - - /** - * To represents a blue component. - */ - protected class BlueComponent extends FloatComponent { - - /** - * The returns the actual value of this component. - */ - @Override - protected Value getValue() { - return valueProvider.getValue().getBlue(); - } - - /** - * DOM: Implements {@link org.w3c.dom.css.CSSValue#setCssText(String)}. - */ - @Override - public void setCssText(String cssText) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - getValue(); - handler.blueTextChanged(cssText); - } - } - - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#setFloatValue(short,float)}. - */ - @Override - public void setFloatValue(short unitType, float floatValue) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - getValue(); - handler.blueFloatValueChanged(unitType, floatValue); - } - } - - } - - /** - * To represents an alpha component. - */ - protected class AlphaComponent extends FloatComponent { - - /** - * The returns the actual value of this component. - */ - @Override - protected Value getValue() { - return valueProvider.getValue().getAlpha(); - } - - /** - * DOM: Implements {@link org.w3c.dom.css.CSSValue#setCssText(String)}. - */ - @Override - public void setCssText(String cssText) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - getValue(); - handler.alphaTextChanged(cssText); - } - } - - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#setFloatValue(short,float)}. - */ - @Override - public void setFloatValue(short unitType, float floatValue) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - getValue(); - handler.alphaFloatValueChanged(unitType, floatValue); - } - } - - } - - /** - * To represents a List component. - */ - protected class ListComponent extends AbstractComponent { - - /** - * The index of this component. - */ - protected int index; - - /** - * Creates a new ListComponent. - */ - public ListComponent(int idx) { - index = idx; - } - - /** - * The returns the actual value of this component. - */ - @Override - protected Value getValue() { - if (index >= valueProvider.getValue().getLength()) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } - return valueProvider.getValue().item(index); - } - - /** - * DOM: Implements {@link org.w3c.dom.css.CSSValue#setCssText(String)}. - */ - @Override - public void setCssText(String cssText) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - getValue(); - handler.listTextChanged(index, cssText); - } - } - - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#setFloatValue(short,float)}. - */ - @Override - public void setFloatValue(short unitType, float floatValue) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - getValue(); - handler.listFloatValueChanged(index, unitType, floatValue); - } - } - - /** - * DOM: Implements - * {@link org.w3c.dom.css.CSSPrimitiveValue#setStringValue(short,String)}. - */ - @Override - public void setStringValue(short stringType, String stringValue) throws DOMException { - if (handler == null) { - throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, ""); - } else { - getValue(); - handler.listStringValueChanged(index, stringType, stringValue); - } - } - } } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMViewCSS.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMViewCSS.java index a7a397134..aa8a050ab 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMViewCSS.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSOMViewCSS.java @@ -19,9 +19,9 @@ package io.sf.carte.echosvg.css.dom; +import org.w3c.css.om.CSSStyleDeclaration; import org.w3c.dom.Element; -import org.w3c.dom.css.CSSStyleDeclaration; -import org.w3c.dom.css.ViewCSS; +import org.w3c.dom.view.ViewCSS; import org.w3c.dom.views.DocumentView; import io.sf.carte.echosvg.css.engine.CSSEngine; diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSValue.java new file mode 100644 index 000000000..fd021a246 --- /dev/null +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/dom/CSSValue.java @@ -0,0 +1,358 @@ +/* + + 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.dom; + +import org.w3c.css.om.typed.CSSKeywordValue; +import org.w3c.css.om.typed.CSSStringValue; +import org.w3c.css.om.typed.CSSStyleValue; +import org.w3c.dom.DOMException; + +import org.w3c.css.om.unit.CSSUnit; +import io.sf.carte.doc.style.css.property.KeywordValue; +import io.sf.carte.echosvg.css.engine.value.ListValue; +import io.sf.carte.echosvg.css.engine.value.NumericValue; +import io.sf.carte.echosvg.css.engine.value.StringValue; + +/** + * A gateway value, useful in the transition to Typed OM. + * + * @author See Git history. + * @version $Id$ + */ +public interface CSSValue extends CSSStyleValue { + + /** + * The main categories of values. + */ + enum CssType { + + /** + * A CSS-wide keyword like {@code inherit}. + */ + KEYWORD, + + /** + *

+ * 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/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 c3fbb843e..e423b7561 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 @@ -20,6 +20,7 @@ import org.w3c.dom.Element; +import io.sf.carte.echosvg.css.Viewport; import io.sf.carte.echosvg.css.engine.value.Value; import io.sf.carte.echosvg.util.ParsedURL; @@ -27,8 +28,10 @@ * This interface allows the user of a CSSEngine to provide contextual * informations. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public interface CSSContext { @@ -84,6 +87,13 @@ default float getPixelToMillimeter() { */ float getBlockHeight(Element elt); + /** + * Returns the viewport of the specified element. + * + * @param e the element interested in its viewport + */ + Viewport getViewport(Element e); + /** * This method should throw a SecurityException if the resource found at url and * referenced from docURL should not be loaded. diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/SystemColorSupport.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/SystemColorSupport.java index 1e2651143..bce6adf6e 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/SystemColorSupport.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/SystemColorSupport.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.Map; -import org.w3c.dom.css.CSSPrimitiveValue; +import org.w3c.css.om.unit.CSSUnit; import io.sf.carte.echosvg.css.engine.value.FloatValue; import io.sf.carte.echosvg.css.engine.value.RGBColorValue; @@ -33,8 +33,10 @@ /** * This class provides support for AWT system colors. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public class SystemColorSupport implements CSSConstants { @@ -45,9 +47,9 @@ public class SystemColorSupport implements CSSConstants { public static Value getSystemColor(String ident) { ident = ident.toLowerCase(); // todo locale?? SystemColor sc = factories.get(ident); - return new RGBColorValue(new FloatValue(CSSPrimitiveValue.CSS_NUMBER, sc.getRed()), - new FloatValue(CSSPrimitiveValue.CSS_NUMBER, sc.getGreen()), - new FloatValue(CSSPrimitiveValue.CSS_NUMBER, sc.getBlue())); + return new RGBColorValue(new FloatValue(CSSUnit.CSS_NUMBER, sc.getRed()), + new FloatValue(CSSUnit.CSS_NUMBER, sc.getGreen()), + new FloatValue(CSSUnit.CSS_NUMBER, sc.getBlue())); } /** 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 3d4d755d7..cd5423e61 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 @@ -21,8 +21,8 @@ import java.io.IOException; import java.io.StringReader; +import org.w3c.css.om.unit.CSSUnit; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; import io.sf.carte.doc.style.css.CSSTypedValue; import io.sf.carte.doc.style.css.CSSValue.CssType; @@ -32,17 +32,21 @@ import io.sf.carte.doc.style.css.parser.CSSParser; 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; +import io.sf.carte.echosvg.css.engine.value.svg.SVGValueConstants; import io.sf.carte.echosvg.util.CSSConstants; /** * This class provides a manager for the property with support for CSS color * values. * - * @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 AbstractColorManager extends IdentifierManager { @@ -130,13 +134,17 @@ public abstract class AbstractColorManager extends IdentifierManager { @Override public Value createValue(LexicalUnit lunit, CSSEngine engine) throws DOMException { switch (lunit.getLexicalUnitType()) { + case COLOR_FUNCTION: + Value colorFunction = createColorFunction(lunit); + if (colorFunction != null) { + return colorFunction; + } case HSLCOLOR: case HWBCOLOR: case LABCOLOR: case LCHCOLOR: case OKLABCOLOR: case OKLCHCOLOR: - case COLOR_FUNCTION: case COLOR_MIX: ValueFactory vf = new ValueFactory(); String rgbSerialization; @@ -157,34 +165,7 @@ public Value createValue(LexicalUnit lunit, CSSEngine engine) throws DOMExceptio throw createInvalidLexicalUnitDOMException(lunit.getLexicalUnitType()); } case RGBCOLOR: - LexicalUnit lu = lunit.getParameters(); - Value red = createColorComponent(lu); - lu = lu.getNextLexicalUnit(); - if (lu.getLexicalUnitType() == LexicalUnit.LexicalType.OPERATOR_COMMA) { - lu = lu.getNextLexicalUnit(); - } - Value green = createColorComponent(lu); - lu = lu.getNextLexicalUnit(); - if (lu.getLexicalUnitType() == LexicalUnit.LexicalType.OPERATOR_COMMA) { - lu = lu.getNextLexicalUnit(); - } - Value blue = createColorComponent(lu); - // Alpha channel - lu = lu.getNextLexicalUnit(); - Value alpha; - if (lu != null) { - if (lu.getLexicalUnitType() == LexicalUnit.LexicalType.OPERATOR_COMMA - || lu.getLexicalUnitType() == LexicalUnit.LexicalType.OPERATOR_SLASH) { - lu = lu.getNextLexicalUnit(); - if (lu == null) { - throw new DOMException(DOMException.SYNTAX_ERR, "Invalid color: " + lunit.getCssText()); - } - } - alpha = createColorComponent(lu); - } else { - alpha = null; - } - return createRGBColor(red, green, blue, alpha); + return createRGBColor(lunit); default: return super.createValue(lunit, engine); } @@ -197,8 +178,8 @@ public Value createValue(LexicalUnit lunit, CSSEngine engine) throws DOMExceptio @Override public Value computeValue(CSSStylableElement elt, String pseudo, CSSEngine engine, int idx, StyleMap sm, Value value) { - if (value.getPrimitiveType() == CSSPrimitiveValue.CSS_IDENT) { - String ident = value.getStringValue(); + if (value.getPrimitiveType() == Type.IDENT) { + String ident = ((AbstractStringValue) value).getValue(); // Search for a direct computed value. Value v = (Value) computedValues.get(ident); if (v != null) { @@ -213,26 +194,138 @@ public Value computeValue(CSSStylableElement elt, String pseudo, CSSEngine engin return super.computeValue(elt, pseudo, engine, idx, sm, value); } + private Value createRGBColor(LexicalUnit lunit) { + LexicalUnit lu = lunit.getParameters(); + + boolean pcntSpecified = lu.getLexicalUnitType() == LexicalType.PERCENTAGE; + NumericValue red = createRGBColorComponent(lu); + lu = lu.getNextLexicalUnit(); + if (lu.getLexicalUnitType() == LexicalUnit.LexicalType.OPERATOR_COMMA) { + lu = lu.getNextLexicalUnit(); + } + + pcntSpecified = pcntSpecified || lu.getLexicalUnitType() == LexicalType.PERCENTAGE; + NumericValue green = createRGBColorComponent(lu); + lu = lu.getNextLexicalUnit(); + if (lu.getLexicalUnitType() == LexicalUnit.LexicalType.OPERATOR_COMMA) { + lu = lu.getNextLexicalUnit(); + } + + pcntSpecified = pcntSpecified || lu.getLexicalUnitType() == LexicalType.PERCENTAGE; + NumericValue blue = createRGBColorComponent(lu); + + // Alpha channel + lu = lu.getNextLexicalUnit(); + NumericValue alpha; + boolean alphaPcntSpecified = false; + if (lu != null) { + if (lu.getLexicalUnitType() == LexicalUnit.LexicalType.OPERATOR_COMMA + || lu.getLexicalUnitType() == LexicalUnit.LexicalType.OPERATOR_SLASH) { + lu = lu.getNextLexicalUnit(); + if (lu == null) { + throw new DOMException(DOMException.SYNTAX_ERR, "Invalid color: " + lunit.getCssText()); + } + } + alphaPcntSpecified = lu.getLexicalUnitType() == LexicalType.PERCENTAGE; + alpha = createColorComponent(lu); + } else { + alpha = null; + } + return createRGBColor(red, green, blue, pcntSpecified, alpha, alphaPcntSpecified); + } + /** * Creates an RGB(A) color. */ - protected Value createRGBColor(Value r, Value g, Value b, Value a) { - return a == null ? new RGBColorValue(r, g, b) : new RGBColorValue(r, g, b, a); + protected Value createRGBColor(NumericValue r, NumericValue g, NumericValue b, boolean pcntSpecified, + NumericValue a, boolean alphaPcntSpecified) { + RGBColorValue c = a == null ? new RGBColorValue(r, g, b) : new RGBColorValue(r, g, b, a); + c.setSpecifiedAsPercentage(pcntSpecified); + c.setAlphaSpecifiedAsPercentage(alphaPcntSpecified); + return c; + } + + private ColorFunction createColorFunction(LexicalUnit lunit) { + LexicalUnit lu = lunit.getParameters(); + AbstractValueList components = new AbstractValueList<>(' ', 4); + + // Color space + if (lu.getLexicalUnitType() != LexicalUnit.LexicalType.IDENT) { + throw new DOMException(DOMException.TYPE_MISMATCH_ERR, + "Color space must be identifier: " + lunit.toString()); + } + + String colorSpace = lu.getStringValue(); + lu = lu.getNextLexicalUnit(); + if (lu == null) { + throw new DOMException(DOMException.SYNTAX_ERR, "Wrong value: " + lunit.toString()); + } + + // Components + NumericValue alpha = null; + NumericValue primi; + while (true) { + primi = createColorComponent(lu); + components.add(primi); + lu = lu.getNextLexicalUnit(); + + if (lu == null) { + break; + } + if (lu.getLexicalUnitType() == LexicalUnit.LexicalType.OPERATOR_SLASH) { + lu = lu.getNextLexicalUnit(); // Alpha + alpha = createColorComponent(lu); + lu = lu.getNextLexicalUnit(); + if (lu != null) { + throw new DOMException(DOMException.SYNTAX_ERR, + "Wrong value: " + lunit.toString()); + } + break; + } + } + + ColorFunction color = new ColorFunction(colorSpace, components); + + if (alpha == null) { + alpha = SVGValueConstants.NUMBER_1; + } + color.setAlpha(alpha); + + return color; + } + + /** + * Creates an RGB color component from a lexical unit. + */ + protected NumericValue createRGBColorComponent(LexicalUnit lu) throws DOMException { + switch (lu.getLexicalUnitType()) { + case INTEGER: + return new FloatValue(CSSUnit.CSS_PERCENTAGE, lu.getIntegerValue() / 2.55f); + + case REAL: + return new FloatValue(CSSUnit.CSS_PERCENTAGE, lu.getFloatValue() / 2.55f); + + case PERCENTAGE: + return new FloatValue(CSSUnit.CSS_PERCENTAGE, lu.getFloatValue()); + + default: + } + throw createInvalidRGBComponentUnitDOMException(lu.getLexicalUnitType()); } /** * Creates a color component from a lexical unit. */ - protected Value createColorComponent(LexicalUnit lu) throws DOMException { + protected NumericValue createColorComponent(LexicalUnit lu) throws DOMException { switch (lu.getLexicalUnitType()) { case INTEGER: - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, lu.getIntegerValue()); + return new FloatValue(CSSUnit.CSS_NUMBER, lu.getIntegerValue()); case REAL: - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, lu.getFloatValue()); + return new FloatValue(CSSUnit.CSS_NUMBER, lu.getFloatValue()); case PERCENTAGE: - return new FloatValue(CSSPrimitiveValue.CSS_PERCENTAGE, lu.getFloatValue()); + return new FloatValue(CSSUnit.CSS_PERCENTAGE, lu.getFloatValue()); default: } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractCounterValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractCounterValue.java new file mode 100644 index 000000000..3d8b10286 --- /dev/null +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractCounterValue.java @@ -0,0 +1,141 @@ +/* + + 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.util.Objects; + +import org.w3c.css.om.typed.CSSCounterValue; +import org.w3c.dom.DOMException; + +/** + * Abstract class for counter() and counters() functions. + * + */ +abstract class AbstractCounterValue extends ComponentValue implements CSSCounterValue { + + private String identifier; + private Value listStyle = null; + + protected AbstractCounterValue() { + super(); + } + + AbstractCounterValue(String identifier, Value listStyle) { + super(); + this.identifier = identifier; + this.listStyle = listStyle; + } + + @Override + public String getName() { + return identifier; + } + + public void setName(String identifier) { + this.identifier = identifier; + if (handler != null) { + handler.valueChanged(this); + } + } + + @Override + public Value getCounterStyle() { + return listStyle; + } + + void setCounterStyle(AbstractValue listStyle) { + componentize(listStyle); + this.listStyle = listStyle; + if (handler != null) { + handler.valueChanged(this); + } + } + + @Override + public String getSeparator() { + return ""; + } + + @Override + public Value item(int index) { + if (index == 0) { + return getCounterStyle(); + } + return null; + } + + void set(int index, Value component) throws DOMException { + if (index == 0) { + setCounterStyle((AbstractValue) component); + } + } + + @Override + public int getLength() { + return 1; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = super.hashCode(); + result = prime * result + ((identifier == null) ? 0 : identifier.hashCode()); + result = prime * result + ((listStyle == null) ? decimalHashCode() : listStyle.hashCode()); + return result; + } + + private int decimalHashCode() { + int result = 31 * CssType.TYPED.hashCode() + Type.IDENT.hashCode(); + result = 31 * result + "decimal".hashCode(); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + + AbstractCounterValue other = (AbstractCounterValue) obj; + if (identifier == null) { + if (other.identifier != null) { + return false; + } + } else if (!identifier.equals(other.identifier)) { + return false; + } + + return Objects.equals(listStyle, other.listStyle); + } + + static void quoteSeparator(String separator, StringBuilder buf) { + if (!separator.contains("'")) { + buf.append('\'').append(separator).append('\''); + } else { + buf.append('"').append(separator).append('"'); + } + } + +} diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractStringValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractStringValue.java new file mode 100644 index 000000000..6dcdf2bb9 --- /dev/null +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractStringValue.java @@ -0,0 +1,86 @@ +/* + + 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.util.Objects; + +import org.w3c.api.DOMTypeException; + +/** + * Abstract class for string values. + * + * @version $Id$ + */ +public abstract class AbstractStringValue extends AbstractValue { + + /** + * The value of the string + */ + String value; + + /** + * Creates a new StringValue. + */ + public AbstractStringValue(String s) { + value = s; + } + + @Override + public int hashCode() { + return Objects.hash(getPrimitiveType(), value); + } + + /** + * Indicates whether some other object is "equal to" this one. + * + * @param obj the reference object with which to compare. + */ + @Override + public boolean equals(Object obj) { + if (obj == null || !(obj instanceof AbstractStringValue) + || getPrimitiveType() != ((AbstractStringValue) obj).getPrimitiveType()) { + return false; + } + AbstractStringValue v = (AbstractStringValue) obj; + return value.equals(v.value); + } + + /** + * This method is used to get the string value. + * + */ + public String getValue() { + return value; + } + + public void setValue(String value) throws DOMTypeException { + if (value == null || value.isEmpty()) { + throw new DOMTypeException("Value is null or empty."); + } + this.value = value; + + if (handler != null) { + handler.valueChanged(this); + } + } + + @Override + public abstract AbstractStringValue clone(); + +} 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 2323ae514..b5d4121ea 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 @@ -18,161 +18,138 @@ */ 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; -import org.w3c.dom.css.CSSValue; /** * This class provides an abstract implementation of the Value interface. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + *

* @version $Id$ */ -public abstract class AbstractValue implements Value { +public abstract class AbstractValue implements Value, Cloneable { - /** - * Implements {@link Value#getCssValueType()}. - */ - @Override - public short getCssValueType() { - return CSSValue.CSS_PRIMITIVE_VALUE; - } + ValueModificationHandler handler; - /** - * Implements {@link Value#getPrimitiveType()}. - */ @Override - public short getPrimitiveType() { - throw createDOMException(); + public CssType getCssValueType() { + return Value.CssType.TYPED; } - /** - * Implements {@link Value#getFloatValue()}. - */ @Override - public float getFloatValue() throws DOMException { + public Type getPrimitiveType() { throw createDOMException(); } - /** - * Implements {@link Value#getStringValue()}. - */ @Override - public String getStringValue() throws DOMException { - throw createDOMException(); + public short getCSSUnit() { + return CSSUnit.CSS_INVALID; } - /** - * Implements {@link Value#getRed()}. - */ @Override - public Value getRed() throws DOMException { + public void setCssText(String cssText) throws DOMException { throw createDOMException(); } - /** - * Implements {@link Value#getGreen()}. - */ @Override - public Value getGreen() throws DOMException { - throw createDOMException(); + public String toString() { + return getCssText(); } /** - * Implements {@link Value#getBlue()}. + * Implements {@link Value#getFloatValue()}. */ @Override - public Value getBlue() throws DOMException { + public float getFloatValue() throws DOMException { throw createDOMException(); } - /** - * Implements {@link Value#getAlpha()}. - */ @Override - public Value getAlpha() throws DOMException { + public void setFloatValue(float value) throws DOMException { throw createDOMException(); } - /** - * Implements {@link Value#getLength()}. - */ @Override - public int getLength() throws DOMException { + public String getStringValue() throws DOMException { throw createDOMException(); } - /** - * Implements {@link Value#item(int)}. - */ @Override - public Value item(int index) throws DOMException { - throw createDOMException(); + public int getLength() throws DOMException { + return 0; } - /** - * Implements {@link Value#getTop()}. - */ @Override - public Value getTop() throws DOMException { + public String getIdentifierValue() throws DOMException { throw createDOMException(); } - /** - * Implements {@link Value#getRight()}. - */ @Override - public Value getRight() throws DOMException { + public String getURIValue() throws DOMException { throw createDOMException(); } - /** - * Implements {@link Value#getBottom()}. - */ @Override - public Value getBottom() throws DOMException { + public CSSCounterValue getCounterValue() throws DOMException { throw createDOMException(); } - /** - * Implements {@link Value#getLeft()}. - */ @Override - public Value getLeft() throws DOMException { + public RectValue getRectValue() throws DOMException { throw createDOMException(); } - /** - * Implements {@link Value#getIdentifier()}. - */ @Override - public String getIdentifier() throws DOMException { + public ColorValue getColorValue() throws DOMException { throw createDOMException(); } - /** - * Implements {@link Value#getListStyle()}. - */ @Override - public String getListStyle() throws DOMException { - throw createDOMException(); + public void setModificationHandler(ValueModificationHandler handler) { + this.handler = handler; } - /** - * Implements {@link Value#getSeparator()}. - */ @Override - public String getSeparator() throws DOMException { - throw createDOMException(); + public ValueModificationHandler getModificationHandler() { + return handler; } /** * Creates an INVALID_ACCESS_ERR exception. */ protected DOMException createDOMException() { - Object[] p = { (int) getCssValueType() }; + Object[] p = { getPrimitiveType() }; String s = Messages.formatMessage("invalid.value.access", p); return new DOMException(DOMException.INVALID_ACCESS_ERR, s); } + @Override + public int hashCode() { + return getPrimitiveType().hashCode(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof Value)) + return false; + Value other = (Value) obj; + return getPrimitiveType() == other.getPrimitiveType(); + } + + @Override + public AbstractValue clone() { + try { + return (AbstractValue) super.clone(); + } catch (CloneNotSupportedException e) { + return null; + } + } + } 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 5758187be..70d1e007e 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 @@ -21,13 +21,16 @@ import org.w3c.dom.DOMException; 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; /** * This class provides a base implementation for the value factories. * - * @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 AbstractValueFactory { @@ -83,8 +86,8 @@ protected DOMException createInvalidFloatValueDOMException(float f) { /** * Creates a DOM exception, given an invalid string type. */ - protected DOMException createInvalidStringTypeDOMException(short t) { - Object[] p = { getPropertyName(), (int) t }; + protected DOMException createInvalidStringTypeDOMException(Type t) { + Object[] p = { getPropertyName(), t }; String s = Messages.formatMessage("invalid.string.type", p); return new DOMException(DOMException.INVALID_ACCESS_ERR, s); } 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 new file mode 100644 index 000000000..dccf0fe17 --- /dev/null +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractValueList.java @@ -0,0 +1,151 @@ +/* + + 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.util.ArrayList; +import java.util.Iterator; + +import org.w3c.css.om.typed.CSSStyleValueList; + +/** + * This class represents a list of values. + * + * @author See Git history. + * @version $Id$ + */ +public class AbstractValueList extends ComponentValue implements CSSStyleValueList { + + /** + * The items. + */ + private ArrayList items; + + /** + * The list separator. + */ + private char separator; + + /** + * Creates a ListValue. + */ + public AbstractValueList() { + this(','); + } + + /** + * Creates a ListValue with the given separator. + */ + public AbstractValueList(char s) { + this(s, 5); + } + + /** + * Creates a ListValue with the given separator and an initial capacity. + */ + public AbstractValueList(char s, int initialCapacity) { + separator = s; + items = new ArrayList<>(initialCapacity); + } + + @Override + public AbstractValueList clone() { + AbstractValueList clon = new AbstractValueList<>(separator, items.size()); + clon.items.addAll(items); + return clon; + } + + /** + * Returns the separator used for this list. + */ + public char getSeparatorChar() { + return separator; + } + + @Override + public CssType getCssValueType() { + return CssType.LIST; + } + + @Override + public Type getPrimitiveType() { + return Type.INVALID; // Not a primitive + } + + /** + * Appends an item to the list. + */ + public boolean add(V value) { + boolean b = items.add(value); + componentAdded(value); + return b; + } + + /** + * A string representation of the current value. + */ + @Override + public String getCssText() { + int length = items.size(); + StringBuilder sb = new StringBuilder(length * 8); + if (length > 0) { + sb.append(items.get(0).toString()); + } + for (int i = 1; i < length; i++) { + sb.append(separator); + sb.append(items.get(i).toString()); + } + return sb.toString(); + } + + @Override + public V item(int index) { + return items.get(index); + } + + @Override + public int getLength() { + return items.size(); + } + + @Override + public Iterator iterator() { + return items.iterator(); + } + + public void clear() { + items.clear(); + } + + public boolean isEmpty() { + return items.isEmpty(); + } + + public V remove(int index) { + V item = items.remove(index); + componentRemoved(item); + return item; + } + + public V set(int index, V value) { + V v = items.set(index, value); + getComponentHandler().listValueChanged(index, value); + return v; + } + +} diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractValueManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractValueManager.java index a704fc886..4b6ada07d 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractValueManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractValueManager.java @@ -19,9 +19,9 @@ package io.sf.carte.echosvg.css.engine.value; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; -import org.w3c.dom.css.CSSValue; +import org.w3c.css.om.unit.CSSUnit; +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; @@ -29,8 +29,10 @@ /** * This class provides an abstract implementation of the ValueManager interface. * - * @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 AbstractValueManager extends AbstractValueFactory implements ValueManager { @@ -43,11 +45,8 @@ public Value createFloatValue(short unitType, float floatValue) throws DOMExcept throw createDOMException(); } - /** - * Implements {@link ValueManager#createStringValue(short,String,CSSEngine)}. - */ @Override - public Value createStringValue(short type, String value, CSSEngine engine) throws DOMException { + public Value createStringValue(Type type, String value, CSSEngine engine) throws DOMException { throw createDOMException(); } @@ -59,12 +58,31 @@ public Value createStringValue(short type, String value, CSSEngine engine) throw public Value computeValue(CSSStylableElement elt, String pseudo, CSSEngine engine, int idx, StyleMap sm, Value value) { - if ((value.getCssValueType() == CSSValue.CSS_PRIMITIVE_VALUE) - && (value.getPrimitiveType() == CSSPrimitiveValue.CSS_URI)) { - // Reveal the absolute value as the cssText now. - return new URIValue(value.getStringValue(), value.getStringValue()); + if (value.getPrimitiveType() == Type.URI) { + // For performance, set the parsed value as the cssText now. + String uri = value.getURIValue(); + return new URIValue(uri, uri); } + return value; } + protected float lengthValue(Value cv) { + short unit = cv.getCSSUnit(); + if (!CSSUnit.isLengthUnitType(unit) && unit != CSSUnit.CSS_NUMBER) { + throw createDOMException(unit); + } + return cv.getFloatValue(); + } + + /** + * Creates an INVALID_ACCESS_ERR exception. + * @param unit the unit. + */ + protected DOMException createDOMException(int unit) { + Object[] p = { unit }; + String s = Messages.formatMessage("invalid.value.access", p); + return new DOMException(DOMException.INVALID_ACCESS_ERR, s); + } + } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractValueModificationHandler.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractValueModificationHandler.java new file mode 100644 index 000000000..1eac5ce13 --- /dev/null +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/AbstractValueModificationHandler.java @@ -0,0 +1,64 @@ +/* + + 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.dom.DOMException; + +/** + * Base class for modification handlers. + */ +public abstract class AbstractValueModificationHandler implements ValueModificationHandler { + + /** + * Creates a new AbstractValueModificationHandler. + */ + protected AbstractValueModificationHandler() { + super(); + } + + /** + * Returns the associated value. + */ + protected abstract Value getValue(); + + /** + * Called when the value has changed. + * + * @param v the value that changed. + */ + @Override + public void valueChanged(Value v) throws DOMException { + propertyTextChanged(); + } + + /** + * To trigger a full property set. + */ + protected void propertyTextChanged() throws DOMException { + setPropertyText(getValue().getCssText()); + } + + /** + * To trigger a full property reparse. + * + * @param text the property serialization. + */ + protected abstract void setPropertyText(String text) throws DOMException; + +} 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 new file mode 100644 index 000000000..a336e248b --- /dev/null +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ColorFunction.java @@ -0,0 +1,189 @@ +/* + + 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.util.HashSet; +import java.util.Locale; +import java.util.Set; + +import org.w3c.api.DOMSyntaxException; +import org.w3c.css.om.typed.CSSColor; +import org.w3c.css.om.typed.CSSStyleValueList; +import org.w3c.dom.DOMException; + +import org.w3c.css.om.unit.CSSUnit; + +/** + * color() function. + * + * @author See Git history. + * @version $Id$ + */ +public class ColorFunction extends ColorValue implements CSSColor { + + private IdentValue colorSpace; + + /** + * The channels. + */ + private AbstractValueList channels; + + private static final Set predefinedSpaces; + + static { + predefinedSpaces = new HashSet<>(9); + predefinedSpaces.add(ColorValue.CS_SRGB); + predefinedSpaces.add(ColorValue.CS_SRGB_LINEAR); + predefinedSpaces.add(ColorValue.CS_A98_RGB); + predefinedSpaces.add(ColorValue.CS_DISPLAY_P3); + predefinedSpaces.add(ColorValue.CS_PROPHOTO_RGB); + predefinedSpaces.add(ColorValue.CS_REC2020); + predefinedSpaces.add(ColorValue.CS_XYZ); + predefinedSpaces.add(ColorValue.CS_XYZ_D50); + predefinedSpaces.add(ColorValue.CS_XYZ_D65); + } + + /** + * Creates a new ColorFunction. + * + * @param colorSpace the color space. + * @param channels a channel list to copy from. + * @throws DOMSyntaxException if a supplied component is invalid. + */ + public ColorFunction(String colorSpace, CSSStyleValueList channels) + throws DOMSyntaxException { + super(); + this.colorSpace = new IdentValue(canonicalName(colorSpace)); + componentize(this.colorSpace); + componentizeChannels(channels); + } + + private void componentizeChannels(CSSStyleValueList channels) { + // Clone channels if the list belongs to some other value + boolean clone = channels instanceof AbstractValue && ((AbstractValue) channels).handler != null; + int len = channels.getLength(); + this.channels = new AbstractValueList(' ', len); + for (NumericValue channel : channels) { + if (clone) { + channel = channel.clone(); + } + this.channels.add(numericComponent(channel)); + } + componentize(this.channels); + } + + /** + * Get the color space as defined by the Typed OM specification. + * + * @return the color space. + */ + @Override + public IdentValue getColorSpace() { + return colorSpace; + } + + @Override + public String getCSSColorSpace() { + return colorSpace.getValue(); + } + + @Override + public void setColorSpace(String cs) { + colorSpace.setValue(canonicalName(cs)); + componentChanged(colorSpace); + } + + static String canonicalName(String cs) throws DOMException { + cs = cs.toLowerCase(Locale.ROOT); + if (!predefinedSpaces.contains(cs)) { + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, + "Unsupported color space: " + cs); + } + return cs; + } + + @Override + public CSSStyleValueList getChannels() { + return channels; + } + + @Override + public int getLength() throws DOMException { + return channels.getLength() + 2; + } + + @Override + public Value item(int index) throws DOMException { + if (index == 0) { + return getColorSpace(); + } else if (index == channels.getLength() + 1) { + return getAlpha(); + } + return channels.item(index - 1); + } + + @Override + public ColorFunction getColorValue() { + return this; + } + + /** + * A string representation of the current value. + */ + @Override + public String getCssText() { + StringBuilder buf = new StringBuilder(15 + colorSpace.value.length() + channels.getLength() * 8); + buf.append("color(").append(colorSpace.getCssText()); + for (NumericValue ch : channels) { + buf.append(' ').append(ch.getCssText()); + } + if (!isOpaque()) { + buf.append(" / ").append(getAlpha().getCssText()); + } + buf.append(')'); + return buf.toString(); + } + + /** + * Initialize a numeric component of this value. + * + * @param ch the component. + * @return the initialized component. + * @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) { + throw new DOMSyntaxException("color() component must be a number or percentage."); + } + componentize(ch); + return ch; + } + + @Override + public ColorFunction clone() { + ColorFunction clon; + try { + clon = new ColorFunction(getColorSpace().getValue(), this.channels); + } catch (DOMSyntaxException e) { + clon = null; + } + return clon; + } + +} 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 new file mode 100644 index 000000000..02e2addce --- /dev/null +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ColorValue.java @@ -0,0 +1,164 @@ +/* + + 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.DOMSyntaxException; +import org.w3c.css.om.typed.CSSColorValue; +import org.w3c.css.om.typed.CSSNumericValue; +import org.w3c.css.om.unit.CSSUnit; + +/** + * CSS colors. + * + * @author See Git history. + * @version $Id$ + */ +public abstract class ColorValue extends ComponentValue implements CSSColorValue { + + public static final String RGB_FUNCTION = "rgb"; + + public static final String CS_SRGB = "srgb"; + + public static final String LAB = "lab"; + + public static final String LCH = "lch"; + + public static final String CS_DISPLAY_P3 = "display-p3"; + + public static final String CS_SRGB_LINEAR = "srgb-linear"; + + public static final String CS_A98_RGB = "a98-rgb"; + + public static final String CS_PROPHOTO_RGB = "prophoto-rgb"; + + public static final String CS_REC2020 = "rec2020"; + + /** + * The {@code xyz-d50} color space. + */ + public static final String CS_XYZ_D50 = "xyz-d50"; + + /** + * The {@code xyz-d65} color space (same as {@code xyz}). + */ + public static final String CS_XYZ_D65 = "xyz-d65"; + + /** + * The {@code xyz} color space (same as {@code xyz-d65}). + */ + public static final String CS_XYZ = "xyz"; + + /** + * The alpha channel. + */ + protected NumericValue alpha; + + /** + * Creates a new RGBColorValue. + */ + protected ColorValue() { + } + + /** + * Creates a new RGBColorValue. + * + * @param a the alpha channel. + * @throws DOMSyntaxException if the value is an invalid opacity. + */ + protected ColorValue(NumericValue a) throws DOMSyntaxException { + super(); + setAlpha(a); + } + + /** + * The type of the value. + */ + @Override + public Type getPrimitiveType() { + return Type.COLOR; + } + + /** + * Get the color space as defined by the Typed OM specification. + * + * @return the color space. + */ + public abstract String getCSSColorSpace(); + + /** + * Gets the value of the {@code alpha} component. + * + * @return the {@code alpha} component. + */ + public NumericValue getAlpha() { + return alpha; + } + + /** + * Sets the alpha channel as a percentage. + * + * @param alpha the alpha channel as a percentage. + */ + public void setAlpha(double alpha) { + this.alpha = new FloatValue(CSSUnit.CSS_PERCENTAGE, (float) alpha * 100); + componentize(this.alpha); + + componentChanged(this.alpha); + } + + /** + * Sets the alpha channel. + * + * @param alpha the alpha channel. + * @throws DOMSyntaxException if alpha is not a percentage. + */ + public void setAlpha(CSSNumericValue alpha) throws DOMSyntaxException { + NumericValue a = (NumericValue) alpha; + if (a.getCSSUnit() != CSSUnit.CSS_PERCENTAGE && a.getCSSUnit() != CSSUnit.CSS_NUMBER) { + throw new DOMSyntaxException("Alpha channel must be a number or percentage."); + } + componentize(a); + this.alpha = a; + + componentChanged(a); + } + + boolean isOpaque() { + switch (alpha.getCSSUnit()) { + case CSSUnit.CSS_NUMBER: + return alpha.getFloatValue() == 1f; + case CSSUnit.CSS_PERCENTAGE: + return alpha.getFloatValue() == 100f; + } + return false; + } + + @Override + public ColorValue getColorValue() { + return this; + } + + @Override + public ColorValue clone() { + ColorValue c = (ColorValue) super.clone(); + c.alpha = alpha.clone(); + return c; + } + +} diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ComponentHandler.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ComponentHandler.java new file mode 100644 index 000000000..cf4a84edb --- /dev/null +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ComponentHandler.java @@ -0,0 +1,61 @@ +/* + + 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.dom.DOMException; + +/** + * Manage the modification of value components. + */ +public interface ComponentHandler extends ValueModificationHandler { + + /** + * Notify that a component of this value changed. + * + * @param c the modified value. + */ + void componentChanged(Value c); + + /** + * Notify that a component was added to this value. + * + * @param c the new value. + */ + void componentAdded(Value c); + + /** + * Notify that a component was removed from this value. + * + * @param c the removed value. + */ + void componentRemoved(Value c); + + /** + * Called when a list value has changed. + */ + void listValueChanged(int index, Value value) throws DOMException; + + /** + * Get the value that owns the components (a list, a color, etc). + * + * @return the main value. + */ + Value getValue(); + +} diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ComponentValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ComponentValue.java new file mode 100644 index 000000000..bdb09ea64 --- /dev/null +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ComponentValue.java @@ -0,0 +1,96 @@ +/* + + 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.dom.DOMException; + +/** + * A Value made of components. + * + * @version $Id$ + */ +public abstract class ComponentValue extends AbstractValue { + + private ComponentModificationHandler componentHandler = new ComponentModificationHandler(); + + protected ComponentValue() { + super(); + } + + protected ComponentModificationHandler getComponentHandler() { + return componentHandler; + } + + protected void componentize(Value value) { + value.setModificationHandler(componentHandler); + } + + protected void componentChanged(Value v) { + componentHandler.componentChanged(v); + } + + protected void componentAdded(Value v) { + componentHandler.componentAdded(v); + } + + protected void componentRemoved(Value v) { + componentHandler.componentRemoved(v); + } + + class ComponentModificationHandler implements ComponentHandler { + + @Override + public void componentChanged(Value c) { + propertyChanged(); + } + + @Override + public void componentAdded(Value c) { + propertyChanged(); + } + + @Override + public void componentRemoved(Value c) { + propertyChanged(); + } + + @Override + public void listValueChanged(int index, Value value) throws DOMException { + propertyChanged(); + } + + @Override + public void valueChanged(Value v) { + propertyChanged(); + } + + private void propertyChanged() { + if (handler != null) { + handler.valueChanged(getValue()); + } + } + + @Override + public Value getValue() { + return ComponentValue.this; + } + + } + +} 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 173550a90..0fb8ed4b4 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 @@ -18,13 +18,15 @@ */ package io.sf.carte.echosvg.css.engine.value; +import org.w3c.css.om.typed.CSSCounterValue; import org.w3c.dom.DOMException; /** * This class represents a computed property value. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. See Git history. + *

* @version $Id$ */ public class ComputedValue implements Value { @@ -77,137 +79,95 @@ public String getCssText() { return computedValue.getCssText(); } - /** - * Implements {@link Value#getCssValueType()}. - */ @Override - public short getCssValueType() { + public CssType getCssValueType() { return computedValue.getCssValueType(); } - /** - * Implements {@link Value#getPrimitiveType()}. - */ + @Override - public short getPrimitiveType() { + public Type getPrimitiveType() { return computedValue.getPrimitiveType(); } - /** - * Implements {@link Value#getFloatValue()}. - */ @Override - public float getFloatValue() throws DOMException { - return computedValue.getFloatValue(); + public short getCSSUnit() { + return computedValue.getCSSUnit(); } - /** - * Implements {@link Value#getStringValue()}. - */ @Override - public String getStringValue() throws DOMException { - return computedValue.getStringValue(); + public void setFloatValue(float value) throws DOMException { + throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, "Cannot modify computed value."); } - /** - * Implements {@link Value#getRed()}. - */ @Override - public Value getRed() throws DOMException { - return computedValue.getRed(); + public void setModificationHandler(ValueModificationHandler handler) { + throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, "Cannot modify computed value."); } - /** - * Implements {@link Value#getGreen()}. - */ @Override - public Value getGreen() throws DOMException { - return computedValue.getGreen(); + public ValueModificationHandler getModificationHandler() { + return computedValue.getModificationHandler(); } - /** - * Implements {@link Value#getBlue()}. - */ @Override - public Value getBlue() throws DOMException { - return computedValue.getBlue(); + public float getFloatValue() throws DOMException { + return computedValue.getFloatValue(); } @Override - public Value getAlpha() throws DOMException { - return computedValue.getAlpha(); + public String getIdentifierValue() throws DOMException { + return computedValue.getIdentifierValue(); } /** - * Implements {@link Value#getLength()}. + * Implements {@link Value#getStringValue()}. */ @Override - public int getLength() throws DOMException { - return computedValue.getLength(); + public String getStringValue() throws DOMException { + return computedValue.getStringValue(); } - /** - * Implements {@link Value#item(int)}. - */ @Override - public Value item(int index) throws DOMException { - return computedValue.item(index); + public String getURIValue() throws DOMException { + return computedValue.getURIValue(); } - /** - * Implements {@link Value#getTop()}. - */ @Override - public Value getTop() throws DOMException { - return computedValue.getTop(); + public void setCssText(String cssText) throws DOMException { + throw new DOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, "Cannot modify computed value."); } - /** - * Implements {@link Value#getRight()}. - */ @Override - public Value getRight() throws DOMException { - return computedValue.getRight(); + public int getLength() throws DOMException { + return computedValue.getLength(); } - /** - * Implements {@link Value#getBottom()}. - */ @Override - public Value getBottom() throws DOMException { - return computedValue.getBottom(); + public Value item(int index) throws DOMException { + return computedValue.item(index); } - /** - * Implements {@link Value#getLeft()}. - */ @Override - public Value getLeft() throws DOMException { - return computedValue.getLeft(); + public CSSCounterValue getCounterValue() throws DOMException { + return computedValue.getCounterValue(); } - /** - * Implements {@link Value#getIdentifier()}. - */ @Override - public String getIdentifier() throws DOMException { - return computedValue.getIdentifier(); + public RectValue getRectValue() throws DOMException { + return computedValue.getRectValue(); } - /** - * Implements {@link Value#getListStyle()}. - */ @Override - public String getListStyle() throws DOMException { - return computedValue.getListStyle(); + public ColorValue getColorValue() throws DOMException { + return computedValue.getColorValue(); } - /** - * Implements {@link Value#getSeparator()}. - */ @Override - public String getSeparator() throws DOMException { - return computedValue.getSeparator(); + public ComputedValue clone() { + ComputedValue cv = new ComputedValue(cascadedValue); + cv.setComputedValue(computedValue); + return cv; } } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/CounterValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/CounterValue.java new file mode 100644 index 000000000..1f3592eea --- /dev/null +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/CounterValue.java @@ -0,0 +1,65 @@ +/* + + 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.dom.DOMException; + +/** + * counter() function. + * + */ +class CounterValue extends AbstractCounterValue { + + public CounterValue() { + super(); + } + + CounterValue(String identifier, Value listStyle) { + super(identifier, listStyle); + } + + @Override + public CounterValue clone() { + return new CounterValue(getName(), getCounterStyle()); + } + + @Override + public Type getPrimitiveType() { + return Type.COUNTER; + } + + @Override + public String getCssText() { + StringBuilder buf = new StringBuilder(); + buf.append("counter(").append(getName()); + Value style = getCounterStyle(); + String listStyle; + if (style != null && !"decimal".equalsIgnoreCase(listStyle = style.getCssText())) { + buf.append(',').append(' ').append(listStyle); + } + buf.append(')'); + return buf.toString(); + } + + @Override + public CounterValue getCounterValue() throws DOMException { + return this; + } + +} diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/CountersValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/CountersValue.java new file mode 100644 index 000000000..9d1b9ee05 --- /dev/null +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/CountersValue.java @@ -0,0 +1,77 @@ +/* + + 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.dom.DOMException; + +/** + * counters() function. + * + */ +class CountersValue extends AbstractCounterValue { + + private String separator = ""; + + public CountersValue() { + super(); + } + + CountersValue(String identifier, Value listStyle, String separator) { + super(identifier, listStyle); + this.separator = separator; + } + + @Override + public CountersValue clone() { + return new CountersValue(getName(), getCounterStyle(), getSeparator()); + } + + @Override + public Type getPrimitiveType() { + return Type.COUNTERS; + } + + @Override + public String getSeparator() { + return separator; + } + + public void setSeparator(String separator) { + this.separator = separator; + } + + @Override + public String getCssText() { + StringBuilder buf = new StringBuilder(); + buf.append("counter(").append(getName()); + Value style = getCounterStyle(); + String listStyle; + if (style != null && !"decimal".equalsIgnoreCase(listStyle = style.getCssText())) { + buf.append(',').append(' ').append(listStyle); + } + buf.append(')'); + return buf.toString(); + } + + @Override + public CountersValue getCounterValue() throws DOMException { + return this; + } + +} 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 400834715..d5d0a4ff2 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 @@ -18,47 +18,53 @@ */ package io.sf.carte.echosvg.css.engine.value; +import java.io.IOException; +import java.io.StringReader; +import java.util.Objects; + +import org.w3c.api.DOMSyntaxException; +import org.w3c.api.DOMTypeException; +import org.w3c.css.om.typed.CSSUnitValue; +import org.w3c.css.om.unit.CSSUnit; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; + +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; /** * This class represents float values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + * @author See Git history. * @version $Id$ */ -public class FloatValue extends AbstractValue { +public class FloatValue extends NumericValue implements CSSUnitValue { /** * Returns the CSS text associated with the given type/value pair. */ public static String getCssText(short unit, float value) { - if (unit < 0 || unit >= UNITS.length) { + if (unit == CSSUnit.CSS_INVALID) { throw new DOMException(DOMException.SYNTAX_ERR, ""); } String s = String.valueOf(value); if (s.endsWith(".0")) { s = s.substring(0, s.length() - 2); } - return s + UNITS[unit - CSSPrimitiveValue.CSS_NUMBER]; + return s + CSSUnit.dimensionUnitString(unit); } - /** - * The unit types representations - */ - protected static final String[] UNITS = { "", "%", "em", "ex", "px", "cm", "mm", "in", "pt", "pc", "deg", "rad", - "grad", "ms", "s", "Hz", "kHz", "" }; - /** * The float value */ - protected float floatValue; + private float floatValue; /** * The unit type */ - protected short unitType; + private short unitType; /** * Creates a new value. @@ -72,7 +78,12 @@ public FloatValue(short unitType, float floatValue) { * The type of the value. */ @Override - public short getPrimitiveType() { + public Type getPrimitiveType() { + return Type.NUMERIC; + } + + @Override + public short getCSSUnit() { return unitType; } @@ -84,6 +95,29 @@ public float getFloatValue() { return floatValue; } + @Override + public double getValue() { + return floatValue; + } + + @Override + public void setValue(double value) { + this.floatValue = (float) value; + + if (handler != null) { + handler.valueChanged(this); + } + } + + public void setValue(String cssText) throws DOMException { + setCssText(cssText); + } + + @Override + public String getUnit() { + return CSSUnit.dimensionUnitString(unitType); + } + /** * A string representation of the current value. */ @@ -92,6 +126,44 @@ public String getCssText() { return getCssText(unitType, floatValue); } + @Override + public void setCssText(String cssText) throws DOMException { + CSSParser parser = new CSSParser(); + try { + LexicalUnit lu = parser.parsePropertyValue(new StringReader(cssText)); + if (lu.getNextLexicalUnit() != null) { + throw new DOMSyntaxException("Invalid number " + cssText); + } + switch (lu.getLexicalUnitType()) { + case INTEGER: + floatValue = lu.getIntegerValue(); + unitType = CSSUnit.CSS_NUMBER; + break; + case REAL: + floatValue = lu.getFloatValue(); + unitType = CSSUnit.CSS_NUMBER; + break; + case PERCENTAGE: + floatValue = lu.getFloatValue(); + unitType = CSSUnit.CSS_PERCENTAGE; + break; + case DIMENSION: + floatValue = lu.getFloatValue(); + unitType = lu.getCssUnit(); + break; + default: + throw new DOMTypeException("Invalid unit value: " + cssText); + } + } catch (IOException e) { + } catch (CSSParseException e) { + throw new DOMSyntaxException(e); + } + + if (handler != null) { + handler.valueChanged(this); + } + } + /** * Returns a printable representation of this value. */ @@ -100,4 +172,103 @@ public String toString() { return getCssText(); } + @Override + public int hashCode() { + final int prime = 31; + int result = super.hashCode(); + result = prime * result + Objects.hash(floatValue, unitType); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (!super.equals(obj)) + return false; + if (!(obj instanceof Value)) + return false; + Value other = (Value) obj; + return other.getCSSUnit() == unitType + && Float.floatToIntBits(floatValue) == Float.floatToIntBits(other.getFloatValue()); + } + + @Override + public CSSUnitValue to(String unit) { + short destUnit = ParseHelper.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; + } + + } + + @Override + public FloatValue clone() { + return new FloatValue(unitType, floatValue); + } + } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/IdentValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/IdentValue.java new file mode 100644 index 000000000..b83fad064 --- /dev/null +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/IdentValue.java @@ -0,0 +1,85 @@ +/* + + 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.CSSKeywordValue; + +import io.sf.carte.doc.style.css.parser.ParseHelper; + +/** + * Identifier values. + * + * @author See Git history. + * @version $Id$ + */ +public class IdentValue extends AbstractStringValue implements CSSKeywordValue { + + /** + * Creates a new IdentValue. + */ + public IdentValue(String s) { + super(s); + } + + /** + * The type of the value. + */ + @Override + public Type getPrimitiveType() { + return Type.IDENT; + } + + /** + * Indicates whether some other object is "equal to" this one. + * + * @param obj the reference object with which to compare. + */ + @Override + public boolean equals(Object obj) { + if (obj == null || !(obj instanceof Value)) { + return false; + } + Value v = (Value) obj; + return v.getPrimitiveType() == Type.IDENT && value.equals(v.getIdentifierValue()); + } + + /** + * A string representation of the current value. + */ + @Override + public String getCssText() { + return ParseHelper.escape(value); + } + + @Override + public String getIdentifierValue() { + return value; + } + + @Override + public String getStringValue() { + return value; + } + + @Override + public IdentValue clone() { + return new IdentValue(value); + } + +} 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 5185fb45f..b348cacb7 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 @@ -19,17 +19,19 @@ package io.sf.carte.echosvg.css.engine.value; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; 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; /** * This class provides a manager for the property with support for identifier * values. * - * @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 IdentifierManager extends AbstractValueManager { @@ -56,12 +58,9 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { } } - /** - * Implements {@link ValueManager#createStringValue(short,String,CSSEngine)}. - */ @Override - public Value createStringValue(short type, String value, CSSEngine engine) throws DOMException { - if (type != CSSPrimitiveValue.CSS_IDENT) { + public Value createStringValue(Type type, String value, CSSEngine engine) throws DOMException { + if (type != Type.IDENT) { throw createInvalidStringTypeDOMException(type); } Object v = getIdentifiers().get(value.toLowerCase().intern()); 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 acc026f0a..3b036b598 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,16 +18,19 @@ */ package io.sf.carte.echosvg.css.engine.value; -import org.w3c.dom.css.CSSValue; +import org.w3c.api.DOMTypeException; +import org.w3c.css.om.typed.CSSKeywordValue; /** * This singleton class represents the 'inherit' value. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ -public class InheritValue extends AbstractValue { +public class InheritValue extends AbstractValue implements CSSKeywordValue { /** * The only instance of this class. @@ -45,15 +48,35 @@ protected InheritValue() { */ @Override public String getCssText() { + return getValue(); + } + + @Override + 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 short getCssValueType() { - return CSSValue.CSS_INHERIT; + public CssType getCssValueType() { + return CssType.KEYWORD; + } + + @Override + public Type getPrimitiveType() { + return Type.INHERIT; + } + + @Override + public InheritValue clone() { + return INSTANCE; } /** 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 new file mode 100644 index 000000000..52d79fa6b --- /dev/null +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/LCHColorValue.java @@ -0,0 +1,207 @@ +/* + + 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.DOMSyntaxException; +import org.w3c.css.om.typed.CSSLCH; +import org.w3c.css.om.typed.CSSNumericValue; +import org.w3c.dom.DOMException; + +import org.w3c.css.om.unit.CSSUnit; +import io.sf.carte.echosvg.css.engine.value.svg.SVGValueConstants; + +/** + * LCH colors. + * + * @version $Id$ + */ +public class LCHColorValue extends ColorValue implements CSSLCH { + + /** + * The lightness component. + */ + protected NumericValue l; + + /** + * The chroma component. + */ + protected NumericValue c; + + /** + * The hue component. + */ + protected NumericValue h; + + /** + * Creates a new, opaque LCHColorValue. + * + * @throws DOMSyntaxException if a supplied component is invalid. + */ + public LCHColorValue(NumericValue l, NumericValue c, NumericValue h) throws DOMSyntaxException { + this(l, c, h, SVGValueConstants.NUMBER_1); + } + + /** + * Creates a new LCHColorValue. + * + * @throws DOMSyntaxException if a supplied component is invalid. + */ + public LCHColorValue(NumericValue l, NumericValue c, NumericValue h, NumericValue alpha) + throws DOMSyntaxException { + super(alpha); + setL(l); + setC(c); + setH(h); + } + + @Override + public String getCSSColorSpace() { + return ColorValue.LCH; + } + + @Override + public String getCssText() { + StringBuilder buf = new StringBuilder(); + buf.append("lch(").append(l.getCssText()).append(' ').append(c.getCssText()).append(' ') + .append(h.getCssText()); + if (!isOpaque()) { + buf.append(' ').append(getAlpha().getCssText()); + } + buf.append(')'); + return buf.toString(); + } + + @Override + public NumericValue getL() { + return l; + } + + @Override + public NumericValue getC() { + return c; + } + + @Override + public NumericValue getH() { + return h; + } + + @Override + public void setL(double lightness) { + l = new FloatValue(CSSUnit.CSS_PERCENTAGE, (float) lightness); + componentize(l); + componentChanged(l); + } + + @Override + public void setL(CSSNumericValue lightness) throws DOMSyntaxException { + l = component(lightness); + componentChanged(l); + } + + /** + * Initialize a component of this value. + * + * @param c the component. + * @return the initialized component. + * @throws DOMSyntaxException if the value is inadequate for a component. + */ + private NumericValue component(CSSNumericValue c) throws DOMSyntaxException { + NumericValue ch = (NumericValue) c; + if (ch.getCSSUnit() != CSSUnit.CSS_PERCENTAGE && ch.getCSSUnit() != CSSUnit.CSS_NUMBER) { + throw new DOMSyntaxException("LC component must be a number or percentage."); + } + if (ch.handler != null) { + ch = ch.clone(); + } + componentize(ch); + return ch; + } + + @Override + public void setC(double c) { + this.c = new FloatValue(CSSUnit.CSS_PERCENTAGE, (float) c); + componentize(this.c); + componentChanged(this.c); + } + + @Override + public void setC(CSSNumericValue c) throws DOMSyntaxException { + this.c = component(c); + componentChanged(this.c); + } + + @Override + public void setH(double h) { + this.h = new FloatValue(CSSUnit.CSS_DEG, (float) h); + componentize(this.h); + componentChanged(this.h); + } + + @Override + public void setH(CSSNumericValue h) throws DOMSyntaxException { + this.h = hueComponent(h); + componentChanged(this.h); + } + + private NumericValue hueComponent(CSSNumericValue h) { + NumericValue ch = (NumericValue) h; + if (ch.getCSSUnit() != CSSUnit.CSS_NUMBER && !CSSUnit.isAngleUnitType(ch.getCSSUnit())) { + throw new DOMSyntaxException("Hue component must be a number or angle."); + } + if (ch.handler != null) { + ch = ch.clone(); + } + componentize(ch); + return ch; + } + + @Override + public int getLength() throws DOMException { + return 4; + } + + @Override + public Value item(int index) throws DOMException { + switch (index) { + case 0: + return getL(); + case 1: + return getC(); + case 2: + return getH(); + case 3: + return getAlpha(); + default: + return null; + } + } + + @Override + public LCHColorValue clone() { + LCHColorValue clon; + try { + clon = new LCHColorValue(l, c, h, alpha); + } catch (DOMSyntaxException e) { + clon = null; + } + return clon; + } + +} 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 new file mode 100644 index 000000000..edf8eb465 --- /dev/null +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/LabColorValue.java @@ -0,0 +1,195 @@ +/* + + 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.DOMSyntaxException; +import org.w3c.css.om.typed.CSSLab; +import org.w3c.css.om.typed.CSSNumericValue; +import org.w3c.dom.DOMException; + +import org.w3c.css.om.unit.CSSUnit; +import io.sf.carte.echosvg.css.engine.value.svg.SVGValueConstants; + +/** + * Lab colors. + * + * @version $Id$ + */ +public class LabColorValue extends ColorValue implements CSSLab { + + /** + * The lightness component. + */ + protected NumericValue l; + + /** + * The a component. + */ + protected NumericValue a; + + /** + * The b component. + */ + protected NumericValue b; + + /** + * Creates a new, opaque LabColorValue. + * + * @throws DOMSyntaxException if a supplied component is invalid. + */ + public LabColorValue(NumericValue l, NumericValue a, NumericValue b) throws DOMSyntaxException { + this(l, a, b, SVGValueConstants.NUMBER_1); + } + + /** + * Creates a new LabColorValue. + * + * @throws DOMSyntaxException if a supplied component is invalid. + */ + public LabColorValue(NumericValue l, NumericValue a, NumericValue b, NumericValue alpha) + throws DOMSyntaxException { + super(alpha); + setL(l); + setA(a); + setB(b); + } + + @Override + public String getCSSColorSpace() { + return ColorValue.LAB; + } + + @Override + public String getCssText() { + StringBuilder buf = new StringBuilder(); + buf.append("lab(").append(l.getCssText()).append(' ').append(a.getCssText()).append(' ') + .append(b.getCssText()); + if (!isOpaque()) { + buf.append(' ').append(getAlpha().getCssText()); + } + buf.append(')'); + return buf.toString(); + } + + @Override + public NumericValue getL() { + return l; + } + + @Override + public NumericValue getA() { + return a; + } + + @Override + public NumericValue getB() { + return b; + } + + @Override + public void setL(double lightness) { + l = new FloatValue(CSSUnit.CSS_PERCENTAGE, (float) lightness); + componentize(l); + componentChanged(l); + } + + @Override + public void setL(CSSNumericValue lightness) throws DOMSyntaxException { + l = component(lightness); + componentChanged(l); + } + + /** + * Initialize a component of this value. + * + * @param c the component. + * @return the initialized component. + * @throws DOMSyntaxException if the value is inadequate for a component. + */ + private NumericValue component(CSSNumericValue c) throws DOMSyntaxException { + NumericValue ch = (NumericValue) c; + if (ch.getCSSUnit() != CSSUnit.CSS_PERCENTAGE && ch.getCSSUnit() != CSSUnit.CSS_NUMBER) { + throw new DOMSyntaxException("Lab component must be a number or percentage."); + } + if (ch.handler != null) { + ch = ch.clone(); + } + componentize(ch); + return ch; + } + + @Override + public void setA(double a) { + this.a = new FloatValue(CSSUnit.CSS_NUMBER, (float) a); + componentize(this.a); + componentChanged(this.a); + } + + @Override + public void setA(CSSNumericValue a) throws DOMSyntaxException { + this.a = component(a); + componentChanged(this.a); + } + + @Override + public void setB(double b) { + this.b = new FloatValue(CSSUnit.CSS_NUMBER, (float) b); + componentize(this.b); + componentChanged(this.b); + } + + @Override + public void setB(CSSNumericValue b) throws DOMSyntaxException { + this.b = component(b); + componentChanged(this.b); + } + + @Override + public int getLength() throws DOMException { + return 4; + } + + @Override + public Value item(int index) throws DOMException { + switch (index) { + case 0: + return getL(); + case 1: + return getA(); + case 2: + return getB(); + case 3: + return getAlpha(); + default: + return null; + } + } + + @Override + public LabColorValue clone() { + LabColorValue clon; + try { + clon = new LabColorValue(l, a, b, alpha); + } catch (DOMSyntaxException e) { + clon = null; + } + return clon; + } + +} 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 a0927f152..153e68e82 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 @@ -19,11 +19,11 @@ package io.sf.carte.echosvg.css.engine.value; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; -import org.w3c.dom.css.CSSValue; -import io.sf.carte.doc.style.css.CSSUnit; +import org.w3c.css.om.unit.CSSUnit; import io.sf.carte.doc.style.css.nsac.LexicalUnit; +import io.sf.carte.doc.style.css.property.NumberValue; +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; @@ -33,8 +33,10 @@ * This class provides a manager for the property with support for length * values. * - * @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 LengthManager extends AbstractValueManager { @@ -58,51 +60,22 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { break; case INTEGER: - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, lu.getIntegerValue()); + return new FloatValue(CSSUnit.CSS_NUMBER, lu.getIntegerValue()); case REAL: - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, lu.getFloatValue()); + return new FloatValue(CSSUnit.CSS_NUMBER, lu.getFloatValue()); case PERCENTAGE: - return new FloatValue(CSSPrimitiveValue.CSS_PERCENTAGE, lu.getFloatValue()); + return new FloatValue(CSSUnit.CSS_PERCENTAGE, lu.getFloatValue()); default: break; } throw createInvalidLexicalUnitDOMException(lu.getLexicalUnitType()); } - static Value createLength(LexicalUnit lu) { + static FloatValue createLength(LexicalUnit lu) { if (CSSUnit.isLengthUnitType(lu.getCssUnit())) { - short omUnit; - switch (lu.getCssUnit()) { - case CSSUnit.CSS_PX: - omUnit = CSSPrimitiveValue.CSS_PX; - break; - case CSSUnit.CSS_IN: - omUnit = CSSPrimitiveValue.CSS_IN; - break; - case CSSUnit.CSS_PC: - omUnit = CSSPrimitiveValue.CSS_PC; - break; - case CSSUnit.CSS_PT: - omUnit = CSSPrimitiveValue.CSS_PT; - break; - case CSSUnit.CSS_CM: - omUnit = CSSPrimitiveValue.CSS_CM; - break; - case CSSUnit.CSS_MM: - omUnit = CSSPrimitiveValue.CSS_MM; - break; - case CSSUnit.CSS_EM: - omUnit = CSSPrimitiveValue.CSS_EMS; - break; - case CSSUnit.CSS_EX: - omUnit = CSSPrimitiveValue.CSS_EXS; - break; - default: - return null; - } - return new FloatValue(omUnit, lu.getFloatValue()); + return new FloatValue(lu.getCssUnit(), lu.getFloatValue()); } return null; } @@ -113,16 +86,16 @@ static Value createLength(LexicalUnit lu) { @Override public Value createFloatValue(short type, float floatValue) throws DOMException { switch (type) { - case CSSPrimitiveValue.CSS_PERCENTAGE: - case CSSPrimitiveValue.CSS_EMS: - case CSSPrimitiveValue.CSS_EXS: - case CSSPrimitiveValue.CSS_PX: - case CSSPrimitiveValue.CSS_CM: - case CSSPrimitiveValue.CSS_MM: - case CSSPrimitiveValue.CSS_IN: - case CSSPrimitiveValue.CSS_PT: - case CSSPrimitiveValue.CSS_PC: - case CSSPrimitiveValue.CSS_NUMBER: + case CSSUnit.CSS_PERCENTAGE: + case CSSUnit.CSS_EM: + case CSSUnit.CSS_EX: + case CSSUnit.CSS_PX: + case CSSUnit.CSS_CM: + case CSSUnit.CSS_MM: + case CSSUnit.CSS_IN: + case CSSUnit.CSS_PT: + case CSSUnit.CSS_PC: + case CSSUnit.CSS_NUMBER: return new FloatValue(type, floatValue); } throw createInvalidFloatTypeDOMException(type); @@ -135,58 +108,59 @@ public Value createFloatValue(short type, float floatValue) throws DOMException @Override public Value computeValue(CSSStylableElement elt, String pseudo, CSSEngine engine, int idx, StyleMap sm, Value value) { - if (value.getCssValueType() != CSSValue.CSS_PRIMITIVE_VALUE) { + if (value.getPrimitiveType() != Type.NUMERIC) { return value; } - switch (value.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_NUMBER: - case CSSPrimitiveValue.CSS_PX: + switch (value.getCSSUnit()) { + case CSSUnit.CSS_NUMBER: + case CSSUnit.CSS_PX: return value; - case CSSPrimitiveValue.CSS_MM: + case CSSUnit.CSS_MM: CSSContext ctx = engine.getCSSContext(); float v = value.getFloatValue(); - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, v / ctx.getPixelUnitToMillimeter()); + return new FloatValue(CSSUnit.CSS_NUMBER, v / ctx.getPixelUnitToMillimeter()); - case CSSPrimitiveValue.CSS_CM: + case CSSUnit.CSS_CM: ctx = engine.getCSSContext(); v = value.getFloatValue(); - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, v * 10f / ctx.getPixelUnitToMillimeter()); + return new FloatValue(CSSUnit.CSS_NUMBER, v * 10f / ctx.getPixelUnitToMillimeter()); - case CSSPrimitiveValue.CSS_IN: + case CSSUnit.CSS_IN: ctx = engine.getCSSContext(); v = value.getFloatValue(); - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, v * 25.4f / ctx.getPixelUnitToMillimeter()); + return new FloatValue(CSSUnit.CSS_NUMBER, v * 25.4f / ctx.getPixelUnitToMillimeter()); - case CSSPrimitiveValue.CSS_PT: + case CSSUnit.CSS_PT: ctx = engine.getCSSContext(); v = value.getFloatValue(); - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, v * 25.4f / (72f * ctx.getPixelUnitToMillimeter())); + return new FloatValue(CSSUnit.CSS_NUMBER, v * 25.4f / (72f * ctx.getPixelUnitToMillimeter())); - case CSSPrimitiveValue.CSS_PC: + case CSSUnit.CSS_PC: ctx = engine.getCSSContext(); v = value.getFloatValue(); - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, (v * 25.4f / (6f * ctx.getPixelUnitToMillimeter()))); + return new FloatValue(CSSUnit.CSS_NUMBER, (v * 25.4f / (6f * ctx.getPixelUnitToMillimeter()))); - case CSSPrimitiveValue.CSS_EMS: + case CSSUnit.CSS_EM: sm.putFontSizeRelative(idx, true); v = value.getFloatValue(); int fsidx = engine.getFontSizeIndex(); - float fs; - fs = engine.getComputedStyle(elt, pseudo, fsidx).getFloatValue(); - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, v * fs); + Value cv = engine.getComputedStyle(elt, pseudo, fsidx); + float fs = lengthValue(cv); + return new FloatValue(CSSUnit.CSS_NUMBER, v * fs); - case CSSPrimitiveValue.CSS_EXS: + case CSSUnit.CSS_EX: sm.putFontSizeRelative(idx, true); v = value.getFloatValue(); fsidx = engine.getFontSizeIndex(); - fs = engine.getComputedStyle(elt, pseudo, fsidx).getFloatValue(); - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, v * fs * 0.5f); + cv = engine.getComputedStyle(elt, pseudo, fsidx); + fs = lengthValue(cv); + return new FloatValue(CSSUnit.CSS_NUMBER, v * fs * 0.5f); - case CSSPrimitiveValue.CSS_PERCENTAGE: + case CSSUnit.CSS_PERCENTAGE: ctx = engine.getCSSContext(); switch (getOrientation()) { case HORIZONTAL_ORIENTATION: @@ -204,8 +178,18 @@ public Value computeValue(CSSStylableElement elt, String pseudo, CSSEngine engin double h = ctx.getBlockHeight(elt); fs = (float) (value.getFloatValue() * (Math.sqrt(w * w + h * h) / SQRT2) / 100.0); } - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, fs); + return new FloatValue(CSSUnit.CSS_NUMBER, fs); + case CSSUnit.CSS_INVALID: + break; + default: + // 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_PX)); + } catch (DOMException e) { + } } + return value; } 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 7ea0db5b8..d6aabf205 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,111 +18,39 @@ */ package io.sf.carte.echosvg.css.engine.value; -import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSValue; - /** * This class represents a list of values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + * @author See Git history. * @version $Id$ */ -public class ListValue extends AbstractValue { - - /** - * The length of the list. - */ - protected int length; - - /** - * The items. - */ - protected Value[] items = new Value[5]; - - /** - * The list separator. - */ - protected char separator = ','; - +public class ListValue extends AbstractValueList { /** * Creates a ListValue. */ public ListValue() { + super(','); } /** * Creates a ListValue with the given separator. */ public ListValue(char s) { - separator = s; - } - - /** - * Returns the separator used for this list. - */ - public char getSeparatorChar() { - return separator; - } - - /** - * Implements {@link Value#getCssValueType()}. - */ - @Override - public short getCssValueType() { - return CSSValue.CSS_VALUE_LIST; - } - - /** - * A string representation of the current value. - */ - @Override - public String getCssText() { - StringBuilder sb = new StringBuilder(length * 8); - if (length > 0) { - sb.append(items[0].getCssText()); - } - for (int i = 1; i < length; i++) { - sb.append(separator); - sb.append(items[i].getCssText()); - } - return sb.toString(); - } - - /** - * Implements {@link Value#getLength()}. - */ - @Override - public int getLength() throws DOMException { - return length; - } - - /** - * Implements {@link Value#item(int)}. - */ - @Override - public Value item(int index) throws DOMException { - return items[index]; + super(s); } /** - * Returns a printable representation of this value. + * Creates a ListValue with the given separator. */ - @Override - public String toString() { - return getCssText(); + ListValue(char s, int initialCapacity) { + super(s, initialCapacity); } /** * Appends an item to the list. */ public void append(Value v) { - if (length == items.length) { - Value[] t = new Value[length * 2]; - System.arraycopy(items, 0, t, 0, length); - items = t; - } - items[length++] = v; + add(v); } } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/NumericValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/NumericValue.java new file mode 100644 index 000000000..24568e3b5 --- /dev/null +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/NumericValue.java @@ -0,0 +1,41 @@ +/* + + 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.CSSNumericValue; + +/** + * Base class for numeric values. + * + * @author See Git history. + * @version $Id$ + */ +public abstract class NumericValue extends AbstractValue implements CSSNumericValue { + + /** + * Creates a new value. + */ + public NumericValue() { + super(); + } + + @Override + public abstract NumericValue clone(); + +} 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 b1c86e4f5..b74456ef8 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 @@ -18,63 +18,81 @@ */ package io.sf.carte.echosvg.css.engine.value; +import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; +import java.util.Locale; + +import org.w3c.api.DOMSyntaxException; +import org.w3c.css.om.typed.CSSNumericValue; +import org.w3c.css.om.typed.CSSRGB; +import org.w3c.css.om.unit.CSSUnit; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; import io.sf.carte.echosvg.css.engine.value.svg.SVGValueConstants; /** - * This class represents RGB colors. + * RGB colors. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + * @author See Git history. * @version $Id$ */ -public class RGBColorValue extends AbstractValue { +public class RGBColorValue extends ColorValue implements CSSRGB { /** * The red component. */ - protected Value red; + private NumericValue red; /** * The green component. */ - protected Value green; + private NumericValue green; /** * The blue component. */ - protected Value blue; + private NumericValue blue; /** - * The alpha channel. + * Whether components were specified as percentages */ - protected Value alpha; + private transient boolean pcntSpecified; + + private transient boolean alphaPcntSpecified; /** * Creates a new, opaque RGBColorValue. + * + * @throws DOMSyntaxException if a supplied component is invalid. */ - public RGBColorValue(Value r, Value g, Value b) { + public RGBColorValue(NumericValue r, NumericValue g, NumericValue b) throws DOMSyntaxException { this(r, g, b, SVGValueConstants.NUMBER_1); } /** * Creates a new RGBColorValue. + * + * @throws DOMSyntaxException if a supplied component is invalid. */ - public RGBColorValue(Value r, Value g, Value b, Value a) { - red = r; - green = g; - blue = b; - alpha = a; + public RGBColorValue(NumericValue r, NumericValue g, NumericValue b, NumericValue a) + throws DOMSyntaxException { + super(a); + setR(r); + setG(g); + setB(b); + } + + void setSpecifiedAsPercentage(boolean spec) { + pcntSpecified = spec; + } + + void setAlphaSpecifiedAsPercentage(boolean spec) { + alphaPcntSpecified = spec; } - /** - * The type of the value. - */ @Override - public short getPrimitiveType() { - return CSSPrimitiveValue.CSS_RGBCOLOR; + public String getCSSColorSpace() { + return ColorValue.RGB_FUNCTION; } /** @@ -82,52 +100,189 @@ public short getPrimitiveType() { */ @Override public String getCssText() { - return toString(red.getCssText(), green.getCssText(), blue.getCssText(), alpha.getCssText()); + DecimalFormat df = null; + if (!pcntSpecified || !alphaPcntSpecified) { + DecimalFormatSymbols dfs = new DecimalFormatSymbols(Locale.ROOT); + df = new DecimalFormat("#.#", dfs); + df.setMinimumFractionDigits(0); + df.setMaximumFractionDigits(4); + } + + String sr = rgbComponentText(red, df); + String sg = rgbComponentText(green, df); + String sb = rgbComponentText(blue, df); + + StringBuilder buf = new StringBuilder(sr.length() + sg.length() + sb.length() + 16); + boolean opaque = isOpaque(); + if (opaque) { + buf.append("rgb("); + } else { + buf.append("rgba("); + } + buf.append(sr).append(", ").append(sg).append(", ").append(sb); + if (!opaque) { + buf.append(", ").append(alphaComponentText(alpha, df)); + } + buf.append(')'); + return buf.toString(); + } + + private String rgbComponentText(NumericValue comp, DecimalFormat df) { + if (pcntSpecified || comp.getCSSUnit() == CSSUnit.CSS_NUMBER) { + return comp.getCssText(); + } + + return df.format(comp.getFloatValue() * 2.55f); + } + + private String alphaComponentText(NumericValue alpha, DecimalFormat df) { + if (alphaPcntSpecified || alpha.getCSSUnit() == CSSUnit.CSS_NUMBER) { + return alpha.getCssText(); + } + + return df.format(alpha.getFloatValue() * 0.01f); + } + + @Override + public RGBColorValue getColorValue() { + return this; + } + + @Override + public NumericValue getR() { + return red; + } + + @Override + public NumericValue getG() { + return green; + } + + @Override + public NumericValue getB() { + return blue; } /** - * Implements {@link Value#getRed()}. + * Get the red component. + * + * @return the red component. */ - @Override - public Value getRed() throws DOMException { + public Value getRed() { return red; } /** - * Implements {@link Value#getGreen()}. + * Get the green component. + * + * @return the green component. */ - @Override - public Value getGreen() throws DOMException { + public Value getGreen() { return green; } /** - * Implements {@link Value#getBlue()}. + * Get the blue component. + * + * @return the blue component. */ - @Override - public Value getBlue() throws DOMException { + public Value getBlue() { return blue; } @Override - public Value getAlpha() throws DOMException { - return alpha; + public void setR(double r) { + red = new FloatValue(CSSUnit.CSS_PERCENTAGE, (float) r * 100); + pcntSpecified = true; + componentize(red); + componentChanged(red); + } + + @Override + public void setR(CSSNumericValue r) throws DOMSyntaxException { + red = component(r); + componentChanged(red); + pcntSpecified = red.getCSSUnit() == CSSUnit.CSS_PERCENTAGE; } /** - * Returns a printable representation of the color. + * Initialize a component of this value. + * + * @param c the component. + * @return the initialized component. + * @throws DOMSyntaxException if the value is inadequate for a component. */ + private NumericValue component(CSSNumericValue c) throws DOMSyntaxException { + NumericValue ch = (NumericValue) c; + if (ch.getCSSUnit() != CSSUnit.CSS_PERCENTAGE && ch.getCSSUnit() != CSSUnit.CSS_NUMBER) { + throw new DOMSyntaxException("RGB component must be a number or percentage, not a " + + CSSUnit.dimensionUnitString(ch.getCSSUnit()) + '.'); + } + if (ch.handler != null) { + ch = ch.clone(); + } + componentize(ch); + return ch; + } + @Override - public String toString() { - return getCssText(); + public void setG(double g) { + green = new FloatValue(CSSUnit.CSS_PERCENTAGE, (float) g * 100); + pcntSpecified = true; + componentize(green); + componentChanged(green); } - public static String toString(String red, String green, String blue, String alpha) { - if ("1".equals(alpha)) { - return "rgb(" + red + ", " + green + ", " + blue + ')'; - } else { - return "rgba(" + red + ", " + green + ", " + blue + ", " + alpha + ')'; + @Override + public void setG(CSSNumericValue g) throws DOMSyntaxException { + green = component(g); + componentChanged(green); + } + + @Override + public void setB(double b) { + blue = new FloatValue(CSSUnit.CSS_PERCENTAGE, (float) b * 100); + pcntSpecified = true; + componentize(blue); + componentChanged(blue); + } + + @Override + public void setB(CSSNumericValue b) throws DOMSyntaxException { + blue = component(b); + componentChanged(blue); + } + + @Override + public int getLength() throws DOMException { + return 4; + } + + @Override + public Value item(int index) throws DOMException { + switch (index) { + case 0: + return getR(); + case 1: + return getG(); + case 2: + return getB(); + case 3: + return getAlpha(); + default: + return null; + } + } + + @Override + public RGBColorValue clone() { + RGBColorValue clon; + try { + clon = new RGBColorValue(red, green, blue, alpha); + } catch (DOMSyntaxException e) { + clon = null; } + return clon; } } 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 9e54138a5..e816010c4 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 @@ -18,11 +18,11 @@ */ package io.sf.carte.echosvg.css.engine.value; +import org.w3c.css.om.unit.CSSUnit; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; -import org.w3c.dom.css.CSSValue; 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; @@ -31,8 +31,11 @@ /** * This class provides a manager for the property with support for rect values. * - * @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 RectManager extends LengthManager { @@ -88,17 +91,17 @@ private Value createRectComponent(LexicalUnit lu) throws DOMException { } break; case DIMENSION: - Value value = createLength(lu); + NumericValue value = createLength(lu); if (value != null) { return value; } break; case INTEGER: - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, lu.getIntegerValue()); + return new FloatValue(CSSUnit.CSS_NUMBER, lu.getIntegerValue()); case REAL: - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, lu.getFloatValue()); + return new FloatValue(CSSUnit.CSS_NUMBER, lu.getFloatValue()); case PERCENTAGE: - return new FloatValue(CSSPrimitiveValue.CSS_PERCENTAGE, lu.getFloatValue()); + return new FloatValue(CSSUnit.CSS_PERCENTAGE, lu.getFloatValue()); default: break; } @@ -112,13 +115,11 @@ private Value createRectComponent(LexicalUnit lu) throws DOMException { @Override public Value computeValue(CSSStylableElement elt, String pseudo, CSSEngine engine, int idx, StyleMap sm, Value value) { - if (value.getCssValueType() != CSSValue.CSS_PRIMITIVE_VALUE) { + if (value.getPrimitiveType() != Type.RECT) { return value; } - if (value.getPrimitiveType() != CSSPrimitiveValue.CSS_RECT) { - return value; - } - RectValue rect = (RectValue) value; + + RectValue rect = value.getRectValue(); orientation = VERTICAL_ORIENTATION; Value top = super.computeValue(elt, pseudo, engine, idx, sm, rect.getTop()); @@ -126,7 +127,8 @@ public Value computeValue(CSSStylableElement elt, String pseudo, CSSEngine engin orientation = HORIZONTAL_ORIENTATION; Value left = super.computeValue(elt, pseudo, engine, idx, sm, rect.getLeft()); Value right = super.computeValue(elt, pseudo, engine, idx, sm, rect.getRight()); - if (top != rect.getTop() || right != rect.getRight() || bottom != rect.getBottom() || left != rect.getLeft()) { + if (top != rect.getTop() || right != rect.getRight() || bottom != rect.getBottom() + || left != rect.getLeft()) { return new RectValue(top, right, bottom, left); } else { return value; 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 14f01aa9b..9505cba4a 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 @@ -18,17 +18,22 @@ */ package io.sf.carte.echosvg.css.engine.value; +import org.w3c.api.DOMSyntaxException; +import org.w3c.css.om.typed.CSSRectValue; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; + +import org.w3c.css.om.unit.CSSUnit; /** * This class represents CSS rect values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ -public class RectValue extends AbstractValue { +public class RectValue extends ComponentValue implements CSSRectValue { /** * The top value. @@ -54,18 +59,18 @@ public class RectValue extends AbstractValue { * Creates a new Rect value. */ public RectValue(Value t, Value r, Value b, Value l) { - top = t; - right = r; - bottom = b; - left = l; + setTop(t); + setRight(r); + setBottom(b); + setLeft(l); } /** * The type of the value. */ @Override - public short getPrimitiveType() { - return CSSPrimitiveValue.CSS_RECT; + public Type getPrimitiveType() { + return Type.RECT; } /** @@ -77,44 +82,94 @@ public String getCssText() { + left.getCssText() + ')'; } - /** - * Implements {@link Value#getTop()}. - */ @Override public Value getTop() throws DOMException { return top; } - /** - * Implements {@link Value#getRight()}. - */ @Override public Value getRight() throws DOMException { return right; } - /** - * Implements {@link Value#getBottom()}. - */ @Override public Value getBottom() throws DOMException { return bottom; } - /** - * Implements {@link Value#getLeft()}. - */ @Override public Value getLeft() throws DOMException { return left; } + void setTop(Value top) { + this.top = component(top); + } + /** - * Returns a printable representation of this value. + * Initialize a component of this value. + * + * @param c the component. + * @return the initialized component. + * @throws DOMSyntaxException if the value is inadequate for a component. */ + Value component(Value c) throws DOMSyntaxException { + short unit = c.getCSSUnit(); + 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."); + } + + if (c.getModificationHandler() != null) { + c = ((AbstractValue) c).clone(); + } + componentize(c); + + return c; + } + + void setRight(Value right) { + this.right = component(right); + } + + void setBottom(Value bottom) { + this.bottom = component(bottom); + } + + void setLeft(Value left) { + this.left = component(left); + } + + @Override + public RectValue getRectValue() throws DOMException { + return this; + } + + @Override + public int getLength() throws DOMException { + return 4; + } + + @Override + public Value item(int index) throws DOMException { + switch (index) { + case 0: + return getTop(); + case 1: + return getRight(); + case 2: + return getBottom(); + case 3: + return getLeft(); + default: + return null; + } + } + @Override - public String toString() { - return getCssText(); + public RectValue clone() { + RectValue clon = new RectValue(top, right, bottom, left); + return clon; } } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/StringValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/StringValue.java index 478fab143..47706e301 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/StringValue.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/StringValue.java @@ -18,64 +18,44 @@ */ package io.sf.carte.echosvg.css.engine.value; -import java.util.Objects; +import org.w3c.css.om.typed.CSSStringValue; -import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; +import io.sf.carte.doc.style.css.parser.ParseHelper; /** * This class represents string values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ -public class StringValue extends AbstractValue { - - /** - * Returns the CSS text associated with the given type/value pair. - */ - public static String getCssText(short type, String value) { - switch (type) { - case CSSPrimitiveValue.CSS_URI: - return "url(" + value + ')'; - - case CSSPrimitiveValue.CSS_STRING: - char q = (value.indexOf('"') != -1) ? '\'' : '"'; - return q + value + q; - } - return value; - } - - /** - * The value of the string - */ - protected String value; - - /** - * The unit type - */ - protected short unitType; +public class StringValue extends AbstractStringValue implements CSSStringValue { /** * Creates a new StringValue. */ - public StringValue(short type, String s) { - unitType = type; - value = s; + public StringValue(String s) { + super(s); } /** * The type of the value. */ @Override - public short getPrimitiveType() { - return unitType; + public Type getPrimitiveType() { + return Type.STRING; + } + + @Override + public String getStringValue() { + return value; } @Override - public int hashCode() { - return Objects.hash(unitType, value); + public String getURIValue() { + return value; } /** @@ -85,14 +65,11 @@ public int hashCode() { */ @Override public boolean equals(Object obj) { - if (obj == null || !(obj instanceof StringValue)) { + if (obj == null || !(obj instanceof Value)) { return false; } - StringValue v = (StringValue) obj; - if (unitType != v.unitType) { - return false; - } - return value.equals(v.value); + Value v = (Value) obj; + return v.getPrimitiveType() == Type.STRING && value.equals(v.getStringValue()); } /** @@ -100,26 +77,12 @@ public boolean equals(Object obj) { */ @Override public String getCssText() { - return getCssText(unitType, value); - } - - /** - * This method is used to get the string value. - * - * @exception DOMException INVALID_ACCESS_ERR: Raised if the value doesn't - * contain a string value. - */ - @Override - public String getStringValue() throws DOMException { - return value; + return ParseHelper.quote(value, '\''); } - /** - * Returns a printable representation of this value. - */ @Override - public String toString() { - return getCssText(); + public StringValue clone() { + return new StringValue(value); } } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/URIValue.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/URIValue.java index 130501e11..000614ece 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/URIValue.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/URIValue.java @@ -18,27 +18,56 @@ */ package io.sf.carte.echosvg.css.engine.value; -import org.w3c.dom.css.CSSPrimitiveValue; +import org.w3c.css.om.typed.CSSStringValue; /** - * This class represents uri values. + * This class represents URI values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ -public class URIValue extends StringValue { +public class URIValue extends AbstractStringValue implements CSSStringValue { - String cssText; + private String cssText; /** - * Creates a new StringValue. + * Creates a new URIValue. */ - public URIValue(String cssText, String uri) { - super(CSSPrimitiveValue.CSS_URI, uri); + public URIValue(String cssText, String s) { + super(s); this.cssText = cssText; } + /** + * The type of the value. + */ + @Override + public Type getPrimitiveType() { + return Type.URI; + } + + @Override + public String getURIValue() { + return value; + } + + /** + * Indicates whether some other object is "equal to" this one. + * + * @param obj the reference object with which to compare. + */ + @Override + public boolean equals(Object obj) { + if (obj == null || !(obj instanceof Value)) { + return false; + } + Value v = (Value) obj; + return v.getPrimitiveType() == Type.URI && value.equals(v.getURIValue()); + } + /** * A string representation of the current value. */ @@ -47,4 +76,9 @@ public String getCssText() { return "url(" + cssText + ')'; } + @Override + public URIValue clone() { + return new URIValue(cssText, value); + } + } 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 f0ec16a1f..f0b961e7c 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 @@ -18,153 +18,98 @@ */ package io.sf.carte.echosvg.css.engine.value; +import org.w3c.css.om.typed.CSSCounterValue; import org.w3c.dom.DOMException; +import io.sf.carte.echosvg.css.dom.CSSValue; + /** * This interface represents a property value. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + * @author See Git history. * @version $Id$ */ -public interface Value { - - /** - * A string representation of the current value. - */ - String getCssText(); - - /** - * A code defining the type of the value. - */ - short getCssValueType(); - - /** - * The type of the value. - */ - short getPrimitiveType(); - - /** - * This method is used to get the float value. - * - * @exception DOMException INVALID_ACCESS_ERR: Raised if the value doesn't - * contain a float value. - */ - float getFloatValue() throws DOMException; - - /** - * This method is used to get the string value. - * - * @exception DOMException INVALID_ACCESS_ERR: Raised if the value doesn't - * contain a string value. - */ - String getStringValue() throws DOMException; - - /** - * The red value of the RGB color. - * - * @exception DOMException INVALID_ACCESS_ERR: Raised if the value doesn't - * contain a RGB color value. - */ - Value getRed() throws DOMException; - - /** - * The green value of the RGB color. - * - * @exception DOMException INVALID_ACCESS_ERR: Raised if the value doesn't - * contain a RGB color value. - */ - Value getGreen() throws DOMException; - - /** - * The blue value of the RGB color. - * - * @exception DOMException INVALID_ACCESS_ERR: Raised if the value doesn't - * contain a RGB color value. - */ - Value getBlue() throws DOMException; - - /** - * The alpha channel value of the RGBA color. - * - * @exception DOMException INVALID_ACCESS_ERR: Raised if the value doesn't - * contain a RGB color value. - */ - Value getAlpha() throws DOMException; +public interface Value extends CSSValue { /** - * The number of CSSValues in the list. The range of valid values - * of the indices is 0 to length-1 inclusive. + * Convenience method that either returns an identifier or throws an exception. * * @exception DOMException INVALID_ACCESS_ERR: Raised if the value doesn't - * contain a list value. + * contain an identifier value. + * @Deprecated use {@link #getgetIdentifierValue()} instead. */ - int getLength() throws DOMException; + @Deprecated + default String getIdentifier() throws DOMException { + return getIdentifierValue(); + } /** - * Used to retrieve a rule by ordinal index. + * 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. * - * @return The style rule at the index position in the list, or - * null if that is not a valid index. - * @exception DOMException INVALID_ACCESS_ERR: Raised if the value doesn't - * contain a list value. + * @param index the index on the list. + * @return the item, or {@code null} if there is no item on that index. */ - Value item(int index) throws DOMException; + @Override + default Value item(int index) { + return index == 0 ? this : null; + } /** - * The top value of the rect. + * If this value is a counter() or counters() value, get it. * - * @exception DOMException INVALID_ACCESS_ERR: Raised if the value doesn't - * contain a Rect value. + * @return the counter() value. + * @throws DOMException INVALID_ACCESS_ERR if this is not a counter() or + * counters() value. */ - Value getTop() throws DOMException; + CSSCounterValue getCounterValue() throws DOMException; /** - * The right value of the rect. + * If this value is a rect() value, get it. * - * @exception DOMException INVALID_ACCESS_ERR: Raised if the value doesn't - * contain a Rect value. + * @return the rect() value. + * @throws DOMException INVALID_ACCESS_ERR if this is not a rect() value. */ - Value getRight() throws DOMException; + RectValue getRectValue() throws DOMException; /** - * The bottom value of the rect. + * If this value is a color value, get it. * - * @exception DOMException INVALID_ACCESS_ERR: Raised if the value doesn't - * contain a Rect value. + * @return the color value. + * @throws DOMException INVALID_ACCESS_ERR if this is not a color value. */ - Value getBottom() throws DOMException; + ColorValue getColorValue() throws DOMException; /** - * The left value of the rect. + * If this value is a unit value, set the float value. * - * @exception DOMException INVALID_ACCESS_ERR: Raised if the value doesn't - * contain a Rect value. + * @param value the new value, in the current unit. + * @throws DOMException if the value is not a unit value. */ - Value getLeft() throws DOMException; + void setFloatValue(float value) throws DOMException; /** - * The identifier value of the counter. + * Set the modification handler. * - * @exception DOMException INVALID_ACCESS_ERR: Raised if the value doesn't - * contain a Counter value. + * @param handler the modification handler. */ - String getIdentifier() throws DOMException; + void setModificationHandler(ValueModificationHandler handler); /** - * The listStyle value of the counter. + * Get the modification handler. * - * @exception DOMException INVALID_ACCESS_ERR: Raised if the value doesn't - * contain a Counter value. + * @return the modification handler, or {@code null} if there is no handler. */ - String getListStyle() throws DOMException; + ValueModificationHandler getModificationHandler(); /** - * The separator value of the counter. + * Is this value a component? * - * @exception DOMException INVALID_ACCESS_ERR: Raised if the value doesn't - * contain a Counter value. + * @return {@code true} if the value is a component. */ - String getSeparator() throws DOMException; + default boolean isComponent() { + return false; + } } 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 0f39fb26d..da510bb64 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 @@ -18,15 +18,16 @@ */ package io.sf.carte.echosvg.css.engine.value; -import org.w3c.dom.css.CSSPrimitiveValue; - +import org.w3c.css.om.unit.CSSUnit; import io.sf.carte.echosvg.util.CSSConstants; /** * This interface defines constants for CSS values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public interface ValueConstants { @@ -34,67 +35,67 @@ public interface ValueConstants { /** * 0 */ - Value NUMBER_0 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 0); + NumericValue NUMBER_0 = new FloatValue(CSSUnit.CSS_NUMBER, 0); /** * 100 */ - Value NUMBER_100 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 100); + NumericValue NUMBER_100 = new FloatValue(CSSUnit.CSS_NUMBER, 100); /** * 128 */ - Value NUMBER_128 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 128); + NumericValue NUMBER_128 = new FloatValue(CSSUnit.CSS_NUMBER, 128); /** * 192 */ - Value NUMBER_192 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 192); + NumericValue NUMBER_192 = new FloatValue(CSSUnit.CSS_NUMBER, 192); /** * 200 */ - Value NUMBER_200 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 200); + NumericValue NUMBER_200 = new FloatValue(CSSUnit.CSS_NUMBER, 200); /** * 255 */ - Value NUMBER_255 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 255); + NumericValue NUMBER_255 = new FloatValue(CSSUnit.CSS_NUMBER, 255); /** * 300 */ - Value NUMBER_300 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 300); + NumericValue NUMBER_300 = new FloatValue(CSSUnit.CSS_NUMBER, 300); /** * 400 */ - Value NUMBER_400 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 400); + NumericValue NUMBER_400 = new FloatValue(CSSUnit.CSS_NUMBER, 400); /** * 500 */ - Value NUMBER_500 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 500); + NumericValue NUMBER_500 = new FloatValue(CSSUnit.CSS_NUMBER, 500); /** * 600 */ - Value NUMBER_600 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 600); + NumericValue NUMBER_600 = new FloatValue(CSSUnit.CSS_NUMBER, 600); /** * 700 */ - Value NUMBER_700 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 700); + NumericValue NUMBER_700 = new FloatValue(CSSUnit.CSS_NUMBER, 700); /** * 800 */ - Value NUMBER_800 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 800); + NumericValue NUMBER_800 = new FloatValue(CSSUnit.CSS_NUMBER, 800); /** * 900 */ - Value NUMBER_900 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 900); + NumericValue NUMBER_900 = new FloatValue(CSSUnit.CSS_NUMBER, 900); /** * The 'inherit' value. @@ -104,648 +105,642 @@ public interface ValueConstants { /** * The 'all' keyword. */ - Value ALL_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_ALL_VALUE); + Value ALL_VALUE = new IdentValue(CSSConstants.CSS_ALL_VALUE); /** * The 'auto' keyword. */ - Value AUTO_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_AUTO_VALUE); + Value AUTO_VALUE = new IdentValue(CSSConstants.CSS_AUTO_VALUE); /** * The 'bidi-override' keyword. */ - Value BIDI_OVERRIDE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_BIDI_OVERRIDE_VALUE); + Value BIDI_OVERRIDE_VALUE = new IdentValue(CSSConstants.CSS_BIDI_OVERRIDE_VALUE); /** * The 'blink' keyword. */ - Value BLINK_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_BLINK_VALUE); + Value BLINK_VALUE = new IdentValue(CSSConstants.CSS_BLINK_VALUE); /** * The 'block' keyword. */ - Value BLOCK_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_BLOCK_VALUE); + Value BLOCK_VALUE = new IdentValue(CSSConstants.CSS_BLOCK_VALUE); /** * The 'bold' keyword. */ - Value BOLD_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_BOLD_VALUE); + Value BOLD_VALUE = new IdentValue(CSSConstants.CSS_BOLD_VALUE); /** * The 'bolder' keyword. */ - Value BOLDER_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_BOLDER_VALUE); + Value BOLDER_VALUE = new IdentValue(CSSConstants.CSS_BOLDER_VALUE); /** * The 'bottom' keyword. */ - Value BOTTOM_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_BOTTOM_VALUE); + Value BOTTOM_VALUE = new IdentValue(CSSConstants.CSS_BOTTOM_VALUE); /** * The 'collapse' keyword. */ - Value COLLAPSE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_COLLAPSE_VALUE); + Value COLLAPSE_VALUE = new IdentValue(CSSConstants.CSS_COLLAPSE_VALUE); /** * The 'compact' keyword. */ - Value COMPACT_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_COMPACT_VALUE); + Value COMPACT_VALUE = new IdentValue(CSSConstants.CSS_COMPACT_VALUE); /** * The 'condensed' keyword. */ - Value CONDENSED_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_CONDENSED_VALUE); + Value CONDENSED_VALUE = new IdentValue(CSSConstants.CSS_CONDENSED_VALUE); /** * The 'crispedges' keyword. */ - Value CRISPEDGES_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_CRISPEDGES_VALUE); + Value CRISPEDGES_VALUE = new IdentValue(CSSConstants.CSS_CRISPEDGES_VALUE); /** * The 'crosshair' keyword. */ - Value CROSSHAIR_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_CROSSHAIR_VALUE); + Value CROSSHAIR_VALUE = new IdentValue(CSSConstants.CSS_CROSSHAIR_VALUE); /** * The 'cursive' keyword. */ - Value CURSIVE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_CURSIVE_VALUE); + Value CURSIVE_VALUE = new IdentValue(CSSConstants.CSS_CURSIVE_VALUE); /** * The 'default' keyword. */ - Value DEFAULT_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_DEFAULT_VALUE); + Value DEFAULT_VALUE = new IdentValue(CSSConstants.CSS_DEFAULT_VALUE); /** * The 'e-resize' keyword. */ - Value E_RESIZE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_E_RESIZE_VALUE); + Value E_RESIZE_VALUE = new IdentValue(CSSConstants.CSS_E_RESIZE_VALUE); /** * The 'embed' keyword. */ - Value EMBED_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_EMBED_VALUE); + Value EMBED_VALUE = new IdentValue(CSSConstants.CSS_EMBED_VALUE); /** * The 'expanded' keyword. */ - Value EXPANDED_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_EXPANDED_VALUE); + Value EXPANDED_VALUE = new IdentValue(CSSConstants.CSS_EXPANDED_VALUE); /** * The 'extra-condensed' keyword. */ - Value EXTRA_CONDENSED_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_EXTRA_CONDENSED_VALUE); + Value EXTRA_CONDENSED_VALUE = new IdentValue(CSSConstants.CSS_EXTRA_CONDENSED_VALUE); /** * The 'extra-expanded' keyword. */ - Value EXTRA_EXPANDED_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_EXTRA_EXPANDED_VALUE); + Value EXTRA_EXPANDED_VALUE = new IdentValue(CSSConstants.CSS_EXTRA_EXPANDED_VALUE); /** * The 'fantasy' keyword. */ - Value FANTASY_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_FANTASY_VALUE); + Value FANTASY_VALUE = new IdentValue(CSSConstants.CSS_FANTASY_VALUE); /** * The 'help' keyword. */ - Value HELP_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_HELP_VALUE); + Value HELP_VALUE = new IdentValue(CSSConstants.CSS_HELP_VALUE); /** * The 'hidden' keyword. */ - Value HIDDEN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_HIDDEN_VALUE); + Value HIDDEN_VALUE = new IdentValue(CSSConstants.CSS_HIDDEN_VALUE); /** * The 'inline' keyword. */ - Value INLINE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_INLINE_VALUE); + Value INLINE_VALUE = new IdentValue(CSSConstants.CSS_INLINE_VALUE); /** * The 'inline-block' keyword. */ - Value INLINE_BLOCK_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_INLINE_BLOCK_VALUE); + Value INLINE_BLOCK_VALUE = new IdentValue(CSSConstants.CSS_INLINE_BLOCK_VALUE); /** * The 'inline-table' keyword. */ - Value INLINE_TABLE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_INLINE_TABLE_VALUE); + Value INLINE_TABLE_VALUE = new IdentValue(CSSConstants.CSS_INLINE_TABLE_VALUE); /** * The 'italic' keyword. */ - Value ITALIC_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_ITALIC_VALUE); + Value ITALIC_VALUE = new IdentValue(CSSConstants.CSS_ITALIC_VALUE); /** * The 'large' keyword. */ - Value LARGE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LARGE_VALUE); + Value LARGE_VALUE = new IdentValue(CSSConstants.CSS_LARGE_VALUE); /** * The 'larger' keyword. */ - Value LARGER_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LARGER_VALUE); + Value LARGER_VALUE = new IdentValue(CSSConstants.CSS_LARGER_VALUE); /** * The 'lighter' keyword. */ - Value LIGHTER_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LIGHTER_VALUE); + Value LIGHTER_VALUE = new IdentValue(CSSConstants.CSS_LIGHTER_VALUE); /** * The 'line_through' keyword. */ - Value LINE_THROUGH_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LINE_THROUGH_VALUE); + Value LINE_THROUGH_VALUE = new IdentValue(CSSConstants.CSS_LINE_THROUGH_VALUE); /** * The 'list-item' keyword. */ - Value LIST_ITEM_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LIST_ITEM_VALUE); + Value LIST_ITEM_VALUE = new IdentValue(CSSConstants.CSS_LIST_ITEM_VALUE); /** * The 'ltr' keyword. */ - Value LTR_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LTR_VALUE); + Value LTR_VALUE = new IdentValue(CSSConstants.CSS_LTR_VALUE); /** * The 'marker' keyword. */ - Value MARKER_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_MARKER_VALUE); + Value MARKER_VALUE = new IdentValue(CSSConstants.CSS_MARKER_VALUE); /** * The 'medium' keyword. */ - Value MEDIUM_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_MEDIUM_VALUE); + Value MEDIUM_VALUE = new IdentValue(CSSConstants.CSS_MEDIUM_VALUE); /** * The 'monospaced' keyword. */ - Value MONOSPACE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_MONOSPACE_VALUE); + Value MONOSPACE_VALUE = new IdentValue(CSSConstants.CSS_MONOSPACE_VALUE); /** * The 'move' keyword. */ - Value MOVE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_MOVE_VALUE); + Value MOVE_VALUE = new IdentValue(CSSConstants.CSS_MOVE_VALUE); /** * The 'n-resize' keyword. */ - Value N_RESIZE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_N_RESIZE_VALUE); + Value N_RESIZE_VALUE = new IdentValue(CSSConstants.CSS_N_RESIZE_VALUE); /** * The 'narrower' keyword. */ - Value NARROWER_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_NARROWER_VALUE); + Value NARROWER_VALUE = new IdentValue(CSSConstants.CSS_NARROWER_VALUE); /** * The 'ne-resize' keyword. */ - Value NE_RESIZE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_NE_RESIZE_VALUE); + Value NE_RESIZE_VALUE = new IdentValue(CSSConstants.CSS_NE_RESIZE_VALUE); /** * The 'nw-resize' keyword. */ - Value NW_RESIZE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_NW_RESIZE_VALUE); + Value NW_RESIZE_VALUE = new IdentValue(CSSConstants.CSS_NW_RESIZE_VALUE); /** * The 'none' keyword. */ - Value NONE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_NONE_VALUE); + Value NONE_VALUE = new IdentValue(CSSConstants.CSS_NONE_VALUE); /** * The 'normal' keyword. */ - Value NORMAL_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_NORMAL_VALUE); + Value NORMAL_VALUE = new IdentValue(CSSConstants.CSS_NORMAL_VALUE); /** * The 'oblique' keyword. */ - Value OBLIQUE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_OBLIQUE_VALUE); + Value OBLIQUE_VALUE = new IdentValue(CSSConstants.CSS_OBLIQUE_VALUE); /** * The 'overline' keyword. */ - Value OVERLINE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_OVERLINE_VALUE); + Value OVERLINE_VALUE = new IdentValue(CSSConstants.CSS_OVERLINE_VALUE); /** * The 'pointer' keyword. */ - Value POINTER_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_POINTER_VALUE); + Value POINTER_VALUE = new IdentValue(CSSConstants.CSS_POINTER_VALUE); /** * The 'painted' keyword. */ - Value PAINTED_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_PAINTED_VALUE); + Value PAINTED_VALUE = new IdentValue(CSSConstants.CSS_PAINTED_VALUE); /** * The 'rtl' keyword. */ - Value RTL_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_RTL_VALUE); + Value RTL_VALUE = new IdentValue(CSSConstants.CSS_RTL_VALUE); /** * The 'run-in' keyword. */ - Value RUN_IN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_RUN_IN_VALUE); + Value RUN_IN_VALUE = new IdentValue(CSSConstants.CSS_RUN_IN_VALUE); /** * The 's-resize' keyword. */ - Value S_RESIZE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_S_RESIZE_VALUE); + Value S_RESIZE_VALUE = new IdentValue(CSSConstants.CSS_S_RESIZE_VALUE); /** * The 'sans-serif' keyword. */ - Value SANS_SERIF_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SANS_SERIF_VALUE); + Value SANS_SERIF_VALUE = new IdentValue(CSSConstants.CSS_SANS_SERIF_VALUE); /** * The 'scroll' keyword. */ - Value SCROLL_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SCROLL_VALUE); + Value SCROLL_VALUE = new IdentValue(CSSConstants.CSS_SCROLL_VALUE); /** * The 'se-resize' keyword. */ - Value SE_RESIZE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SE_RESIZE_VALUE); + Value SE_RESIZE_VALUE = new IdentValue(CSSConstants.CSS_SE_RESIZE_VALUE); /** * The 'semi-condensed' keyword. */ - Value SEMI_CONDENSED_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SEMI_CONDENSED_VALUE); + Value SEMI_CONDENSED_VALUE = new IdentValue(CSSConstants.CSS_SEMI_CONDENSED_VALUE); /** * The 'semi-expanded' keyword. */ - Value SEMI_EXPANDED_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SEMI_EXPANDED_VALUE); + Value SEMI_EXPANDED_VALUE = new IdentValue(CSSConstants.CSS_SEMI_EXPANDED_VALUE); /** * The 'serif' keyword. */ - Value SERIF_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SERIF_VALUE); + Value SERIF_VALUE = new IdentValue(CSSConstants.CSS_SERIF_VALUE); /** * The 'small' keyword. */ - Value SMALL_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SMALL_VALUE); + Value SMALL_VALUE = new IdentValue(CSSConstants.CSS_SMALL_VALUE); /** * The 'small-caps' keyword. */ - Value SMALL_CAPS_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SMALL_CAPS_VALUE); + Value SMALL_CAPS_VALUE = new IdentValue(CSSConstants.CSS_SMALL_CAPS_VALUE); /** * The 'smaller' keyword. */ - Value SMALLER_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SMALLER_VALUE); + Value SMALLER_VALUE = new IdentValue(CSSConstants.CSS_SMALLER_VALUE); /** * The 'stroke' keyword. */ - Value STROKE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_STROKE_VALUE); + Value STROKE_VALUE = new IdentValue(CSSConstants.CSS_STROKE_VALUE); /** * The 'sw-resize' keyword. */ - Value SW_RESIZE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SW_RESIZE_VALUE); + Value SW_RESIZE_VALUE = new IdentValue(CSSConstants.CSS_SW_RESIZE_VALUE); /** * The 'table' keyword. */ - Value TABLE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_TABLE_VALUE); + Value TABLE_VALUE = new IdentValue(CSSConstants.CSS_TABLE_VALUE); /** * The 'table-caption' keyword. */ - Value TABLE_CAPTION_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_TABLE_CAPTION_VALUE); + Value TABLE_CAPTION_VALUE = new IdentValue(CSSConstants.CSS_TABLE_CAPTION_VALUE); /** * The 'table-cell' keyword. */ - Value TABLE_CELL_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_TABLE_CELL_VALUE); + Value TABLE_CELL_VALUE = new IdentValue(CSSConstants.CSS_TABLE_CELL_VALUE); /** * The 'table-column' keyword. */ - Value TABLE_COLUMN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_TABLE_COLUMN_VALUE); + Value TABLE_COLUMN_VALUE = new IdentValue(CSSConstants.CSS_TABLE_COLUMN_VALUE); /** * The 'table-column-group' keyword. */ - Value TABLE_COLUMN_GROUP_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, - CSSConstants.CSS_TABLE_COLUMN_GROUP_VALUE); + Value TABLE_COLUMN_GROUP_VALUE = new IdentValue(CSSConstants.CSS_TABLE_COLUMN_GROUP_VALUE); /** * The 'table-footer-group' keyword. */ - Value TABLE_FOOTER_GROUP_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, - CSSConstants.CSS_TABLE_FOOTER_GROUP_VALUE); + Value TABLE_FOOTER_GROUP_VALUE = new IdentValue(CSSConstants.CSS_TABLE_FOOTER_GROUP_VALUE); /** * The 'table-header-group' keyword. */ - Value TABLE_HEADER_GROUP_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, - CSSConstants.CSS_TABLE_HEADER_GROUP_VALUE); + Value TABLE_HEADER_GROUP_VALUE = new IdentValue(CSSConstants.CSS_TABLE_HEADER_GROUP_VALUE); /** * The 'table-row' keyword. */ - Value TABLE_ROW_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_TABLE_ROW_VALUE); + Value TABLE_ROW_VALUE = new IdentValue(CSSConstants.CSS_TABLE_ROW_VALUE); /** * The 'table-row-group' keyword. */ - Value TABLE_ROW_GROUP_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_TABLE_ROW_GROUP_VALUE); + Value TABLE_ROW_GROUP_VALUE = new IdentValue(CSSConstants.CSS_TABLE_ROW_GROUP_VALUE); /** * The 'text' keyword. */ - Value TEXT_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_TEXT_VALUE); + Value TEXT_VALUE = new IdentValue(CSSConstants.CSS_TEXT_VALUE); /** * The 'ultra-condensed' keyword. */ - Value ULTRA_CONDENSED_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_ULTRA_CONDENSED_VALUE); + Value ULTRA_CONDENSED_VALUE = new IdentValue(CSSConstants.CSS_ULTRA_CONDENSED_VALUE); /** * The 'ultra-expanded' keyword. */ - Value ULTRA_EXPANDED_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_ULTRA_EXPANDED_VALUE); + Value ULTRA_EXPANDED_VALUE = new IdentValue(CSSConstants.CSS_ULTRA_EXPANDED_VALUE); /** * The 'top' keyword. */ - Value TOP_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_TOP_VALUE); + Value TOP_VALUE = new IdentValue(CSSConstants.CSS_TOP_VALUE); /** * The 'underline' keyword. */ - Value UNDERLINE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_UNDERLINE_VALUE); + Value UNDERLINE_VALUE = new IdentValue(CSSConstants.CSS_UNDERLINE_VALUE); /** * The 'visible' keyword. */ - Value VISIBLE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_VISIBLE_VALUE); + Value VISIBLE_VALUE = new IdentValue(CSSConstants.CSS_VISIBLE_VALUE); /** * The 'w-resize' keyword. */ - Value W_RESIZE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_W_RESIZE_VALUE); + Value W_RESIZE_VALUE = new IdentValue(CSSConstants.CSS_W_RESIZE_VALUE); /** * The 'wait' keyword. */ - Value WAIT_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_WAIT_VALUE); + Value WAIT_VALUE = new IdentValue(CSSConstants.CSS_WAIT_VALUE); /** * The 'wider' keyword. */ - Value WIDER_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_WIDER_VALUE); + Value WIDER_VALUE = new IdentValue(CSSConstants.CSS_WIDER_VALUE); /** * The 'x-large' keyword. */ - Value X_LARGE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_X_LARGE_VALUE); + Value X_LARGE_VALUE = new IdentValue(CSSConstants.CSS_X_LARGE_VALUE); /** * The 'x-small' keyword. */ - Value X_SMALL_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_X_SMALL_VALUE); + Value X_SMALL_VALUE = new IdentValue(CSSConstants.CSS_X_SMALL_VALUE); /** * The 'xx-large' keyword. */ - Value XX_LARGE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_XX_LARGE_VALUE); + Value XX_LARGE_VALUE = new IdentValue(CSSConstants.CSS_XX_LARGE_VALUE); /** * The 'xx-small' keyword. */ - Value XX_SMALL_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_XX_SMALL_VALUE); + Value XX_SMALL_VALUE = new IdentValue(CSSConstants.CSS_XX_SMALL_VALUE); /** * The 'aqua' color name. */ - Value AQUA_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_AQUA_VALUE); + Value AQUA_VALUE = new IdentValue(CSSConstants.CSS_AQUA_VALUE); /** * The 'black' color name. */ - Value BLACK_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_BLACK_VALUE); + Value BLACK_VALUE = new IdentValue(CSSConstants.CSS_BLACK_VALUE); /** * The 'blue' color name. */ - Value BLUE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_BLUE_VALUE); + Value BLUE_VALUE = new IdentValue(CSSConstants.CSS_BLUE_VALUE); /** * The 'fuchsia' color name. */ - Value FUCHSIA_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_FUCHSIA_VALUE); + Value FUCHSIA_VALUE = new IdentValue(CSSConstants.CSS_FUCHSIA_VALUE); /** * The 'gray' color name. */ - Value GRAY_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_GRAY_VALUE); + Value GRAY_VALUE = new IdentValue(CSSConstants.CSS_GRAY_VALUE); /** * The 'green' color name. */ - Value GREEN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_GREEN_VALUE); + Value GREEN_VALUE = new IdentValue(CSSConstants.CSS_GREEN_VALUE); /** * The 'lime' color name. */ - Value LIME_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LIME_VALUE); + Value LIME_VALUE = new IdentValue(CSSConstants.CSS_LIME_VALUE); /** * The 'maroon' color name. */ - Value MAROON_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_MAROON_VALUE); + Value MAROON_VALUE = new IdentValue(CSSConstants.CSS_MAROON_VALUE); /** * The 'navy' color name. */ - Value NAVY_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_NAVY_VALUE); + Value NAVY_VALUE = new IdentValue(CSSConstants.CSS_NAVY_VALUE); /** * The 'olive' color name. */ - Value OLIVE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_OLIVE_VALUE); + Value OLIVE_VALUE = new IdentValue(CSSConstants.CSS_OLIVE_VALUE); /** * The 'purple' color name. */ - Value PURPLE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_PURPLE_VALUE); + Value PURPLE_VALUE = new IdentValue(CSSConstants.CSS_PURPLE_VALUE); /** * The 'red' color name. */ - Value RED_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_RED_VALUE); + Value RED_VALUE = new IdentValue(CSSConstants.CSS_RED_VALUE); /** * The 'silver' color name. */ - Value SILVER_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SILVER_VALUE); + Value SILVER_VALUE = new IdentValue(CSSConstants.CSS_SILVER_VALUE); /** * The 'teal' color name. */ - Value TEAL_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_TEAL_VALUE); + Value TEAL_VALUE = new IdentValue(CSSConstants.CSS_TEAL_VALUE); /** * The 'transparent' color name. */ - Value TRANSPARENT_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_TRANSPARENT_VALUE); + Value TRANSPARENT_VALUE = new IdentValue(CSSConstants.CSS_TRANSPARENT_VALUE); /** * The 'white' color name. */ - Value WHITE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_WHITE_VALUE); + Value WHITE_VALUE = new IdentValue(CSSConstants.CSS_WHITE_VALUE); /** * The 'yellow' color name. */ - Value YELLOW_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_YELLOW_VALUE); + Value YELLOW_VALUE = new IdentValue(CSSConstants.CSS_YELLOW_VALUE); /** * The 'ACTIVEBORDER' color name. */ - Value ACTIVEBORDER_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_ACTIVEBORDER_VALUE); + Value ACTIVEBORDER_VALUE = new IdentValue(CSSConstants.CSS_ACTIVEBORDER_VALUE); /** * The 'ACTIVECAPTION' color name. */ - Value ACTIVECAPTION_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_ACTIVECAPTION_VALUE); + Value ACTIVECAPTION_VALUE = new IdentValue(CSSConstants.CSS_ACTIVECAPTION_VALUE); /** * The 'APPWORKSPACE' color name. */ - Value APPWORKSPACE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_APPWORKSPACE_VALUE); + Value APPWORKSPACE_VALUE = new IdentValue(CSSConstants.CSS_APPWORKSPACE_VALUE); /** * The 'BACKGROUND' color name. */ - Value BACKGROUND_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_BACKGROUND_VALUE); + Value BACKGROUND_VALUE = new IdentValue(CSSConstants.CSS_BACKGROUND_VALUE); /** * The 'BUTTONFACE' color name. */ - Value BUTTONFACE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_BUTTONFACE_VALUE); + Value BUTTONFACE_VALUE = new IdentValue(CSSConstants.CSS_BUTTONFACE_VALUE); /** * The 'BUTTONHIGHLIGHT' color name. */ - Value BUTTONHIGHLIGHT_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_BUTTONHIGHLIGHT_VALUE); + Value BUTTONHIGHLIGHT_VALUE = new IdentValue(CSSConstants.CSS_BUTTONHIGHLIGHT_VALUE); /** * The 'BUTTONSHADOW' color name. */ - Value BUTTONSHADOW_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_BUTTONSHADOW_VALUE); + Value BUTTONSHADOW_VALUE = new IdentValue(CSSConstants.CSS_BUTTONSHADOW_VALUE); /** * The 'BUTTONTEXT' color name. */ - Value BUTTONTEXT_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_BUTTONTEXT_VALUE); + Value BUTTONTEXT_VALUE = new IdentValue(CSSConstants.CSS_BUTTONTEXT_VALUE); /** * The 'CAPTIONTEXT' color name. */ - Value CAPTIONTEXT_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_CAPTIONTEXT_VALUE); + Value CAPTIONTEXT_VALUE = new IdentValue(CSSConstants.CSS_CAPTIONTEXT_VALUE); /** * The 'GRAYTEXT' color name. */ - Value GRAYTEXT_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_GRAYTEXT_VALUE); + Value GRAYTEXT_VALUE = new IdentValue(CSSConstants.CSS_GRAYTEXT_VALUE); /** * The 'HIGHLIGHT' color name. */ - Value HIGHLIGHT_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_HIGHLIGHT_VALUE); + Value HIGHLIGHT_VALUE = new IdentValue(CSSConstants.CSS_HIGHLIGHT_VALUE); /** * The 'HIGHLIGHTTEXT' color name. */ - Value HIGHLIGHTTEXT_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_HIGHLIGHTTEXT_VALUE); + Value HIGHLIGHTTEXT_VALUE = new IdentValue(CSSConstants.CSS_HIGHLIGHTTEXT_VALUE); /** * The 'INACTIVEBORDER' color name. */ - Value INACTIVEBORDER_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_INACTIVEBORDER_VALUE); + Value INACTIVEBORDER_VALUE = new IdentValue(CSSConstants.CSS_INACTIVEBORDER_VALUE); /** * The 'INACTIVECAPTION' color name. */ - Value INACTIVECAPTION_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_INACTIVECAPTION_VALUE); + Value INACTIVECAPTION_VALUE = new IdentValue(CSSConstants.CSS_INACTIVECAPTION_VALUE); /** * The 'INACTIVECAPTIONTEXT' color name. */ - Value INACTIVECAPTIONTEXT_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, - CSSConstants.CSS_INACTIVECAPTIONTEXT_VALUE); + Value INACTIVECAPTIONTEXT_VALUE = new IdentValue(CSSConstants.CSS_INACTIVECAPTIONTEXT_VALUE); /** * The 'INFOBACKGROUND' color name. */ - Value INFOBACKGROUND_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_INFOBACKGROUND_VALUE); + Value INFOBACKGROUND_VALUE = new IdentValue(CSSConstants.CSS_INFOBACKGROUND_VALUE); /** * The 'INFOTEXT' color name. */ - Value INFOTEXT_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_INFOTEXT_VALUE); + Value INFOTEXT_VALUE = new IdentValue(CSSConstants.CSS_INFOTEXT_VALUE); /** * The 'MENU' color name. */ - Value MENU_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_MENU_VALUE); + Value MENU_VALUE = new IdentValue(CSSConstants.CSS_MENU_VALUE); /** * The 'MENUTEXT' color name. */ - Value MENUTEXT_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_MENUTEXT_VALUE); + Value MENUTEXT_VALUE = new IdentValue(CSSConstants.CSS_MENUTEXT_VALUE); /** * The 'SCROLLBAR' color name. */ - Value SCROLLBAR_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SCROLLBAR_VALUE); + Value SCROLLBAR_VALUE = new IdentValue(CSSConstants.CSS_SCROLLBAR_VALUE); /** * The 'THREEDDARKSHADOW' color name. */ - Value THREEDDARKSHADOW_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, - CSSConstants.CSS_THREEDDARKSHADOW_VALUE); + Value THREEDDARKSHADOW_VALUE = new IdentValue(CSSConstants.CSS_THREEDDARKSHADOW_VALUE); /** * The 'THREEDFACE' color name. */ - Value THREEDFACE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_THREEDFACE_VALUE); + Value THREEDFACE_VALUE = new IdentValue(CSSConstants.CSS_THREEDFACE_VALUE); /** * The 'THREEDHIGHLIGHT' color name. */ - Value THREEDHIGHLIGHT_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_THREEDHIGHLIGHT_VALUE); + Value THREEDHIGHLIGHT_VALUE = new IdentValue(CSSConstants.CSS_THREEDHIGHLIGHT_VALUE); /** * The 'THREEDLIGHTSHADOW' color name. */ - Value THREEDLIGHTSHADOW_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, - CSSConstants.CSS_THREEDLIGHTSHADOW_VALUE); + Value THREEDLIGHTSHADOW_VALUE = new IdentValue(CSSConstants.CSS_THREEDLIGHTSHADOW_VALUE); /** * The 'THREEDSHADOW' color name. */ - Value THREEDSHADOW_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_THREEDSHADOW_VALUE); + Value THREEDSHADOW_VALUE = new IdentValue(CSSConstants.CSS_THREEDSHADOW_VALUE); /** * The 'WINDOW' color name. */ - Value WINDOW_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_WINDOW_VALUE); + Value WINDOW_VALUE = new IdentValue(CSSConstants.CSS_WINDOW_VALUE); /** * The 'WINDOWFRAME' color name. */ - Value WINDOWFRAME_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_WINDOWFRAME_VALUE); + Value WINDOWFRAME_VALUE = new IdentValue(CSSConstants.CSS_WINDOWFRAME_VALUE); /** * The 'WINDOWTEXT' color name. */ - Value WINDOWTEXT_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_WINDOWTEXT_VALUE); + Value WINDOWTEXT_VALUE = new IdentValue(CSSConstants.CSS_WINDOWTEXT_VALUE); /** * The 'black' RGB color. 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 aabe4ac2a..8fee9a3a8 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 @@ -22,6 +22,7 @@ import org.w3c.dom.DOMException; 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; @@ -30,8 +31,10 @@ * This interface is implemented by objects which manage the values associated * with a property. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public interface ValueManager { @@ -87,12 +90,12 @@ public interface ValueManager { /** * Creates and returns a new string value. * - * @param type A string code as defined in CSSPrimitiveValue. The string code - * can only be a string unit type. + * @param type A value type as defined in Value.Type. The string code + * can only be a string-like unit type. * @param value The new string value. * @param engine The CSS engine. */ - Value createStringValue(short type, String value, CSSEngine engine) throws DOMException; + Value createStringValue(Type type, String value, CSSEngine engine) throws DOMException; /** * Computes the given value. diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ValueModificationHandler.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ValueModificationHandler.java new file mode 100644 index 000000000..b8fd52bf0 --- /dev/null +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/ValueModificationHandler.java @@ -0,0 +1,31 @@ +/* + + 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; + +/** + * Manage the modification of values. + */ +public interface ValueModificationHandler { + + /** + * Notify that the value changed. + */ + void valueChanged(Value v); + +} 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 fbac5d7c3..d40f3c4c2 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 @@ -19,9 +19,9 @@ package io.sf.carte.echosvg.css.engine.value.css2; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; 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; @@ -34,8 +34,10 @@ /** * This class provides a manager for the 'clip' property values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public class ClipManager extends RectManager { @@ -107,12 +109,9 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { return super.createValue(lu, engine); } - /** - * Implements {@link ValueManager#createStringValue(short,String,CSSEngine)}. - */ @Override - public Value createStringValue(short type, String value, CSSEngine engine) throws DOMException { - if (type != CSSPrimitiveValue.CSS_IDENT) { + public Value createStringValue(Type type, String value, CSSEngine engine) throws DOMException { + if (type != Type.IDENT) { throw createInvalidStringTypeDOMException(type); } if (!value.equalsIgnoreCase(CSSConstants.CSS_AUTO_VALUE)) { 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 31adc5819..191825ba9 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 @@ -19,10 +19,9 @@ package io.sf.carte.echosvg.css.engine.value.css2; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; -import org.w3c.dom.css.CSSValue; 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; @@ -39,8 +38,10 @@ /** * This class provides a manager for the 'cursor' property values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public class CursorManager extends AbstractValueManager { @@ -165,22 +166,18 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { return result; } - /** - * Implements - * {@link ValueManager#computeValue(CSSStylableElement,String,CSSEngine,int,StyleMap,Value)}. - */ @Override public Value computeValue(CSSStylableElement elt, String pseudo, CSSEngine engine, int idx, StyleMap sm, Value value) { - if (value.getCssValueType() == CSSValue.CSS_VALUE_LIST) { - ListValue lv = (ListValue) value; - int len = lv.getLength(); + if (value.getCssValueType() == Value.CssType.LIST) { + int len = value.getLength(); ListValue result = new ListValue(' '); for (int i = 0; i < len; i++) { - Value v = lv.item(0); - if (v.getPrimitiveType() == CSSPrimitiveValue.CSS_URI) { - // Reveal the absolute value as the cssText now. - result.append(new URIValue(v.getStringValue(), v.getStringValue())); + Value v = value.item(0); + if (v.getPrimitiveType() == Type.URI) { + // For performance, use the absolute value as the cssText now. + String uri = v.getURIValue(); + result.append(new URIValue(uri, uri)); } else { result.append(v); } 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 05f8bf701..d9e41b6ca 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 @@ -19,7 +19,6 @@ package io.sf.carte.echosvg.css.engine.value.css2; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; import io.sf.carte.doc.style.css.nsac.LexicalUnit; import io.sf.carte.doc.style.css.nsac.LexicalUnit.LexicalType; @@ -28,6 +27,7 @@ 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.IdentValue; import io.sf.carte.echosvg.css.engine.value.ListValue; import io.sf.carte.echosvg.css.engine.value.StringMap; import io.sf.carte.echosvg.css.engine.value.StringValue; @@ -40,8 +40,10 @@ /** * This class provides a factory for the 'font-family' property values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public class FontFamilyManager extends AbstractValueManager { @@ -51,9 +53,9 @@ public class FontFamilyManager extends AbstractValueManager { */ protected static final ListValue DEFAULT_VALUE = new ListValue(); static { - DEFAULT_VALUE.append(new StringValue(CSSPrimitiveValue.CSS_STRING, "Arial")); - DEFAULT_VALUE.append(new StringValue(CSSPrimitiveValue.CSS_STRING, "Helvetica")); - DEFAULT_VALUE.append(new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SANS_SERIF_VALUE)); + DEFAULT_VALUE.append(new StringValue("Arial")); + DEFAULT_VALUE.append(new StringValue("Helvetica")); + DEFAULT_VALUE.append(new IdentValue(CSSConstants.CSS_SANS_SERIF_VALUE)); } /** @@ -135,7 +137,7 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { for (;;) { switch (lu.getLexicalUnitType()) { case STRING: - result.append(new StringValue(CSSPrimitiveValue.CSS_STRING, lu.getStringValue())); + result.append(new StringValue(lu.getStringValue())); lu = lu.getNextLexicalUnit(); break; @@ -158,12 +160,12 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { } lu = lu.getNextLexicalUnit(); } while (lu != null && isIdentOrNumber(lu)); - result.append(new StringValue(CSSPrimitiveValue.CSS_STRING, sb.toString())); + result.append(new StringValue(sb.toString())); } else { String id = sb.toString(); String s = id.toLowerCase().intern(); Value v = (Value) values.get(s); - result.append((v != null) ? v : new StringValue(CSSPrimitiveValue.CSS_STRING, id)); + result.append((v != null) ? v : new StringValue(id)); } break; default: 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 5094a239b..3a2de0a5f 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 @@ -24,7 +24,8 @@ import java.util.HashSet; import java.util.Set; -import io.sf.carte.doc.style.css.CSSUnit; +import org.w3c.css.om.unit.CSSUnit; + 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; @@ -49,8 +50,10 @@ * considering the 'last' number before an 'ident' or '/' to be font-size and * any preceeding number to be font-weight. * - * @author deweese - * @author For later modifications, see Git history. + *

+ * Original author: deweese. + * For later modifications, see Git history. + *

* @version $Id$ */ public class FontShorthandManager extends AbstractValueFactory implements ShorthandManager { diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/FontSizeAdjustManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/FontSizeAdjustManager.java index f537b68a6..a48ed888b 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/FontSizeAdjustManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/FontSizeAdjustManager.java @@ -18,10 +18,11 @@ */ package io.sf.carte.echosvg.css.engine.value.css2; +import org.w3c.css.om.unit.CSSUnit; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; 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.FloatValue; @@ -34,8 +35,10 @@ /** * This class provides a manager for the 'font-size-adjust' property values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public class FontSizeAdjustManager extends AbstractValueManager { @@ -98,10 +101,10 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { return ValueConstants.INHERIT_VALUE; case INTEGER: - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, lu.getIntegerValue()); + return new FloatValue(CSSUnit.CSS_NUMBER, lu.getIntegerValue()); case REAL: - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, lu.getFloatValue()); + return new FloatValue(CSSUnit.CSS_NUMBER, lu.getFloatValue()); case IDENT: if (lu.getStringValue().equalsIgnoreCase(CSSConstants.CSS_NONE_VALUE)) { @@ -115,12 +118,9 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { throw createInvalidLexicalUnitDOMException(lu.getLexicalUnitType()); } - /** - * Implements {@link ValueManager#createStringValue(short,String,CSSEngine)}. - */ @Override - public Value createStringValue(short type, String value, CSSEngine engine) throws DOMException { - if (type != CSSPrimitiveValue.CSS_IDENT) { + public Value createStringValue(Type type, String value, CSSEngine engine) throws DOMException { + if (type != Type.IDENT) { throw createInvalidStringTypeDOMException(type); } if (value.equalsIgnoreCase(CSSConstants.CSS_NONE_VALUE)) { @@ -134,7 +134,7 @@ public Value createStringValue(short type, String value, CSSEngine engine) throw */ @Override public Value createFloatValue(short type, float floatValue) throws DOMException { - if (type == CSSPrimitiveValue.CSS_NUMBER) { + if (type == CSSUnit.CSS_NUMBER) { return new FloatValue(type, floatValue); } throw createInvalidFloatTypeDOMException(type); diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/FontSizeManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/FontSizeManager.java index 33794635b..38ac4d232 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/FontSizeManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/FontSizeManager.java @@ -18,10 +18,12 @@ */ package io.sf.carte.echosvg.css.engine.value.css2; +import org.w3c.css.om.unit.CSSUnit; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; import io.sf.carte.doc.style.css.nsac.LexicalUnit; +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; @@ -39,8 +41,10 @@ /** * This class provides a manager for the 'font-size' property values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public class FontSizeManager extends LengthManager { @@ -139,12 +143,9 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { return super.createValue(lu, engine); } - /** - * Implements {@link ValueManager#createStringValue(short,String,CSSEngine)}. - */ @Override - public Value createStringValue(short type, String value, CSSEngine engine) throws DOMException { - if (type != CSSPrimitiveValue.CSS_IDENT) { + public Value createStringValue(Type type, String value, CSSEngine engine) throws DOMException { + if (type != Type.IDENT) { throw createInvalidStringTypeDOMException(type); } Object v = values.get(value.toLowerCase().intern()); @@ -164,48 +165,76 @@ public Value computeValue(CSSStylableElement elt, String pseudo, CSSEngine engin float scale = 1.0f; boolean doParentRelative = false; - switch (value.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_NUMBER: - case CSSPrimitiveValue.CSS_PX: + switch (value.getCSSUnit()) { + case CSSUnit.CSS_NUMBER: + case CSSUnit.CSS_PX: return value; - case CSSPrimitiveValue.CSS_MM: + case CSSUnit.CSS_MM: CSSContext ctx = engine.getCSSContext(); - float v = value.getFloatValue(); - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, v / ctx.getPixelUnitToMillimeter()); + float v = lengthValue(value); + return new FloatValue(CSSUnit.CSS_NUMBER, v / ctx.getPixelUnitToMillimeter()); - case CSSPrimitiveValue.CSS_CM: + case CSSUnit.CSS_CM: ctx = engine.getCSSContext(); - v = value.getFloatValue(); - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, v * 10f / ctx.getPixelUnitToMillimeter()); + v = lengthValue(value); + return new FloatValue(CSSUnit.CSS_NUMBER, v * 10f / ctx.getPixelUnitToMillimeter()); - case CSSPrimitiveValue.CSS_IN: + case CSSUnit.CSS_IN: ctx = engine.getCSSContext(); - v = value.getFloatValue(); - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, v * 25.4f / ctx.getPixelUnitToMillimeter()); + v = lengthValue(value); + return new FloatValue(CSSUnit.CSS_NUMBER, v * 25.4f / ctx.getPixelUnitToMillimeter()); - case CSSPrimitiveValue.CSS_PT: + case CSSUnit.CSS_PT: ctx = engine.getCSSContext(); - v = value.getFloatValue(); - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, v * 25.4f / (72f * ctx.getPixelUnitToMillimeter())); + v = lengthValue(value); + return new FloatValue(CSSUnit.CSS_NUMBER, v * 25.4f / (72f * ctx.getPixelUnitToMillimeter())); - case CSSPrimitiveValue.CSS_PC: + case CSSUnit.CSS_PC: ctx = engine.getCSSContext(); - v = value.getFloatValue(); - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, (v * 25.4f / (6f * ctx.getPixelUnitToMillimeter()))); + v = lengthValue(value); + return new FloatValue(CSSUnit.CSS_NUMBER, (v * 25.4f / (6f * ctx.getPixelUnitToMillimeter()))); - case CSSPrimitiveValue.CSS_EMS: + case CSSUnit.CSS_EM: doParentRelative = true; - scale = value.getFloatValue(); + scale = lengthValue(value); break; - case CSSPrimitiveValue.CSS_EXS: + case CSSUnit.CSS_EX: doParentRelative = true; - scale = value.getFloatValue() * 0.5f; // !!! x-height + scale = lengthValue(value) * 0.5f; // !!! x-height break; - case CSSPrimitiveValue.CSS_PERCENTAGE: + case CSSUnit.CSS_PERCENTAGE: doParentRelative = true; scale = value.getFloatValue() * 0.01f; break; + case CSSUnit.CSS_REM: + scale = lengthValue(value); + return rootRelative(elt, engine, idx, scale); + case CSSUnit.CSS_REX: + scale = lengthValue(value) * 0.5f; + return rootRelative(elt, engine, idx, scale); + case CSSUnit.CSS_VW: + v = lengthValue(value); + return new FloatValue(CSSUnit.CSS_NUMBER, v * + engine.getCSSContext().getViewport(elt).getWidth() * 0.01f); + case CSSUnit.CSS_VH: + v = lengthValue(value); + return new FloatValue(CSSUnit.CSS_NUMBER, v * + engine.getCSSContext().getViewport(elt).getHeight() * 0.01f); + case CSSUnit.CSS_VMIN: + v = lengthValue(value); + Viewport vp = engine.getCSSContext().getViewport(elt); + float w = vp.getWidth(); + float h = vp.getHeight(); + float min = Math.min(w, h); + return new FloatValue(CSSUnit.CSS_NUMBER, v * min * 0.01f); + case CSSUnit.CSS_VMAX: + v = lengthValue(value); + vp = engine.getCSSContext().getViewport(elt); + w = vp.getWidth(); + h = vp.getHeight(); + float max = Math.max(w, h); + return new FloatValue(CSSUnit.CSS_NUMBER, v * max * 0.01f); default: } @@ -227,15 +256,17 @@ public Value computeValue(CSSStylableElement elt, String pseudo, CSSEngine engin CSSContext ctx = engine.getCSSContext(); fs = ctx.getMediumFontSize(); } else { - fs = engine.getComputedStyle(p, null, idx).getFloatValue(); + Value cs = engine.getComputedStyle(p, null, idx); + fs = lengthValue(cs); } - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, fs * scale); + return new FloatValue(CSSUnit.CSS_NUMBER, fs * scale); } // absolute identifiers CSSContext ctx = engine.getCSSContext(); float fs = ctx.getMediumFontSize(); - String s = value.getStringValue(); + + String s = value.getIdentifierValue(); switch (s.charAt(0)) { case 'm': break; @@ -272,7 +303,20 @@ public Value computeValue(CSSStylableElement elt, String pseudo, CSSEngine engin } } } - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, fs); + return new FloatValue(CSSUnit.CSS_NUMBER, fs); + } + + private Value rootRelative(CSSStylableElement elt, CSSEngine engine, int idx, float scale) { + CSSStylableElement root = (CSSStylableElement) elt.getOwnerDocument().getDocumentElement(); + if (elt == root) { + CSSContext ctx = engine.getCSSContext(); + float f = ctx.getMediumFontSize() * scale; + return new FloatValue(CSSUnit.CSS_NUMBER, f); + } + + Value cs = engine.getComputedStyle(root, null, idx); + float f = lengthValue(cs) * scale; + return new FloatValue(CSSUnit.CSS_NUMBER, f); } /** diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/FontWeightManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/FontWeightManager.java index f158907d3..80f334dfa 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/FontWeightManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/FontWeightManager.java @@ -18,8 +18,8 @@ */ package io.sf.carte.echosvg.css.engine.value.css2; +import org.w3c.css.om.unit.CSSUnit; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; import io.sf.carte.doc.style.css.nsac.LexicalUnit; import io.sf.carte.echosvg.css.engine.CSSContext; @@ -37,8 +37,10 @@ /** * This class provides a manager for the 'font-weight' property values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public class FontWeightManager extends IdentifierManager { @@ -140,7 +142,7 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { */ @Override public Value createFloatValue(short type, float floatValue) throws DOMException { - if (type == CSSPrimitiveValue.CSS_NUMBER) { + if (type == CSSUnit.CSS_NUMBER) { int i = (int) floatValue; if (floatValue == i) { switch (i) { @@ -185,7 +187,7 @@ public Value computeValue(CSSStylableElement elt, String pseudo, CSSEngine engin fw = 400; } else { Value v = engine.getComputedStyle(p, pseudo, idx); - fw = v.getFloatValue(); + fw = lengthValue(v); } return createFontWeight(ctx.getBolderFontWeight(fw)); } else if (value == ValueConstants.LIGHTER_VALUE) { @@ -198,7 +200,7 @@ public Value computeValue(CSSStylableElement elt, String pseudo, CSSEngine engin fw = 400; } else { Value v = engine.getComputedStyle(p, pseudo, idx); - fw = v.getFloatValue(); + fw = lengthValue(v); } return createFontWeight(ctx.getLighterFontWeight(fw)); } else if (value == ValueConstants.NORMAL_VALUE) { diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/SrcManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/SrcManager.java index c7426976c..23b188ccc 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/SrcManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/SrcManager.java @@ -18,8 +18,9 @@ */ package io.sf.carte.echosvg.css.engine.value.css2; +import java.util.Locale; + import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; import io.sf.carte.doc.style.css.nsac.LexicalUnit; import io.sf.carte.echosvg.css.engine.CSSEngine; @@ -38,9 +39,10 @@ * One line Class Desc * * Complete Class Desc - * - * @author l449433 - * @author For later modifications, see Git history. + *

+ * Original author: l449433. + * For later modifications, see Git history. + *

* @version $Id$ */ public class SrcManager extends IdentifierManager { @@ -129,7 +131,7 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { for (;;) { switch (lu.getLexicalUnitType()) { case STRING: - result.append(new StringValue(CSSPrimitiveValue.CSS_STRING, lu.getStringValue())); + result.append(new StringValue(lu.getStringValue())); lu = lu.getNextLexicalUnit(); break; @@ -159,12 +161,12 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { sb.append(lu.getStringValue()); lu = lu.getNextLexicalUnit(); } while (lu != null && lu.getLexicalUnitType() == LexicalUnit.LexicalType.IDENT); - result.append(new StringValue(CSSPrimitiveValue.CSS_STRING, sb.toString())); + result.append(new StringValue(sb.toString())); } else { String id = sb.toString(); - String s = id.toLowerCase().intern(); + String s = id.toLowerCase(Locale.ROOT).intern(); Value v = (Value) values.get(s); - result.append((v != null) ? v : new StringValue(CSSPrimitiveValue.CSS_STRING, id)); + result.append((v != null) ? v : new StringValue(id)); } break; diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/TextDecorationManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/TextDecorationManager.java index 2fd62c2df..b2b8fc9e5 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/TextDecorationManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/css2/TextDecorationManager.java @@ -18,10 +18,12 @@ */ package io.sf.carte.echosvg.css.engine.value.css2; +import java.util.Locale; + import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; 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.ListValue; @@ -35,8 +37,10 @@ /** * This class provides a manager for the 'text-decoration' property values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public class TextDecorationManager extends AbstractValueManager { @@ -116,7 +120,7 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { ListValue lv = new ListValue(' '); do { if (lu.getLexicalUnitType() == LexicalUnit.LexicalType.IDENT) { - String s = lu.getStringValue().toLowerCase().intern(); + String s = lu.getStringValue().toLowerCase(Locale.ROOT).intern(); Object obj = values.get(s); if (obj == null) { throw createInvalidIdentifierDOMException(lu.getStringValue()); @@ -136,12 +140,9 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { throw createInvalidLexicalUnitDOMException(lu.getLexicalUnitType()); } - /** - * Implements {@link ValueManager#createStringValue(short,String,CSSEngine)}. - */ @Override - public Value createStringValue(short type, String value, CSSEngine engine) throws DOMException { - if (type != CSSPrimitiveValue.CSS_IDENT) { + public Value createStringValue(Type type, String value, CSSEngine engine) throws DOMException { + if (type != Type.IDENT) { throw createInvalidStringTypeDOMException(type); } if (!value.equalsIgnoreCase(CSSConstants.CSS_NONE_VALUE)) { diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/BaselineShiftManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/BaselineShiftManager.java index 94bdbaba5..7eb0a9d1a 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/BaselineShiftManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/BaselineShiftManager.java @@ -18,10 +18,11 @@ */ package io.sf.carte.echosvg.css.engine.value.svg; +import org.w3c.css.om.unit.CSSUnit; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; 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; @@ -37,8 +38,10 @@ /** * This class provides a manager for the 'baseline-shift' property values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public class BaselineShiftManager extends LengthManager { @@ -122,13 +125,10 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { return super.createValue(lu, engine); } - /** - * Implements {@link ValueManager#createStringValue(short,String,CSSEngine)}. - */ @Override - public Value createStringValue(short type, String value, CSSEngine engine) throws DOMException { - if (type != CSSPrimitiveValue.CSS_IDENT) { - throw createInvalidIdentifierDOMException(value); + public Value createStringValue(Type type, String value, CSSEngine engine) throws DOMException { + if (type != Type.IDENT) { + throw createInvalidStringTypeDOMException(type); } Object v = values.get(value.toLowerCase().intern()); if (v == null) { @@ -144,7 +144,7 @@ public Value createStringValue(short type, String value, CSSEngine engine) throw @Override public Value computeValue(CSSStylableElement elt, String pseudo, CSSEngine engine, int idx, StyleMap sm, Value value) { - if (value.getPrimitiveType() == CSSPrimitiveValue.CSS_PERCENTAGE) { + if (value.getCSSUnit() == CSSUnit.CSS_PERCENTAGE) { sm.putLineHeightRelative(idx, true); int fsi = engine.getLineHeightIndex(); @@ -157,9 +157,9 @@ public Value computeValue(CSSStylableElement elt, String pseudo, CSSEngine engin parent = elt; } Value fs = engine.getComputedStyle(parent, pseudo, fsi); - float fsv = fs.getFloatValue(); + float fsv = lengthValue(fs); float v = value.getFloatValue(); - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, (fsv * v) / 100f); + return new FloatValue(CSSUnit.CSS_NUMBER, (fsv * v) / 100f); } return super.computeValue(elt, pseudo, engine, idx, sm, value); } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/ClipPathManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/ClipPathManager.java index 2d212656a..a191545c8 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/ClipPathManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/ClipPathManager.java @@ -19,9 +19,9 @@ package io.sf.carte.echosvg.css.engine.value.svg; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; 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.URIValue; @@ -34,8 +34,10 @@ /** * This class provides a manager for the 'clip-path' property values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public class ClipPathManager extends AbstractValueManager { @@ -110,20 +112,19 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { throw createInvalidLexicalUnitDOMException(lu.getLexicalUnitType()); } - /** - * Implements {@link ValueManager#createStringValue(short,String,CSSEngine)}. - */ @Override - public Value createStringValue(short type, String value, CSSEngine engine) throws DOMException { + public Value createStringValue(Type type, String value, CSSEngine engine) throws DOMException { switch (type) { - case CSSPrimitiveValue.CSS_IDENT: + case IDENT: if (value.equalsIgnoreCase(CSSConstants.CSS_NONE_VALUE)) { return ValueConstants.NONE_VALUE; } break; - case CSSPrimitiveValue.CSS_URI: + case URI: return new URIValue(value, resolveURI(engine.getCSSBaseURI(), value)); + default: + break; } throw createInvalidStringTypeDOMException(type); } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/ColorProfileManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/ColorProfileManager.java index 3110d72c9..dd948bafd 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/ColorProfileManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/ColorProfileManager.java @@ -19,12 +19,12 @@ package io.sf.carte.echosvg.css.engine.value.svg; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; 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.StringValue; +import io.sf.carte.echosvg.css.engine.value.IdentValue; import io.sf.carte.echosvg.css.engine.value.URIValue; import io.sf.carte.echosvg.css.engine.value.Value; import io.sf.carte.echosvg.css.engine.value.ValueConstants; @@ -35,8 +35,10 @@ /** * This class provides a manager for the 'color-interpolation' property values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public class ColorProfileManager extends AbstractValueManager { @@ -106,7 +108,7 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { if (s.equals(CSSConstants.CSS_SRGB_VALUE)) { return SVGValueConstants.SRGB_VALUE; } - return new StringValue(CSSPrimitiveValue.CSS_IDENT, s); + return new IdentValue(s); case URI: return new URIValue(lu.getStringValue(), resolveURI(engine.getCSSBaseURI(), lu.getStringValue())); @@ -116,13 +118,10 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { throw createInvalidLexicalUnitDOMException(lu.getLexicalUnitType()); } - /** - * Implements {@link ValueManager#createStringValue(short,String,CSSEngine)}. - */ @Override - public Value createStringValue(short type, String value, CSSEngine engine) throws DOMException { + public Value createStringValue(Type type, String value, CSSEngine engine) throws DOMException { switch (type) { - case CSSPrimitiveValue.CSS_IDENT: + case IDENT: String s = value.toLowerCase(); if (s.equals(CSSConstants.CSS_AUTO_VALUE)) { return ValueConstants.AUTO_VALUE; @@ -130,10 +129,12 @@ public Value createStringValue(short type, String value, CSSEngine engine) throw if (s.equals(CSSConstants.CSS_SRGB_VALUE)) { return SVGValueConstants.SRGB_VALUE; } - return new StringValue(CSSPrimitiveValue.CSS_IDENT, s); + return new IdentValue(s); - case CSSPrimitiveValue.CSS_URI: + case URI: return new URIValue(value, resolveURI(engine.getCSSBaseURI(), value)); + default: + break; } throw createInvalidStringTypeDOMException(type); } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/EnableBackgroundManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/EnableBackgroundManager.java index 6c9ff6d62..1d12e6a47 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/EnableBackgroundManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/EnableBackgroundManager.java @@ -19,10 +19,9 @@ package io.sf.carte.echosvg.css.engine.value.svg; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; -import org.w3c.dom.css.CSSValue; 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; @@ -37,8 +36,10 @@ /** * This class provides a manager for the 'enable-background' property values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public class EnableBackgroundManager extends LengthManager { @@ -134,12 +135,9 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { } } - /** - * Implements {@link ValueManager#createStringValue(short,String,CSSEngine)}. - */ @Override - public Value createStringValue(short type, String value, CSSEngine engine) { - if (type != CSSPrimitiveValue.CSS_IDENT) { + public Value createStringValue(Type type, String value, CSSEngine engine) throws DOMException { + if (type != Type.IDENT) { throw createInvalidStringTypeDOMException(type); } if (!value.equalsIgnoreCase(CSSConstants.CSS_ACCUMULATE_VALUE)) { @@ -156,32 +154,27 @@ public Value createFloatValue(short unitType, float floatValue) throws DOMExcept throw createDOMException(); } - /** - * Implements - * {@link ValueManager#computeValue(CSSStylableElement,String,CSSEngine,int,StyleMap,Value)}. - */ @Override public Value computeValue(CSSStylableElement elt, String pseudo, CSSEngine engine, int idx, StyleMap sm, Value value) { - if (value.getCssValueType() == CSSValue.CSS_VALUE_LIST) { - ListValue lv = (ListValue) value; - if (lv.getLength() == 5) { - Value lv1 = lv.item(1); + if (value.getCssValueType() == Value.CssType.LIST) { + if (value.getLength() == 5) { + Value lv1 = value.item(1); orientation = HORIZONTAL_ORIENTATION; Value v1 = super.computeValue(elt, pseudo, engine, idx, sm, lv1); - Value lv2 = lv.item(2); + Value lv2 = value.item(2); orientation = VERTICAL_ORIENTATION; Value v2 = super.computeValue(elt, pseudo, engine, idx, sm, lv2); - Value lv3 = lv.item(3); + Value lv3 = value.item(3); orientation = HORIZONTAL_ORIENTATION; Value v3 = super.computeValue(elt, pseudo, engine, idx, sm, lv3); - Value lv4 = lv.item(4); + Value lv4 = value.item(4); orientation = VERTICAL_ORIENTATION; Value v4 = super.computeValue(elt, pseudo, engine, idx, sm, lv4); if (lv1 != v1 || lv2 != v2 || lv3 != v3 || lv4 != v4) { ListValue result = new ListValue(' '); - result.append(lv.item(0)); + result.append(value.item(0)); result.append(v1); result.append(v2); result.append(v3); diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/FilterManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/FilterManager.java index c9748c2a7..97557d101 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/FilterManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/FilterManager.java @@ -19,9 +19,9 @@ package io.sf.carte.echosvg.css.engine.value.svg; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; 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.URIValue; @@ -34,8 +34,10 @@ /** * This class provides a factory for the 'filter' property values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public class FilterManager extends AbstractValueManager { @@ -112,18 +114,15 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { throw createInvalidLexicalUnitDOMException(lu.getLexicalUnitType()); } - /** - * Implements {@link ValueManager#createStringValue(short,String,CSSEngine)}. - */ @Override - public Value createStringValue(short type, String value, CSSEngine engine) throws DOMException { - if (type == CSSPrimitiveValue.CSS_IDENT) { + public Value createStringValue(Type type, String value, CSSEngine engine) throws DOMException { + if (type == Type.IDENT) { if (value.equalsIgnoreCase(CSSConstants.CSS_NONE_VALUE)) { return ValueConstants.NONE_VALUE; } throw createInvalidIdentifierDOMException(value); } - if (type == CSSPrimitiveValue.CSS_URI) { + if (type == Type.URI) { return new URIValue(value, resolveURI(engine.getCSSBaseURI(), value)); } throw createInvalidStringTypeDOMException(type); diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/GlyphOrientationManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/GlyphOrientationManager.java index dfdd7ad43..efaa647a9 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/GlyphOrientationManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/GlyphOrientationManager.java @@ -18,10 +18,9 @@ */ package io.sf.carte.echosvg.css.engine.value.svg; +import org.w3c.css.om.unit.CSSUnit; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; -import io.sf.carte.doc.style.css.CSSUnit; 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; @@ -34,8 +33,10 @@ /** * This class provides a manager for the 'glyph-orientation' property values. * - * @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 GlyphOrientationManager extends AbstractValueManager { @@ -85,23 +86,23 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { case DIMENSION: switch (lu.getCssUnit()) { case CSSUnit.CSS_DEG: - return new FloatValue(CSSPrimitiveValue.CSS_DEG, lu.getFloatValue()); + return new FloatValue(CSSUnit.CSS_DEG, lu.getFloatValue()); case CSSUnit.CSS_RAD: - return new FloatValue(CSSPrimitiveValue.CSS_RAD, lu.getFloatValue()); + return new FloatValue(CSSUnit.CSS_RAD, lu.getFloatValue()); case CSSUnit.CSS_GRAD: - return new FloatValue(CSSPrimitiveValue.CSS_GRAD, lu.getFloatValue()); + return new FloatValue(CSSUnit.CSS_GRAD, lu.getFloatValue()); case CSSUnit.CSS_TURN: - return new FloatValue(CSSPrimitiveValue.CSS_DEG, lu.getFloatValue() * 360f); + return new FloatValue(CSSUnit.CSS_DEG, lu.getFloatValue() * 360f); } // For SVG angle properties unit defaults to 'deg'. case INTEGER: { int n = lu.getIntegerValue(); - return new FloatValue(CSSPrimitiveValue.CSS_DEG, n); + return new FloatValue(CSSUnit.CSS_DEG, n); } case REAL: { float n = lu.getFloatValue(); - return new FloatValue(CSSPrimitiveValue.CSS_DEG, n); + return new FloatValue(CSSUnit.CSS_DEG, n); } default: break; @@ -116,9 +117,9 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { @Override public Value createFloatValue(short type, float floatValue) throws DOMException { switch (type) { - case CSSPrimitiveValue.CSS_DEG: - case CSSPrimitiveValue.CSS_GRAD: - case CSSPrimitiveValue.CSS_RAD: + case CSSUnit.CSS_DEG: + case CSSUnit.CSS_GRAD: + case CSSUnit.CSS_RAD: return new FloatValue(type, floatValue); } throw createInvalidFloatValueDOMException(floatValue); diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/GlyphOrientationVerticalManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/GlyphOrientationVerticalManager.java index 36cf91f04..f0513416a 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/GlyphOrientationVerticalManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/GlyphOrientationVerticalManager.java @@ -19,9 +19,9 @@ package io.sf.carte.echosvg.css.engine.value.svg; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; 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.Value; import io.sf.carte.echosvg.css.engine.value.ValueConstants; @@ -32,8 +32,10 @@ * This class provides a manager for the 'glyph-orientation-vertical' property * values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public class GlyphOrientationVerticalManager extends GlyphOrientationManager { @@ -68,12 +70,9 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { return super.createValue(lu, engine); } - /** - * Implements {@link ValueManager#createStringValue(short,String,CSSEngine)}. - */ @Override - public Value createStringValue(short type, String value, CSSEngine engine) throws DOMException { - if (type != CSSPrimitiveValue.CSS_IDENT) { + public Value createStringValue(Type type, String value, CSSEngine engine) throws DOMException { + if (type != Type.IDENT) { throw createInvalidStringTypeDOMException(type); } if (value.equalsIgnoreCase(CSSConstants.CSS_AUTO_VALUE)) { diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/ICCColor.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/ICCColor.java index 985786c39..99e224670 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/ICCColor.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/ICCColor.java @@ -19,7 +19,6 @@ package io.sf.carte.echosvg.css.engine.value.svg; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSValue; import io.sf.carte.echosvg.css.engine.value.AbstractValue; @@ -56,15 +55,6 @@ public ICCColor(String name) { colorProfile = name; } - /** - * Implements - * {@link io.sf.carte.echosvg.css.engine.value.Value#getCssValueType()}. - */ - @Override - public short getCssValueType() { - return CSSValue.CSS_CUSTOM; - } - /** * Returns the color name. */ @@ -120,4 +110,17 @@ public String toString() { return getCssText(); } + @Override + public Type getPrimitiveType() { + return Type.COLOR; + } + + @Override + public ICCColor clone() { + ICCColor icc = new ICCColor(colorProfile); + icc.colors = colors.clone(); + icc.count = count; + return icc; + } + } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/KerningManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/KerningManager.java index 3b939950c..74dd4d9a9 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/KerningManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/KerningManager.java @@ -19,9 +19,9 @@ package io.sf.carte.echosvg.css.engine.value.svg; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; 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; @@ -33,8 +33,10 @@ /** * This class provides a manager for the 'kerning' property values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public class KerningManager extends LengthManager { @@ -107,12 +109,9 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { return super.createValue(lu, engine); } - /** - * Implements {@link ValueManager#createStringValue(short,String,CSSEngine)}. - */ @Override - public Value createStringValue(short type, String value, CSSEngine engine) throws DOMException { - if (type != CSSPrimitiveValue.CSS_IDENT) { + public Value createStringValue(Type type, String value, CSSEngine engine) throws DOMException { + if (type != Type.IDENT) { throw createInvalidStringTypeDOMException(type); } if (value.equalsIgnoreCase(CSSConstants.CSS_AUTO_VALUE)) { diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/MarkerManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/MarkerManager.java index 4a75f5d93..b1e3b6b14 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/MarkerManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/MarkerManager.java @@ -19,9 +19,9 @@ package io.sf.carte.echosvg.css.engine.value.svg; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; 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.URIValue; @@ -34,8 +34,10 @@ /** * This class provides a manager for the 'marker-*' property values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public class MarkerManager extends AbstractValueManager { @@ -123,22 +125,20 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { throw createInvalidLexicalUnitDOMException(lu.getLexicalUnitType()); } - /** - * Implements {@link ValueManager#createStringValue(short,String,CSSEngine)}. - */ @Override - public Value createStringValue(short type, String value, CSSEngine engine) throws DOMException { + public Value createStringValue(Type type, String value, CSSEngine engine) throws DOMException { switch (type) { - case CSSPrimitiveValue.CSS_IDENT: + case IDENT: if (value.equalsIgnoreCase(CSSConstants.CSS_NONE_VALUE)) { return ValueConstants.NONE_VALUE; } - break; + throw createInvalidIdentifierDOMException(value); - case CSSPrimitiveValue.CSS_URI: + case URI: return new URIValue(value, resolveURI(engine.getCSSBaseURI(), value)); + default: + throw createInvalidStringTypeDOMException(type); } - throw createInvalidStringTypeDOMException(type); } } 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 aefd3ec02..7181b4807 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 @@ -19,9 +19,9 @@ package io.sf.carte.echosvg.css.engine.value.svg; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; 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.URIValue; @@ -34,8 +34,10 @@ /** * This class provides a manager for the 'mask' property values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public class MaskManager extends AbstractValueManager { @@ -111,20 +113,19 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { throw createInvalidLexicalUnitDOMException(lu.getLexicalUnitType()); } - /** - * Implements {@link ValueManager#createStringValue(short,String,CSSEngine)}. - */ @Override - public Value createStringValue(short type, String value, CSSEngine engine) throws DOMException { + public Value createStringValue(Type type, String value, CSSEngine engine) throws DOMException { switch (type) { - case CSSPrimitiveValue.CSS_IDENT: + case IDENT: if (value.equalsIgnoreCase(CSSConstants.CSS_NONE_VALUE)) { return ValueConstants.NONE_VALUE; } break; - case CSSPrimitiveValue.CSS_URI: + case URI: return new URIValue(value, resolveURI(engine.getCSSBaseURI(), value)); + default: + break; } throw createInvalidStringTypeDOMException(type); } 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 8415290a4..da37217b3 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 @@ -18,8 +18,8 @@ */ package io.sf.carte.echosvg.css.engine.value.svg; +import org.w3c.css.om.unit.CSSUnit; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; import io.sf.carte.doc.style.css.nsac.LexicalUnit; import io.sf.carte.echosvg.css.engine.CSSEngine; @@ -33,8 +33,10 @@ /** * This class provides a manager for the '*-opacity' property values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public class OpacityManager extends AbstractValueManager { @@ -115,10 +117,10 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { return ValueConstants.INHERIT_VALUE; case INTEGER: - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, lu.getIntegerValue()); + return new FloatValue(CSSUnit.CSS_NUMBER, lu.getIntegerValue()); case REAL: - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, lu.getFloatValue()); + return new FloatValue(CSSUnit.CSS_NUMBER, lu.getFloatValue()); default: break; @@ -131,7 +133,7 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { */ @Override public Value createFloatValue(short type, float floatValue) throws DOMException { - if (type == CSSPrimitiveValue.CSS_NUMBER) { + if (type == CSSUnit.CSS_NUMBER) { return new FloatValue(type, floatValue); } throw createInvalidFloatTypeDOMException(type); diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/SVGColorManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/SVGColorManager.java index 946ae6ee7..489a3d7c6 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/SVGColorManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/SVGColorManager.java @@ -19,7 +19,6 @@ package io.sf.carte.echosvg.css.engine.value.svg; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSValue; import io.sf.carte.doc.style.css.nsac.LexicalUnit; import io.sf.carte.echosvg.css.engine.CSSEngine; @@ -29,18 +28,16 @@ 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; -import io.sf.carte.echosvg.css.engine.value.svg12.CIELCHColor; -import io.sf.carte.echosvg.css.engine.value.svg12.CIELabColor; -import io.sf.carte.echosvg.css.engine.value.svg12.DeviceColor; -import io.sf.carte.echosvg.css.engine.value.svg12.ICCNamedColor; import io.sf.carte.echosvg.util.CSSConstants; import io.sf.carte.echosvg.util.SVGTypes; /** * This class provides a manager for the SVGColor property values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public class SVGColorManager extends ColorManager { @@ -161,6 +158,9 @@ private Value parseColorFunction(LexicalUnit lu, Value v) { } private Value parseColor12Function(LexicalUnit lu, Value v) { + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Deprecated color."); + /* + * @formatter: off String functionName = lu.getFunctionName(); if (functionName.equalsIgnoreCase(ICCNamedColor.ICC_NAMED_COLOR_FUNCTION)) { return createICCNamedColorValue(lu, v); @@ -178,6 +178,8 @@ private Value parseColor12Function(LexicalUnit lu, Value v) { return createDeviceColorValue(lu, v, 0); } return null; + * @formatter: on + */ } private Value createICCColorValue(LexicalUnit lu, Value v) { @@ -196,81 +198,6 @@ private Value createICCColorValue(LexicalUnit lu, Value v) { return icc; } - private Value createICCNamedColorValue(LexicalUnit lu, Value v) { - lu = lu.getParameters(); - expectIdent(lu); - String profileName = lu.getStringValue(); - - lu = lu.getNextLexicalUnit(); - expectComma(lu); - lu = lu.getNextLexicalUnit(); - expectIdent(lu); - String colorName = lu.getStringValue(); - - ICCNamedColor icc = new ICCNamedColor(profileName, colorName); - - lu = lu.getNextLexicalUnit(); - return icc; - } - - private Value createCIELabColorValue(LexicalUnit lu, Value v) { - lu = lu.getParameters(); - float l = getColorValue(lu); - lu = lu.getNextLexicalUnit(); - expectComma(lu); - lu = lu.getNextLexicalUnit(); - float a = getColorValue(lu); - lu = lu.getNextLexicalUnit(); - expectComma(lu); - lu = lu.getNextLexicalUnit(); - float b = getColorValue(lu); - - CIELabColor icc = new CIELabColor(l, a, b); - - lu = lu.getNextLexicalUnit(); - return icc; - } - - private Value createCIELCHColorValue(LexicalUnit lu, Value v) { - lu = lu.getParameters(); - float l = getColorValue(lu); - lu = lu.getNextLexicalUnit(); - expectComma(lu); - lu = lu.getNextLexicalUnit(); - float c = getColorValue(lu); - lu = lu.getNextLexicalUnit(); - expectComma(lu); - lu = lu.getNextLexicalUnit(); - float h = getColorValue(lu); - - CIELCHColor icc = new CIELCHColor(l, c, h); - - lu = lu.getNextLexicalUnit(); - return icc; - } - - private Value createDeviceColorValue(LexicalUnit lu, Value v, int expectedComponents) { - lu = lu.getParameters(); - - boolean nChannel = (expectedComponents <= 0); - DeviceColor col = new DeviceColor(nChannel); - - col.append(getColorValue(lu)); - LexicalUnit lastUnit = lu; - lu = lu.getNextLexicalUnit(); - while (lu != null) { - expectComma(lu); - lu = lu.getNextLexicalUnit(); - col.append(getColorValue(lu)); - lastUnit = lu; - lu = lu.getNextLexicalUnit(); - } - if (!nChannel && expectedComponents != col.getNumberOfColors()) { - throw createInvalidLexicalUnitDOMException(lastUnit.getLexicalUnitType()); - } - return col; - } - private void expectIdent(LexicalUnit lu) { if (lu.getLexicalUnitType() != LexicalUnit.LexicalType.IDENT) { throw createInvalidLexicalUnitDOMException(lu.getLexicalUnitType()); @@ -302,14 +229,13 @@ public Value computeValue(CSSStylableElement elt, String pseudo, CSSEngine engin int ci = engine.getColorIndex(); return engine.getComputedStyle(elt, pseudo, ci); } - if (value.getCssValueType() == CSSValue.CSS_VALUE_LIST) { - ListValue lv = (ListValue) value; - Value v = lv.item(0); + if (value.getCssValueType() == Value.CssType.LIST) { + Value v = value.item(0); Value t = super.computeValue(elt, pseudo, engine, idx, sm, v); if (t != v) { ListValue result = new ListValue(' '); result.append(t); - result.append(lv.item(1)); + result.append(value.item(1)); return result; } return value; 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 83412670f..383d3b24b 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 @@ -19,8 +19,6 @@ package io.sf.carte.echosvg.css.engine.value.svg; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; -import org.w3c.dom.css.CSSValue; import io.sf.carte.doc.style.css.nsac.LexicalUnit; import io.sf.carte.echosvg.css.engine.CSSEngine; @@ -37,8 +35,10 @@ /** * This class provides a manager for the SVGPaint property values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public class SVGPaintManager extends SVGColorManager { @@ -124,10 +124,9 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { } } Value v = super.createValue(lu, engine); - if (v.getCssValueType() == CSSValue.CSS_CUSTOM) { - ListValue lv = (ListValue) v; - for (int i = 0; i < lv.getLength(); i++) { - result.append(lv.item(i)); + if (v instanceof ListValue) { + for (int i = 0; i < v.getLength(); i++) { + result.append(v.item(i)); } } else { result.append(v); @@ -145,21 +144,20 @@ public Value computeValue(CSSStylableElement elt, String pseudo, CSSEngine engin if (value == ValueConstants.NONE_VALUE) { return value; } - if (value.getCssValueType() == CSSValue.CSS_VALUE_LIST) { - ListValue lv = (ListValue) value; - Value v = lv.item(0); - if (v.getPrimitiveType() == CSSPrimitiveValue.CSS_URI) { - v = lv.item(1); + if (value.getCssValueType() == Value.CssType.LIST) { + Value v = value.item(0); + if (v.getPrimitiveType() == Value.Type.URI) { + v = value.item(1); if (v == ValueConstants.NONE_VALUE) { return value; } Value t = super.computeValue(elt, pseudo, engine, idx, sm, v); if (t != v) { ListValue result = new ListValue(' '); - result.append(lv.item(0)); + result.append(value.item(0)); result.append(t); - if (lv.getLength() == 3) { - result.append(lv.item(1)); + if (value.getLength() == 3) { + result.append(value.item(1)); } return result; } diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/SVGValueConstants.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/SVGValueConstants.java index 78b7b3ec4..84d6c3870 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/SVGValueConstants.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/SVGValueConstants.java @@ -18,11 +18,12 @@ */ package io.sf.carte.echosvg.css.engine.value.svg; -import org.w3c.dom.css.CSSPrimitiveValue; +import org.w3c.css.om.unit.CSSUnit; import io.sf.carte.echosvg.css.engine.value.FloatValue; +import io.sf.carte.echosvg.css.engine.value.IdentValue; +import io.sf.carte.echosvg.css.engine.value.NumericValue; import io.sf.carte.echosvg.css.engine.value.RGBColorValue; -import io.sf.carte.echosvg.css.engine.value.StringValue; import io.sf.carte.echosvg.css.engine.value.Value; import io.sf.carte.echosvg.css.engine.value.ValueConstants; import io.sf.carte.echosvg.util.CSSConstants; @@ -30,8 +31,10 @@ /** * This interface provides constants for SVG values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public interface SVGValueConstants extends ValueConstants { @@ -39,1564 +42,1557 @@ public interface SVGValueConstants extends ValueConstants { /** * 0 degree */ - Value ZERO_DEGREE = new FloatValue(CSSPrimitiveValue.CSS_DEG, 0); + NumericValue ZERO_DEGREE = new FloatValue(CSSUnit.CSS_DEG, 0); /** * 1 */ - Value NUMBER_1 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 1); + NumericValue NUMBER_1 = new FloatValue(CSSUnit.CSS_NUMBER, 1); /** * 4 */ - Value NUMBER_4 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 4); + NumericValue NUMBER_4 = new FloatValue(CSSUnit.CSS_NUMBER, 4); /** * 11 */ - Value NUMBER_11 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 11); + NumericValue NUMBER_11 = new FloatValue(CSSUnit.CSS_NUMBER, 11); /** * 19 */ - Value NUMBER_19 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 19); + NumericValue NUMBER_19 = new FloatValue(CSSUnit.CSS_NUMBER, 19); /** * 20 */ - Value NUMBER_20 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 20); + NumericValue NUMBER_20 = new FloatValue(CSSUnit.CSS_NUMBER, 20); /** * 21 */ - Value NUMBER_21 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 21); + NumericValue NUMBER_21 = new FloatValue(CSSUnit.CSS_NUMBER, 21); /** * 25 */ - Value NUMBER_25 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 25); + NumericValue NUMBER_25 = new FloatValue(CSSUnit.CSS_NUMBER, 25); /** * 30 */ - Value NUMBER_30 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 30); + NumericValue NUMBER_30 = new FloatValue(CSSUnit.CSS_NUMBER, 30); /** * 32 */ - Value NUMBER_32 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 32); + NumericValue NUMBER_32 = new FloatValue(CSSUnit.CSS_NUMBER, 32); /** * 34 */ - Value NUMBER_34 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 34); + NumericValue NUMBER_34 = new FloatValue(CSSUnit.CSS_NUMBER, 34); /** * 35 */ - Value NUMBER_35 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 35); + NumericValue NUMBER_35 = new FloatValue(CSSUnit.CSS_NUMBER, 35); /** * 42 */ - Value NUMBER_42 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 42); + NumericValue NUMBER_42 = new FloatValue(CSSUnit.CSS_NUMBER, 42); /** * 43 */ - Value NUMBER_43 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 43); + NumericValue NUMBER_43 = new FloatValue(CSSUnit.CSS_NUMBER, 43); /** * 45 */ - Value NUMBER_45 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 45); + NumericValue NUMBER_45 = new FloatValue(CSSUnit.CSS_NUMBER, 45); /** * 46 */ - Value NUMBER_46 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 46); + NumericValue NUMBER_46 = new FloatValue(CSSUnit.CSS_NUMBER, 46); /** * 47 */ - Value NUMBER_47 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 47); + NumericValue NUMBER_47 = new FloatValue(CSSUnit.CSS_NUMBER, 47); /** * 50 */ - Value NUMBER_50 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 50); + NumericValue NUMBER_50 = new FloatValue(CSSUnit.CSS_NUMBER, 50); /** * 60 */ - Value NUMBER_60 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 60); + NumericValue NUMBER_60 = new FloatValue(CSSUnit.CSS_NUMBER, 60); /** * 61 */ - Value NUMBER_61 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 61); + NumericValue NUMBER_61 = new FloatValue(CSSUnit.CSS_NUMBER, 61); /** * 63 */ - Value NUMBER_63 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 63); + NumericValue NUMBER_63 = new FloatValue(CSSUnit.CSS_NUMBER, 63); /** * 64 */ - Value NUMBER_64 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 64); + NumericValue NUMBER_64 = new FloatValue(CSSUnit.CSS_NUMBER, 64); /** * 65 */ - Value NUMBER_65 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 65); + NumericValue NUMBER_65 = new FloatValue(CSSUnit.CSS_NUMBER, 65); /** * 69 */ - Value NUMBER_69 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 69); + NumericValue NUMBER_69 = new FloatValue(CSSUnit.CSS_NUMBER, 69); /** * 70 */ - Value NUMBER_70 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 70); + NumericValue NUMBER_70 = new FloatValue(CSSUnit.CSS_NUMBER, 70); /** * 71 */ - Value NUMBER_71 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 71); + NumericValue NUMBER_71 = new FloatValue(CSSUnit.CSS_NUMBER, 71); /** * 72 */ - Value NUMBER_72 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 72); + NumericValue NUMBER_72 = new FloatValue(CSSUnit.CSS_NUMBER, 72); /** * 75 */ - Value NUMBER_75 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 75); + NumericValue NUMBER_75 = new FloatValue(CSSUnit.CSS_NUMBER, 75); /** * 79 */ - Value NUMBER_79 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 79); + NumericValue NUMBER_79 = new FloatValue(CSSUnit.CSS_NUMBER, 79); /** * 80 */ - Value NUMBER_80 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 80); + NumericValue NUMBER_80 = new FloatValue(CSSUnit.CSS_NUMBER, 80); /** * 82 */ - Value NUMBER_82 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 82); + NumericValue NUMBER_82 = new FloatValue(CSSUnit.CSS_NUMBER, 82); /** * 85 */ - Value NUMBER_85 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 85); + NumericValue NUMBER_85 = new FloatValue(CSSUnit.CSS_NUMBER, 85); /** * 87 */ - Value NUMBER_87 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 87); + NumericValue NUMBER_87 = new FloatValue(CSSUnit.CSS_NUMBER, 87); /** * 90 */ - Value NUMBER_90 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 90); + NumericValue NUMBER_90 = new FloatValue(CSSUnit.CSS_NUMBER, 90); /** * 91 */ - Value NUMBER_91 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 91); + NumericValue NUMBER_91 = new FloatValue(CSSUnit.CSS_NUMBER, 91); /** * 92 */ - Value NUMBER_92 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 92); + NumericValue NUMBER_92 = new FloatValue(CSSUnit.CSS_NUMBER, 92); /** * 95 */ - Value NUMBER_95 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 95); + NumericValue NUMBER_95 = new FloatValue(CSSUnit.CSS_NUMBER, 95); /** * 96 */ - Value NUMBER_96 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 96); + NumericValue NUMBER_96 = new FloatValue(CSSUnit.CSS_NUMBER, 96); /** * 99 */ - Value NUMBER_99 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 99); + NumericValue NUMBER_99 = new FloatValue(CSSUnit.CSS_NUMBER, 99); /** * 102 */ - Value NUMBER_102 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 102); + NumericValue NUMBER_102 = new FloatValue(CSSUnit.CSS_NUMBER, 102); /** * 104 */ - Value NUMBER_104 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 104); + NumericValue NUMBER_104 = new FloatValue(CSSUnit.CSS_NUMBER, 104); /** * 105 */ - Value NUMBER_105 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 105); + NumericValue NUMBER_105 = new FloatValue(CSSUnit.CSS_NUMBER, 105); /** * 106 */ - Value NUMBER_106 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 106); + NumericValue NUMBER_106 = new FloatValue(CSSUnit.CSS_NUMBER, 106); /** * 107 */ - Value NUMBER_107 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 107); + NumericValue NUMBER_107 = new FloatValue(CSSUnit.CSS_NUMBER, 107); /** * 112 */ - Value NUMBER_112 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 112); + NumericValue NUMBER_112 = new FloatValue(CSSUnit.CSS_NUMBER, 112); /** * 113 */ - Value NUMBER_113 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 113); + NumericValue NUMBER_113 = new FloatValue(CSSUnit.CSS_NUMBER, 113); /** * 114 */ - Value NUMBER_114 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 114); + NumericValue NUMBER_114 = new FloatValue(CSSUnit.CSS_NUMBER, 114); /** * 119 */ - Value NUMBER_119 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 119); + NumericValue NUMBER_119 = new FloatValue(CSSUnit.CSS_NUMBER, 119); /** * 122 */ - Value NUMBER_122 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 122); + NumericValue NUMBER_122 = new FloatValue(CSSUnit.CSS_NUMBER, 122); /** * 123 */ - Value NUMBER_123 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 123); + NumericValue NUMBER_123 = new FloatValue(CSSUnit.CSS_NUMBER, 123); /** * 124 */ - Value NUMBER_124 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 124); + NumericValue NUMBER_124 = new FloatValue(CSSUnit.CSS_NUMBER, 124); /** * 127 */ - Value NUMBER_127 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 127); + NumericValue NUMBER_127 = new FloatValue(CSSUnit.CSS_NUMBER, 127); /** * 130 */ - Value NUMBER_130 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 130); + NumericValue NUMBER_130 = new FloatValue(CSSUnit.CSS_NUMBER, 130); /** * 133 */ - Value NUMBER_133 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 133); + NumericValue NUMBER_133 = new FloatValue(CSSUnit.CSS_NUMBER, 133); /** * 134 */ - Value NUMBER_134 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 134); + NumericValue NUMBER_134 = new FloatValue(CSSUnit.CSS_NUMBER, 134); /** * 135 */ - Value NUMBER_135 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 135); + NumericValue NUMBER_135 = new FloatValue(CSSUnit.CSS_NUMBER, 135); /** * 136 */ - Value NUMBER_136 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 136); + NumericValue NUMBER_136 = new FloatValue(CSSUnit.CSS_NUMBER, 136); /** * 138 */ - Value NUMBER_138 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 138); + NumericValue NUMBER_138 = new FloatValue(CSSUnit.CSS_NUMBER, 138); /** * 139 */ - Value NUMBER_139 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 139); + NumericValue NUMBER_139 = new FloatValue(CSSUnit.CSS_NUMBER, 139); /** * 140 */ - Value NUMBER_140 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 140); + NumericValue NUMBER_140 = new FloatValue(CSSUnit.CSS_NUMBER, 140); /** * 142 */ - Value NUMBER_142 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 142); + NumericValue NUMBER_142 = new FloatValue(CSSUnit.CSS_NUMBER, 142); /** * 143 */ - Value NUMBER_143 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 143); + NumericValue NUMBER_143 = new FloatValue(CSSUnit.CSS_NUMBER, 143); /** * 144 */ - Value NUMBER_144 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 144); + NumericValue NUMBER_144 = new FloatValue(CSSUnit.CSS_NUMBER, 144); /** * 147 */ - Value NUMBER_147 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 147); + NumericValue NUMBER_147 = new FloatValue(CSSUnit.CSS_NUMBER, 147); /** * 148 */ - Value NUMBER_148 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 148); + NumericValue NUMBER_148 = new FloatValue(CSSUnit.CSS_NUMBER, 148); /** * 149 */ - Value NUMBER_149 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 149); + NumericValue NUMBER_149 = new FloatValue(CSSUnit.CSS_NUMBER, 149); /** * 150 */ - Value NUMBER_150 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 150); + NumericValue NUMBER_150 = new FloatValue(CSSUnit.CSS_NUMBER, 150); /** * 152 */ - Value NUMBER_152 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 152); + NumericValue NUMBER_152 = new FloatValue(CSSUnit.CSS_NUMBER, 152); /** * 153 */ - Value NUMBER_153 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 153); + NumericValue NUMBER_153 = new FloatValue(CSSUnit.CSS_NUMBER, 153); /** * 154 */ - Value NUMBER_154 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 154); + NumericValue NUMBER_154 = new FloatValue(CSSUnit.CSS_NUMBER, 154); /** * 158 */ - Value NUMBER_158 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 158); + NumericValue NUMBER_158 = new FloatValue(CSSUnit.CSS_NUMBER, 158); /** * 160 */ - Value NUMBER_160 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 160); + NumericValue NUMBER_160 = new FloatValue(CSSUnit.CSS_NUMBER, 160); /** * 164 */ - Value NUMBER_164 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 164); + NumericValue NUMBER_164 = new FloatValue(CSSUnit.CSS_NUMBER, 164); /** * 165 */ - Value NUMBER_165 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 165); + NumericValue NUMBER_165 = new FloatValue(CSSUnit.CSS_NUMBER, 165); /** * 169 */ - Value NUMBER_169 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 169); + NumericValue NUMBER_169 = new FloatValue(CSSUnit.CSS_NUMBER, 169); /** * 170 */ - Value NUMBER_170 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 170); + NumericValue NUMBER_170 = new FloatValue(CSSUnit.CSS_NUMBER, 170); /** * 173 */ - Value NUMBER_173 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 173); + NumericValue NUMBER_173 = new FloatValue(CSSUnit.CSS_NUMBER, 173); /** * 175 */ - Value NUMBER_175 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 175); + NumericValue NUMBER_175 = new FloatValue(CSSUnit.CSS_NUMBER, 175); /** * 176 */ - Value NUMBER_176 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 176); + NumericValue NUMBER_176 = new FloatValue(CSSUnit.CSS_NUMBER, 176); /** * 178 */ - Value NUMBER_178 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 178); + NumericValue NUMBER_178 = new FloatValue(CSSUnit.CSS_NUMBER, 178); /** * 179 */ - Value NUMBER_179 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 179); + NumericValue NUMBER_179 = new FloatValue(CSSUnit.CSS_NUMBER, 179); /** * 180 */ - Value NUMBER_180 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 180); + NumericValue NUMBER_180 = new FloatValue(CSSUnit.CSS_NUMBER, 180); /** * 181 */ - Value NUMBER_181 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 181); + NumericValue NUMBER_181 = new FloatValue(CSSUnit.CSS_NUMBER, 181); /** * 182 */ - Value NUMBER_182 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 182); + NumericValue NUMBER_182 = new FloatValue(CSSUnit.CSS_NUMBER, 182); /** * 183 */ - Value NUMBER_183 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 183); + NumericValue NUMBER_183 = new FloatValue(CSSUnit.CSS_NUMBER, 183); /** * 184 */ - Value NUMBER_184 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 184); + NumericValue NUMBER_184 = new FloatValue(CSSUnit.CSS_NUMBER, 184); /** * 185 */ - Value NUMBER_185 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 185); + NumericValue NUMBER_185 = new FloatValue(CSSUnit.CSS_NUMBER, 185); /** * 186 */ - Value NUMBER_186 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 186); + NumericValue NUMBER_186 = new FloatValue(CSSUnit.CSS_NUMBER, 186); /** * 188 */ - Value NUMBER_188 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 188); + NumericValue NUMBER_188 = new FloatValue(CSSUnit.CSS_NUMBER, 188); /** * 189 */ - Value NUMBER_189 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 189); + NumericValue NUMBER_189 = new FloatValue(CSSUnit.CSS_NUMBER, 189); /** * 191 */ - Value NUMBER_191 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 191); + NumericValue NUMBER_191 = new FloatValue(CSSUnit.CSS_NUMBER, 191); /** * 193 */ - Value NUMBER_193 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 193); + NumericValue NUMBER_193 = new FloatValue(CSSUnit.CSS_NUMBER, 193); /** * 196 */ - Value NUMBER_196 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 196); + NumericValue NUMBER_196 = new FloatValue(CSSUnit.CSS_NUMBER, 196); /** * 199 */ - Value NUMBER_199 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 199); + NumericValue NUMBER_199 = new FloatValue(CSSUnit.CSS_NUMBER, 199); /** * 203 */ - Value NUMBER_203 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 203); + NumericValue NUMBER_203 = new FloatValue(CSSUnit.CSS_NUMBER, 203); /** * 204 */ - Value NUMBER_204 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 204); + NumericValue NUMBER_204 = new FloatValue(CSSUnit.CSS_NUMBER, 204); /** * 205 */ - Value NUMBER_205 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 205); + NumericValue NUMBER_205 = new FloatValue(CSSUnit.CSS_NUMBER, 205); /** * 206 */ - Value NUMBER_206 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 206); + NumericValue NUMBER_206 = new FloatValue(CSSUnit.CSS_NUMBER, 206); /** * 208 */ - Value NUMBER_208 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 208); + NumericValue NUMBER_208 = new FloatValue(CSSUnit.CSS_NUMBER, 208); /** * 209 */ - Value NUMBER_209 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 209); + NumericValue NUMBER_209 = new FloatValue(CSSUnit.CSS_NUMBER, 209); /** * 210 */ - Value NUMBER_210 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 210); + NumericValue NUMBER_210 = new FloatValue(CSSUnit.CSS_NUMBER, 210); /** * 211 */ - Value NUMBER_211 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 211); + NumericValue NUMBER_211 = new FloatValue(CSSUnit.CSS_NUMBER, 211); /** * 212 */ - Value NUMBER_212 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 212); + NumericValue NUMBER_212 = new FloatValue(CSSUnit.CSS_NUMBER, 212); /** * 213 */ - Value NUMBER_213 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 213); + NumericValue NUMBER_213 = new FloatValue(CSSUnit.CSS_NUMBER, 213); /** * 214 */ - Value NUMBER_214 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 214); + NumericValue NUMBER_214 = new FloatValue(CSSUnit.CSS_NUMBER, 214); /** * 215 */ - Value NUMBER_215 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 215); + NumericValue NUMBER_215 = new FloatValue(CSSUnit.CSS_NUMBER, 215); /** * 216 */ - Value NUMBER_216 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 216); + NumericValue NUMBER_216 = new FloatValue(CSSUnit.CSS_NUMBER, 216); /** * 218 */ - Value NUMBER_218 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 218); + NumericValue NUMBER_218 = new FloatValue(CSSUnit.CSS_NUMBER, 218); /** * 219 */ - Value NUMBER_219 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 219); + NumericValue NUMBER_219 = new FloatValue(CSSUnit.CSS_NUMBER, 219); /** * 220 */ - Value NUMBER_220 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 220); + NumericValue NUMBER_220 = new FloatValue(CSSUnit.CSS_NUMBER, 220); /** * 221 */ - Value NUMBER_221 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 221); + NumericValue NUMBER_221 = new FloatValue(CSSUnit.CSS_NUMBER, 221); /** * 222 */ - Value NUMBER_222 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 222); + NumericValue NUMBER_222 = new FloatValue(CSSUnit.CSS_NUMBER, 222); /** * 224 */ - Value NUMBER_224 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 224); + NumericValue NUMBER_224 = new FloatValue(CSSUnit.CSS_NUMBER, 224); /** * 225 */ - Value NUMBER_225 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 225); + NumericValue NUMBER_225 = new FloatValue(CSSUnit.CSS_NUMBER, 225); /** * 226 */ - Value NUMBER_226 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 226); + NumericValue NUMBER_226 = new FloatValue(CSSUnit.CSS_NUMBER, 226); /** * 228 */ - Value NUMBER_228 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 228); + NumericValue NUMBER_228 = new FloatValue(CSSUnit.CSS_NUMBER, 228); /** * 230 */ - Value NUMBER_230 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 230); + NumericValue NUMBER_230 = new FloatValue(CSSUnit.CSS_NUMBER, 230); /** * 232 */ - Value NUMBER_232 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 232); + NumericValue NUMBER_232 = new FloatValue(CSSUnit.CSS_NUMBER, 232); /** * 233 */ - Value NUMBER_233 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 233); + NumericValue NUMBER_233 = new FloatValue(CSSUnit.CSS_NUMBER, 233); /** * 235 */ - Value NUMBER_235 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 235); + NumericValue NUMBER_235 = new FloatValue(CSSUnit.CSS_NUMBER, 235); /** * 237 */ - Value NUMBER_237 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 237); + NumericValue NUMBER_237 = new FloatValue(CSSUnit.CSS_NUMBER, 237); /** * 238 */ - Value NUMBER_238 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 238); + NumericValue NUMBER_238 = new FloatValue(CSSUnit.CSS_NUMBER, 238); /** * 239 */ - Value NUMBER_239 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 239); + NumericValue NUMBER_239 = new FloatValue(CSSUnit.CSS_NUMBER, 239); /** * 240 */ - Value NUMBER_240 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 240); + NumericValue NUMBER_240 = new FloatValue(CSSUnit.CSS_NUMBER, 240); /** * 244 */ - Value NUMBER_244 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 244); + NumericValue NUMBER_244 = new FloatValue(CSSUnit.CSS_NUMBER, 244); /** * 245 */ - Value NUMBER_245 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 245); + NumericValue NUMBER_245 = new FloatValue(CSSUnit.CSS_NUMBER, 245); /** * 248 */ - Value NUMBER_248 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 248); + NumericValue NUMBER_248 = new FloatValue(CSSUnit.CSS_NUMBER, 248); /** * 250 */ - Value NUMBER_250 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 250); + NumericValue NUMBER_250 = new FloatValue(CSSUnit.CSS_NUMBER, 250); /** * 251 */ - Value NUMBER_251 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 251); + NumericValue NUMBER_251 = new FloatValue(CSSUnit.CSS_NUMBER, 251); /** * 252 */ - Value NUMBER_252 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 252); + NumericValue NUMBER_252 = new FloatValue(CSSUnit.CSS_NUMBER, 252); /** * 253 */ - Value NUMBER_253 = new FloatValue(CSSPrimitiveValue.CSS_NUMBER, 253); + NumericValue NUMBER_253 = new FloatValue(CSSUnit.CSS_NUMBER, 253); /** * The 'accumulate' keyword. */ - Value ACCUMULATE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_ACCUMULATE_VALUE); + Value ACCUMULATE_VALUE = new IdentValue(CSSConstants.CSS_ACCUMULATE_VALUE); /** * The 'after-edge' keyword. */ - Value AFTER_EDGE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_AFTER_EDGE_VALUE); + Value AFTER_EDGE_VALUE = new IdentValue(CSSConstants.CSS_AFTER_EDGE_VALUE); /** * The 'alphabetic' keyword. */ - Value ALPHABETIC_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_ALPHABETIC_VALUE); + Value ALPHABETIC_VALUE = new IdentValue(CSSConstants.CSS_ALPHABETIC_VALUE); /** * The 'baseline' keyword. */ - Value BASELINE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_BASELINE_VALUE); + Value BASELINE_VALUE = new IdentValue(CSSConstants.CSS_BASELINE_VALUE); /** * The 'before-edge' keyword. */ - Value BEFORE_EDGE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_BEFORE_EDGE_VALUE); + Value BEFORE_EDGE_VALUE = new IdentValue(CSSConstants.CSS_BEFORE_EDGE_VALUE); /** * The 'bevel' keyword. */ - Value BEVEL_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_BEVEL_VALUE); + Value BEVEL_VALUE = new IdentValue(CSSConstants.CSS_BEVEL_VALUE); /** * The 'butt' keyword. */ - Value BUTT_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_BUTT_VALUE); + Value BUTT_VALUE = new IdentValue(CSSConstants.CSS_BUTT_VALUE); /** * The 'central' keyword. */ - Value CENTRAL_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_CENTRAL_VALUE); + Value CENTRAL_VALUE = new IdentValue(CSSConstants.CSS_CENTRAL_VALUE); /** * The 'currentcolor' keyword. */ - Value CURRENTCOLOR_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_CURRENTCOLOR_VALUE); + Value CURRENTCOLOR_VALUE = new IdentValue(CSSConstants.CSS_CURRENTCOLOR_VALUE); /** * The 'end' keyword. */ - Value END_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_END_VALUE); + Value END_VALUE = new IdentValue(CSSConstants.CSS_END_VALUE); /** * The 'evenodd' keyword. */ - Value EVENODD_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_EVENODD_VALUE); + Value EVENODD_VALUE = new IdentValue(CSSConstants.CSS_EVENODD_VALUE); /** * The 'fill' keyword. */ - Value FILL_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_FILL_VALUE); + Value FILL_VALUE = new IdentValue(CSSConstants.CSS_FILL_VALUE); /** * The 'fillstroke' keyword. */ - Value FILLSTROKE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_FILLSTROKE_VALUE); + Value FILLSTROKE_VALUE = new IdentValue(CSSConstants.CSS_FILLSTROKE_VALUE); /** * The 'geometricprecision' keyword. */ - Value GEOMETRICPRECISION_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, - CSSConstants.CSS_GEOMETRICPRECISION_VALUE); + Value GEOMETRICPRECISION_VALUE = new IdentValue(CSSConstants.CSS_GEOMETRICPRECISION_VALUE); /** * The 'hanging' keyword. */ - Value HANGING_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_HANGING_VALUE); + Value HANGING_VALUE = new IdentValue(CSSConstants.CSS_HANGING_VALUE); /** * The 'ideographic' keyword. */ - Value IDEOGRAPHIC_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_IDEOGRAPHIC_VALUE); + Value IDEOGRAPHIC_VALUE = new IdentValue(CSSConstants.CSS_IDEOGRAPHIC_VALUE); /** * The 'linearRGB' keyword. */ - Value LINEARRGB_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LINEARRGB_VALUE); + Value LINEARRGB_VALUE = new IdentValue(CSSConstants.CSS_LINEARRGB_VALUE); /** * The 'lr' keyword. */ - Value LR_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LR_VALUE); + Value LR_VALUE = new IdentValue(CSSConstants.CSS_LR_VALUE); /** * The 'lr-tb' keyword. */ - Value LR_TB_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LR_TB_VALUE); + Value LR_TB_VALUE = new IdentValue(CSSConstants.CSS_LR_TB_VALUE); /** * The 'mathematical' keyword. */ - Value MATHEMATICAL_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_MATHEMATICAL_VALUE); + Value MATHEMATICAL_VALUE = new IdentValue(CSSConstants.CSS_MATHEMATICAL_VALUE); /** * The 'middle' keyword. */ - Value MIDDLE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_MIDDLE_VALUE); + Value MIDDLE_VALUE = new IdentValue(CSSConstants.CSS_MIDDLE_VALUE); /** * The 'new' keyword. */ - Value NEW_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_NEW_VALUE); + Value NEW_VALUE = new IdentValue(CSSConstants.CSS_NEW_VALUE); /** * The 'miter' keyword. */ - Value MITER_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_MITER_VALUE); + Value MITER_VALUE = new IdentValue(CSSConstants.CSS_MITER_VALUE); /** * The 'no-change' keyword. */ - Value NO_CHANGE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_NO_CHANGE_VALUE); + Value NO_CHANGE_VALUE = new IdentValue(CSSConstants.CSS_NO_CHANGE_VALUE); /** * The 'nonzero' keyword. */ - Value NONZERO_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_NONZERO_VALUE); + Value NONZERO_VALUE = new IdentValue(CSSConstants.CSS_NONZERO_VALUE); /** * The 'optimizeLegibility' keyword. */ - Value OPTIMIZELEGIBILITY_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, - CSSConstants.CSS_OPTIMIZELEGIBILITY_VALUE); + Value OPTIMIZELEGIBILITY_VALUE = new IdentValue(CSSConstants.CSS_OPTIMIZELEGIBILITY_VALUE); /** * The 'optimizeQuality' keyword. */ - Value OPTIMIZEQUALITY_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_OPTIMIZEQUALITY_VALUE); + Value OPTIMIZEQUALITY_VALUE = new IdentValue(CSSConstants.CSS_OPTIMIZEQUALITY_VALUE); /** * The 'optimizeSpeed' keyword. */ - Value OPTIMIZESPEED_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_OPTIMIZESPEED_VALUE); + Value OPTIMIZESPEED_VALUE = new IdentValue(CSSConstants.CSS_OPTIMIZESPEED_VALUE); /** * The 'reset-size' keyword. */ - Value RESET_SIZE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_RESET_SIZE_VALUE); + Value RESET_SIZE_VALUE = new IdentValue(CSSConstants.CSS_RESET_SIZE_VALUE); /** * The 'rl' keyword. */ - Value RL_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_RL_VALUE); + Value RL_VALUE = new IdentValue(CSSConstants.CSS_RL_VALUE); /** * The 'rl-tb' keyword. */ - Value RL_TB_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_RL_TB_VALUE); + Value RL_TB_VALUE = new IdentValue(CSSConstants.CSS_RL_TB_VALUE); /** * The 'round' keyword. */ - Value ROUND_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_ROUND_VALUE); + Value ROUND_VALUE = new IdentValue(CSSConstants.CSS_ROUND_VALUE); /** * The 'square' keyword. */ - Value SQUARE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SQUARE_VALUE); + Value SQUARE_VALUE = new IdentValue(CSSConstants.CSS_SQUARE_VALUE); /** * The 'sRGB' keyword. */ - Value SRGB_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SRGB_VALUE); + Value SRGB_VALUE = new IdentValue(CSSConstants.CSS_SRGB_VALUE); /** * The 'start' keyword. */ - Value START_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_START_VALUE); + Value START_VALUE = new IdentValue(CSSConstants.CSS_START_VALUE); /** * The 'sub' keyword. */ - Value SUB_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SUB_VALUE); + Value SUB_VALUE = new IdentValue(CSSConstants.CSS_SUB_VALUE); /** * The 'super' keyword. */ - Value SUPER_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SUPER_VALUE); + Value SUPER_VALUE = new IdentValue(CSSConstants.CSS_SUPER_VALUE); /** * The 'tb' keyword. */ - Value TB_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_TB_VALUE); + Value TB_VALUE = new IdentValue(CSSConstants.CSS_TB_VALUE); /** * The 'tb-rl' keyword. */ - Value TB_RL_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_TB_RL_VALUE); + Value TB_RL_VALUE = new IdentValue(CSSConstants.CSS_TB_RL_VALUE); /** * The 'text-after-edge' keyword. */ - Value TEXT_AFTER_EDGE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_TEXT_AFTER_EDGE_VALUE); + Value TEXT_AFTER_EDGE_VALUE = new IdentValue(CSSConstants.CSS_TEXT_AFTER_EDGE_VALUE); /** * The 'text-before-edge' keyword. */ - Value TEXT_BEFORE_EDGE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, - CSSConstants.CSS_TEXT_BEFORE_EDGE_VALUE); + Value TEXT_BEFORE_EDGE_VALUE = new IdentValue(CSSConstants.CSS_TEXT_BEFORE_EDGE_VALUE); /** * The 'text-bottom' keyword. */ - Value TEXT_BOTTOM_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_TEXT_BOTTOM_VALUE); + Value TEXT_BOTTOM_VALUE = new IdentValue(CSSConstants.CSS_TEXT_BOTTOM_VALUE); /** * The 'text-top' keyword. */ - Value TEXT_TOP_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_TEXT_TOP_VALUE); + Value TEXT_TOP_VALUE = new IdentValue(CSSConstants.CSS_TEXT_TOP_VALUE); /** * The 'use-script' keyword. */ - Value USE_SCRIPT_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_USE_SCRIPT_VALUE); + Value USE_SCRIPT_VALUE = new IdentValue(CSSConstants.CSS_USE_SCRIPT_VALUE); /** * The 'visiblefill' keyword. */ - Value VISIBLEFILL_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_VISIBLEFILL_VALUE); + Value VISIBLEFILL_VALUE = new IdentValue(CSSConstants.CSS_VISIBLEFILL_VALUE); /** * The 'visiblefillstroke' keyword. */ - Value VISIBLEFILLSTROKE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, - CSSConstants.CSS_VISIBLEFILLSTROKE_VALUE); + Value VISIBLEFILLSTROKE_VALUE = new IdentValue(CSSConstants.CSS_VISIBLEFILLSTROKE_VALUE); /** * The 'visiblepainted' keyword. */ - Value VISIBLEPAINTED_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_VISIBLEPAINTED_VALUE); + Value VISIBLEPAINTED_VALUE = new IdentValue(CSSConstants.CSS_VISIBLEPAINTED_VALUE); /** * The 'visiblestroke' keyword. */ - Value VISIBLESTROKE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_VISIBLESTROKE_VALUE); + Value VISIBLESTROKE_VALUE = new IdentValue(CSSConstants.CSS_VISIBLESTROKE_VALUE); /** * The 'aliceblue' color name. */ - Value ALICEBLUE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_ALICEBLUE_VALUE); + Value ALICEBLUE_VALUE = new IdentValue(CSSConstants.CSS_ALICEBLUE_VALUE); /** * The 'antiquewhite' color name. */ - Value ANTIQUEWHITE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_ANTIQUEWHITE_VALUE); + Value ANTIQUEWHITE_VALUE = new IdentValue(CSSConstants.CSS_ANTIQUEWHITE_VALUE); /** * The 'aquamarine' color name. */ - Value AQUAMARINE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_AQUAMARINE_VALUE); + Value AQUAMARINE_VALUE = new IdentValue(CSSConstants.CSS_AQUAMARINE_VALUE); /** * The 'azure' color name. */ - Value AZURE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_AZURE_VALUE); + Value AZURE_VALUE = new IdentValue(CSSConstants.CSS_AZURE_VALUE); /** * The 'beige' color name. */ - Value BEIGE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_BEIGE_VALUE); + Value BEIGE_VALUE = new IdentValue(CSSConstants.CSS_BEIGE_VALUE); /** * The 'bisque' color name. */ - Value BISQUE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_BISQUE_VALUE); + Value BISQUE_VALUE = new IdentValue(CSSConstants.CSS_BISQUE_VALUE); /** * The 'blanchedalmond' color name. */ - Value BLANCHEDALMOND_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_BLANCHEDALMOND_VALUE); + Value BLANCHEDALMOND_VALUE = new IdentValue(CSSConstants.CSS_BLANCHEDALMOND_VALUE); /** * The 'blueviolet' color name. */ - Value BLUEVIOLET_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_BLUEVIOLET_VALUE); + Value BLUEVIOLET_VALUE = new IdentValue(CSSConstants.CSS_BLUEVIOLET_VALUE); /** * The 'brown' color name. */ - Value BROWN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_BROWN_VALUE); + Value BROWN_VALUE = new IdentValue(CSSConstants.CSS_BROWN_VALUE); /** * The 'burlywood' color name. */ - Value BURLYWOOD_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_BURLYWOOD_VALUE); + Value BURLYWOOD_VALUE = new IdentValue(CSSConstants.CSS_BURLYWOOD_VALUE); /** * The 'cadetblue' color name. */ - Value CADETBLUE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_CADETBLUE_VALUE); + Value CADETBLUE_VALUE = new IdentValue(CSSConstants.CSS_CADETBLUE_VALUE); /** * The 'chartreuse' color name. */ - Value CHARTREUSE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_CHARTREUSE_VALUE); + Value CHARTREUSE_VALUE = new IdentValue(CSSConstants.CSS_CHARTREUSE_VALUE); /** * The 'chocolate' color name. */ - Value CHOCOLATE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_CHOCOLATE_VALUE); + Value CHOCOLATE_VALUE = new IdentValue(CSSConstants.CSS_CHOCOLATE_VALUE); /** * The 'coral' color name. */ - Value CORAL_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_CORAL_VALUE); + Value CORAL_VALUE = new IdentValue(CSSConstants.CSS_CORAL_VALUE); /** * The 'cornflowerblue' color name. */ - Value CORNFLOWERBLUE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_CORNFLOWERBLUE_VALUE); + Value CORNFLOWERBLUE_VALUE = new IdentValue(CSSConstants.CSS_CORNFLOWERBLUE_VALUE); /** * The 'cornsilk' color name. */ - Value CORNSILK_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_CORNSILK_VALUE); + Value CORNSILK_VALUE = new IdentValue(CSSConstants.CSS_CORNSILK_VALUE); /** * The 'crimson' color name. */ - Value CRIMSON_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_CRIMSON_VALUE); + Value CRIMSON_VALUE = new IdentValue(CSSConstants.CSS_CRIMSON_VALUE); /** * The 'cyan' color name. */ - Value CYAN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_CYAN_VALUE); + Value CYAN_VALUE = new IdentValue(CSSConstants.CSS_CYAN_VALUE); /** * The 'darkblue' color name. */ - Value DARKBLUE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_DARKBLUE_VALUE); + Value DARKBLUE_VALUE = new IdentValue(CSSConstants.CSS_DARKBLUE_VALUE); /** * The 'darkcyan' color name. */ - Value DARKCYAN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_DARKCYAN_VALUE); + Value DARKCYAN_VALUE = new IdentValue(CSSConstants.CSS_DARKCYAN_VALUE); /** * The 'darkgoldenrod' color name. */ - Value DARKGOLDENROD_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_DARKGOLDENROD_VALUE); + Value DARKGOLDENROD_VALUE = new IdentValue(CSSConstants.CSS_DARKGOLDENROD_VALUE); /** * The 'darkgray' color name. */ - Value DARKGRAY_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_DARKGRAY_VALUE); + Value DARKGRAY_VALUE = new IdentValue(CSSConstants.CSS_DARKGRAY_VALUE); /** * The 'darkgreen' color name. */ - Value DARKGREEN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_DARKGREEN_VALUE); + Value DARKGREEN_VALUE = new IdentValue(CSSConstants.CSS_DARKGREEN_VALUE); /** * The 'darkgrey' color name. */ - Value DARKGREY_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_DARKGREY_VALUE); + Value DARKGREY_VALUE = new IdentValue(CSSConstants.CSS_DARKGREY_VALUE); /** * The 'darkkhaki' color name. */ - Value DARKKHAKI_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_DARKKHAKI_VALUE); + Value DARKKHAKI_VALUE = new IdentValue(CSSConstants.CSS_DARKKHAKI_VALUE); /** * The 'darkmagenta' color name. */ - Value DARKMAGENTA_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_DARKMAGENTA_VALUE); + Value DARKMAGENTA_VALUE = new IdentValue(CSSConstants.CSS_DARKMAGENTA_VALUE); /** * The 'darkolivegreen' color name. */ - Value DARKOLIVEGREEN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_DARKOLIVEGREEN_VALUE); + Value DARKOLIVEGREEN_VALUE = new IdentValue(CSSConstants.CSS_DARKOLIVEGREEN_VALUE); /** * The 'darkorange' color name. */ - Value DARKORANGE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_DARKORANGE_VALUE); + Value DARKORANGE_VALUE = new IdentValue(CSSConstants.CSS_DARKORANGE_VALUE); /** * The 'darkorchid' color name. */ - Value DARKORCHID_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_DARKORCHID_VALUE); + Value DARKORCHID_VALUE = new IdentValue(CSSConstants.CSS_DARKORCHID_VALUE); /** * The 'darkred' color name. */ - Value DARKRED_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_DARKRED_VALUE); + Value DARKRED_VALUE = new IdentValue(CSSConstants.CSS_DARKRED_VALUE); /** * The 'darksalmon' color name. */ - Value DARKSALMON_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_DARKSALMON_VALUE); + Value DARKSALMON_VALUE = new IdentValue(CSSConstants.CSS_DARKSALMON_VALUE); /** * The 'darkseagreen' color name. */ - Value DARKSEAGREEN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_DARKSEAGREEN_VALUE); + Value DARKSEAGREEN_VALUE = new IdentValue(CSSConstants.CSS_DARKSEAGREEN_VALUE); /** * The 'darkslateblue' color name. */ - Value DARKSLATEBLUE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_DARKSLATEBLUE_VALUE); + Value DARKSLATEBLUE_VALUE = new IdentValue(CSSConstants.CSS_DARKSLATEBLUE_VALUE); /** * The 'darkslategray' color name. */ - Value DARKSLATEGRAY_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_DARKSLATEGRAY_VALUE); + Value DARKSLATEGRAY_VALUE = new IdentValue(CSSConstants.CSS_DARKSLATEGRAY_VALUE); /** * The 'darkslategrey' color name. */ - Value DARKSLATEGREY_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_DARKSLATEGREY_VALUE); + Value DARKSLATEGREY_VALUE = new IdentValue(CSSConstants.CSS_DARKSLATEGREY_VALUE); /** * The 'darkturquoise' color name. */ - Value DARKTURQUOISE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_DARKTURQUOISE_VALUE); + Value DARKTURQUOISE_VALUE = new IdentValue(CSSConstants.CSS_DARKTURQUOISE_VALUE); /** * The 'darkviolet' color name. */ - Value DARKVIOLET_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_DARKVIOLET_VALUE); + Value DARKVIOLET_VALUE = new IdentValue(CSSConstants.CSS_DARKVIOLET_VALUE); /** * The 'deeppink' color name. */ - Value DEEPPINK_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_DEEPPINK_VALUE); + Value DEEPPINK_VALUE = new IdentValue(CSSConstants.CSS_DEEPPINK_VALUE); /** * The 'deepskyblue' color name. */ - Value DEEPSKYBLUE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_DEEPSKYBLUE_VALUE); + Value DEEPSKYBLUE_VALUE = new IdentValue(CSSConstants.CSS_DEEPSKYBLUE_VALUE); /** * The 'dimgray' color name. */ - Value DIMGRAY_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_DIMGRAY_VALUE); + Value DIMGRAY_VALUE = new IdentValue(CSSConstants.CSS_DIMGRAY_VALUE); /** * The 'dimgrey' color name. */ - Value DIMGREY_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_DIMGREY_VALUE); + Value DIMGREY_VALUE = new IdentValue(CSSConstants.CSS_DIMGREY_VALUE); /** * The 'dodgerblue' color name. */ - Value DODGERBLUE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_DODGERBLUE_VALUE); + Value DODGERBLUE_VALUE = new IdentValue(CSSConstants.CSS_DODGERBLUE_VALUE); /** * The 'firebrick' color name. */ - Value FIREBRICK_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_FIREBRICK_VALUE); + Value FIREBRICK_VALUE = new IdentValue(CSSConstants.CSS_FIREBRICK_VALUE); /** * The 'floralwhite' color name. */ - Value FLORALWHITE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_FLORALWHITE_VALUE); + Value FLORALWHITE_VALUE = new IdentValue(CSSConstants.CSS_FLORALWHITE_VALUE); /** * The 'forestgreen' color name. */ - Value FORESTGREEN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_FORESTGREEN_VALUE); + Value FORESTGREEN_VALUE = new IdentValue(CSSConstants.CSS_FORESTGREEN_VALUE); /** * The 'gainsboro' color name. */ - Value GAINSBORO_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_GAINSBORO_VALUE); + Value GAINSBORO_VALUE = new IdentValue(CSSConstants.CSS_GAINSBORO_VALUE); /** * The 'ghostwhite' color name. */ - Value GHOSTWHITE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_GHOSTWHITE_VALUE); + Value GHOSTWHITE_VALUE = new IdentValue(CSSConstants.CSS_GHOSTWHITE_VALUE); /** * The 'gold' color name. */ - Value GOLD_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_GOLD_VALUE); + Value GOLD_VALUE = new IdentValue(CSSConstants.CSS_GOLD_VALUE); /** * The 'goldenrod' color name. */ - Value GOLDENROD_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_GOLDENROD_VALUE); + Value GOLDENROD_VALUE = new IdentValue(CSSConstants.CSS_GOLDENROD_VALUE); /** * The 'greenyellow' color name. */ - Value GREENYELLOW_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_GREENYELLOW_VALUE); + Value GREENYELLOW_VALUE = new IdentValue(CSSConstants.CSS_GREENYELLOW_VALUE); /** * The 'grey' color name. */ - Value GREY_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_GREY_VALUE); + Value GREY_VALUE = new IdentValue(CSSConstants.CSS_GREY_VALUE); /** * The 'honeydew' color name. */ - Value HONEYDEW_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_HONEYDEW_VALUE); + Value HONEYDEW_VALUE = new IdentValue(CSSConstants.CSS_HONEYDEW_VALUE); /** * The 'hotpink' color name. */ - Value HOTPINK_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_HOTPINK_VALUE); + Value HOTPINK_VALUE = new IdentValue(CSSConstants.CSS_HOTPINK_VALUE); /** * The 'indianred' color name. */ - Value INDIANRED_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_INDIANRED_VALUE); + Value INDIANRED_VALUE = new IdentValue(CSSConstants.CSS_INDIANRED_VALUE); /** * The 'indigo' color name. */ - Value INDIGO_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_INDIGO_VALUE); + Value INDIGO_VALUE = new IdentValue(CSSConstants.CSS_INDIGO_VALUE); /** * The 'ivory' color name. */ - Value IVORY_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_IVORY_VALUE); + Value IVORY_VALUE = new IdentValue(CSSConstants.CSS_IVORY_VALUE); /** * The 'khaki' color name. */ - Value KHAKI_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_KHAKI_VALUE); + Value KHAKI_VALUE = new IdentValue(CSSConstants.CSS_KHAKI_VALUE); /** * The 'lavender' color name. */ - Value LAVENDER_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LAVENDER_VALUE); + Value LAVENDER_VALUE = new IdentValue(CSSConstants.CSS_LAVENDER_VALUE); /** * The 'lavenderblush' color name. */ - Value LAVENDERBLUSH_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LAVENDERBLUSH_VALUE); + Value LAVENDERBLUSH_VALUE = new IdentValue(CSSConstants.CSS_LAVENDERBLUSH_VALUE); /** * The 'lawngreen' color name. */ - Value LAWNGREEN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LAWNGREEN_VALUE); + Value LAWNGREEN_VALUE = new IdentValue(CSSConstants.CSS_LAWNGREEN_VALUE); /** * The 'lemonchiffon' color name. */ - Value LEMONCHIFFON_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LEMONCHIFFON_VALUE); + Value LEMONCHIFFON_VALUE = new IdentValue(CSSConstants.CSS_LEMONCHIFFON_VALUE); /** * The 'lightblue' color name. */ - Value LIGHTBLUE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LIGHTBLUE_VALUE); + Value LIGHTBLUE_VALUE = new IdentValue(CSSConstants.CSS_LIGHTBLUE_VALUE); /** * The 'lightcoral' color name. */ - Value LIGHTCORAL_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LIGHTCORAL_VALUE); + Value LIGHTCORAL_VALUE = new IdentValue(CSSConstants.CSS_LIGHTCORAL_VALUE); /** * The 'lightcyan' color name. */ - Value LIGHTCYAN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LIGHTCYAN_VALUE); + Value LIGHTCYAN_VALUE = new IdentValue(CSSConstants.CSS_LIGHTCYAN_VALUE); /** * The 'lightgoldenrodyellow' color name. */ - Value LIGHTGOLDENRODYELLOW_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, - CSSConstants.CSS_LIGHTGOLDENRODYELLOW_VALUE); + Value LIGHTGOLDENRODYELLOW_VALUE = new IdentValue(CSSConstants.CSS_LIGHTGOLDENRODYELLOW_VALUE); /** * The 'lightgray' color name. */ - Value LIGHTGRAY_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LIGHTGRAY_VALUE); + Value LIGHTGRAY_VALUE = new IdentValue(CSSConstants.CSS_LIGHTGRAY_VALUE); /** * The 'lightgreen' color name. */ - Value LIGHTGREEN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LIGHTGREEN_VALUE); + Value LIGHTGREEN_VALUE = new IdentValue(CSSConstants.CSS_LIGHTGREEN_VALUE); /** * The 'lightgrey' color name. */ - Value LIGHTGREY_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LIGHTGREY_VALUE); + Value LIGHTGREY_VALUE = new IdentValue(CSSConstants.CSS_LIGHTGREY_VALUE); /** * The 'lightpink' color name. */ - Value LIGHTPINK_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LIGHTPINK_VALUE); + Value LIGHTPINK_VALUE = new IdentValue(CSSConstants.CSS_LIGHTPINK_VALUE); /** * The 'lightsalmon' color name. */ - Value LIGHTSALMON_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LIGHTSALMON_VALUE); + Value LIGHTSALMON_VALUE = new IdentValue(CSSConstants.CSS_LIGHTSALMON_VALUE); /** * The 'lightseagreen' color name. */ - Value LIGHTSEAGREEN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LIGHTSEAGREEN_VALUE); + Value LIGHTSEAGREEN_VALUE = new IdentValue(CSSConstants.CSS_LIGHTSEAGREEN_VALUE); /** * The 'lightskyblue' color name. */ - Value LIGHTSKYBLUE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LIGHTSKYBLUE_VALUE); + Value LIGHTSKYBLUE_VALUE = new IdentValue(CSSConstants.CSS_LIGHTSKYBLUE_VALUE); /** * The 'lightslategray' color name. */ - Value LIGHTSLATEGRAY_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LIGHTSLATEGRAY_VALUE); + Value LIGHTSLATEGRAY_VALUE = new IdentValue(CSSConstants.CSS_LIGHTSLATEGRAY_VALUE); /** * The 'lightslategrey' color name. */ - Value LIGHTSLATEGREY_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LIGHTSLATEGREY_VALUE); + Value LIGHTSLATEGREY_VALUE = new IdentValue(CSSConstants.CSS_LIGHTSLATEGREY_VALUE); /** * The 'lightsteelblue' color name. */ - Value LIGHTSTEELBLUE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LIGHTSTEELBLUE_VALUE); + Value LIGHTSTEELBLUE_VALUE = new IdentValue(CSSConstants.CSS_LIGHTSTEELBLUE_VALUE); /** * The 'lightyellow' color name. */ - Value LIGHTYELLOW_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LIGHTYELLOW_VALUE); + Value LIGHTYELLOW_VALUE = new IdentValue(CSSConstants.CSS_LIGHTYELLOW_VALUE); /** * The 'limegreen' color name. */ - Value LIMEGREEN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LIMEGREEN_VALUE); + Value LIMEGREEN_VALUE = new IdentValue(CSSConstants.CSS_LIMEGREEN_VALUE); /** * The 'linen' color name. */ - Value LINEN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_LINEN_VALUE); + Value LINEN_VALUE = new IdentValue(CSSConstants.CSS_LINEN_VALUE); /** * The 'magenta' color name. */ - Value MAGENTA_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_MAGENTA_VALUE); + Value MAGENTA_VALUE = new IdentValue(CSSConstants.CSS_MAGENTA_VALUE); /** * The 'mediumaquamarine' color name. */ - Value MEDIUMAQUAMARINE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, - CSSConstants.CSS_MEDIUMAQUAMARINE_VALUE); + Value MEDIUMAQUAMARINE_VALUE = new IdentValue(CSSConstants.CSS_MEDIUMAQUAMARINE_VALUE); /** * The 'mediumblue' color name. */ - Value MEDIUMBLUE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_MEDIUMBLUE_VALUE); + Value MEDIUMBLUE_VALUE = new IdentValue(CSSConstants.CSS_MEDIUMBLUE_VALUE); /** * The 'mediumorchid' color name. */ - Value MEDIUMORCHID_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_MEDIUMORCHID_VALUE); + Value MEDIUMORCHID_VALUE = new IdentValue(CSSConstants.CSS_MEDIUMORCHID_VALUE); /** * The 'mediumpurple' color name. */ - Value MEDIUMPURPLE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_MEDIUMPURPLE_VALUE); + Value MEDIUMPURPLE_VALUE = new IdentValue(CSSConstants.CSS_MEDIUMPURPLE_VALUE); /** * The 'mediumseagreen' color name. */ - Value MEDIUMSEAGREEN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_MEDIUMSEAGREEN_VALUE); + Value MEDIUMSEAGREEN_VALUE = new IdentValue(CSSConstants.CSS_MEDIUMSEAGREEN_VALUE); /** * The 'mediumslateblue' color name. */ - Value MEDIUMSLATEBLUE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_MEDIUMSLATEBLUE_VALUE); + Value MEDIUMSLATEBLUE_VALUE = new IdentValue(CSSConstants.CSS_MEDIUMSLATEBLUE_VALUE); /** * The 'mediumspringgreen' color name. */ - Value MEDIUMSPRINGGREEN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, - CSSConstants.CSS_MEDIUMSPRINGGREEN_VALUE); + Value MEDIUMSPRINGGREEN_VALUE = new IdentValue(CSSConstants.CSS_MEDIUMSPRINGGREEN_VALUE); /** * The 'mediumturquoise' color name. */ - Value MEDIUMTURQUOISE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_MEDIUMTURQUOISE_VALUE); + Value MEDIUMTURQUOISE_VALUE = new IdentValue(CSSConstants.CSS_MEDIUMTURQUOISE_VALUE); /** * The 'mediumvioletred' color name. */ - Value MEDIUMVIOLETRED_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_MEDIUMVIOLETRED_VALUE); + Value MEDIUMVIOLETRED_VALUE = new IdentValue(CSSConstants.CSS_MEDIUMVIOLETRED_VALUE); /** * The 'midnightblue' color name. */ - Value MIDNIGHTBLUE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_MIDNIGHTBLUE_VALUE); + Value MIDNIGHTBLUE_VALUE = new IdentValue(CSSConstants.CSS_MIDNIGHTBLUE_VALUE); /** * The 'mintcream' color name. */ - Value MINTCREAM_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_MINTCREAM_VALUE); + Value MINTCREAM_VALUE = new IdentValue(CSSConstants.CSS_MINTCREAM_VALUE); /** * The 'mistyrose' color name. */ - Value MISTYROSE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_MISTYROSE_VALUE); + Value MISTYROSE_VALUE = new IdentValue(CSSConstants.CSS_MISTYROSE_VALUE); /** * The 'moccasin' color name. */ - Value MOCCASIN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_MOCCASIN_VALUE); + Value MOCCASIN_VALUE = new IdentValue(CSSConstants.CSS_MOCCASIN_VALUE); /** * The 'navajowhite' color name. */ - Value NAVAJOWHITE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_NAVAJOWHITE_VALUE); + Value NAVAJOWHITE_VALUE = new IdentValue(CSSConstants.CSS_NAVAJOWHITE_VALUE); /** * The 'oldlace' color name. */ - Value OLDLACE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_OLDLACE_VALUE); + Value OLDLACE_VALUE = new IdentValue(CSSConstants.CSS_OLDLACE_VALUE); /** * The 'olivedrab' color name. */ - Value OLIVEDRAB_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_OLIVEDRAB_VALUE); + Value OLIVEDRAB_VALUE = new IdentValue(CSSConstants.CSS_OLIVEDRAB_VALUE); /** * The 'orange' color name. */ - Value ORANGE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_ORANGE_VALUE); + Value ORANGE_VALUE = new IdentValue(CSSConstants.CSS_ORANGE_VALUE); /** * The 'orangered' color name. */ - Value ORANGERED_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_ORANGERED_VALUE); + Value ORANGERED_VALUE = new IdentValue(CSSConstants.CSS_ORANGERED_VALUE); /** * The 'orchid' color name. */ - Value ORCHID_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_ORCHID_VALUE); + Value ORCHID_VALUE = new IdentValue(CSSConstants.CSS_ORCHID_VALUE); /** * The 'palegoldenrod' color name. */ - Value PALEGOLDENROD_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_PALEGOLDENROD_VALUE); + Value PALEGOLDENROD_VALUE = new IdentValue(CSSConstants.CSS_PALEGOLDENROD_VALUE); /** * The 'palegreen' color name. */ - Value PALEGREEN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_PALEGREEN_VALUE); + Value PALEGREEN_VALUE = new IdentValue(CSSConstants.CSS_PALEGREEN_VALUE); /** * The 'paleturquoise' color name. */ - Value PALETURQUOISE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_PALETURQUOISE_VALUE); + Value PALETURQUOISE_VALUE = new IdentValue(CSSConstants.CSS_PALETURQUOISE_VALUE); /** * The 'palevioletred' color name. */ - Value PALEVIOLETRED_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_PALEVIOLETRED_VALUE); + Value PALEVIOLETRED_VALUE = new IdentValue(CSSConstants.CSS_PALEVIOLETRED_VALUE); /** * The 'papayawhip' color name. */ - Value PAPAYAWHIP_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_PAPAYAWHIP_VALUE); + Value PAPAYAWHIP_VALUE = new IdentValue(CSSConstants.CSS_PAPAYAWHIP_VALUE); /** * The 'peachpuff' color name. */ - Value PEACHPUFF_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_PEACHPUFF_VALUE); + Value PEACHPUFF_VALUE = new IdentValue(CSSConstants.CSS_PEACHPUFF_VALUE); /** * The 'peru' color name. */ - Value PERU_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_PERU_VALUE); + Value PERU_VALUE = new IdentValue(CSSConstants.CSS_PERU_VALUE); /** * The 'pink' color name. */ - Value PINK_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_PINK_VALUE); + Value PINK_VALUE = new IdentValue(CSSConstants.CSS_PINK_VALUE); /** * The 'plum' color name. */ - Value PLUM_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_PLUM_VALUE); + Value PLUM_VALUE = new IdentValue(CSSConstants.CSS_PLUM_VALUE); /** * The 'powderblue' color name. */ - Value POWDERBLUE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_POWDERBLUE_VALUE); + Value POWDERBLUE_VALUE = new IdentValue(CSSConstants.CSS_POWDERBLUE_VALUE); /** * The 'purple' color name. */ - Value PURPLE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_PURPLE_VALUE); + Value PURPLE_VALUE = new IdentValue(CSSConstants.CSS_PURPLE_VALUE); /** * The 'rosybrown' color name. */ - Value ROSYBROWN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_ROSYBROWN_VALUE); + Value ROSYBROWN_VALUE = new IdentValue(CSSConstants.CSS_ROSYBROWN_VALUE); /** * The 'royalblue' color name. */ - Value ROYALBLUE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_ROYALBLUE_VALUE); + Value ROYALBLUE_VALUE = new IdentValue(CSSConstants.CSS_ROYALBLUE_VALUE); /** * The 'saddlebrown' color name. */ - Value SADDLEBROWN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SADDLEBROWN_VALUE); + Value SADDLEBROWN_VALUE = new IdentValue(CSSConstants.CSS_SADDLEBROWN_VALUE); /** * The 'salmon' color name. */ - Value SALMON_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SALMON_VALUE); + Value SALMON_VALUE = new IdentValue(CSSConstants.CSS_SALMON_VALUE); /** * The 'sandybrown' color name. */ - Value SANDYBROWN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SANDYBROWN_VALUE); + Value SANDYBROWN_VALUE = new IdentValue(CSSConstants.CSS_SANDYBROWN_VALUE); /** * The 'seagreen' color name. */ - Value SEAGREEN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SEAGREEN_VALUE); + Value SEAGREEN_VALUE = new IdentValue(CSSConstants.CSS_SEAGREEN_VALUE); /** * The 'seashell' color name. */ - Value SEASHELL_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SEASHELL_VALUE); + Value SEASHELL_VALUE = new IdentValue(CSSConstants.CSS_SEASHELL_VALUE); /** * The 'sienna' color name. */ - Value SIENNA_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SIENNA_VALUE); + Value SIENNA_VALUE = new IdentValue(CSSConstants.CSS_SIENNA_VALUE); /** * The 'skyblue' color name. */ - Value SKYBLUE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SKYBLUE_VALUE); + Value SKYBLUE_VALUE = new IdentValue(CSSConstants.CSS_SKYBLUE_VALUE); /** * The 'slateblue' color name. */ - Value SLATEBLUE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SLATEBLUE_VALUE); + Value SLATEBLUE_VALUE = new IdentValue(CSSConstants.CSS_SLATEBLUE_VALUE); /** * The 'slategray' color name. */ - Value SLATEGRAY_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SLATEGRAY_VALUE); + Value SLATEGRAY_VALUE = new IdentValue(CSSConstants.CSS_SLATEGRAY_VALUE); /** * The 'slategrey' color name. */ - Value SLATEGREY_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SLATEGREY_VALUE); + Value SLATEGREY_VALUE = new IdentValue(CSSConstants.CSS_SLATEGREY_VALUE); /** * The 'snow' color name. */ - Value SNOW_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SNOW_VALUE); + Value SNOW_VALUE = new IdentValue(CSSConstants.CSS_SNOW_VALUE); /** * The 'springgreen' color name. */ - Value SPRINGGREEN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_SPRINGGREEN_VALUE); + Value SPRINGGREEN_VALUE = new IdentValue(CSSConstants.CSS_SPRINGGREEN_VALUE); /** * The 'steelblue' color name. */ - Value STEELBLUE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_STEELBLUE_VALUE); + Value STEELBLUE_VALUE = new IdentValue(CSSConstants.CSS_STEELBLUE_VALUE); /** * The 'tan' color name. */ - Value TAN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_TAN_VALUE); + Value TAN_VALUE = new IdentValue(CSSConstants.CSS_TAN_VALUE); /** * The 'thistle' color name. */ - Value THISTLE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_THISTLE_VALUE); + Value THISTLE_VALUE = new IdentValue(CSSConstants.CSS_THISTLE_VALUE); /** * The 'tomato' color name. */ - Value TOMATO_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_TOMATO_VALUE); + Value TOMATO_VALUE = new IdentValue(CSSConstants.CSS_TOMATO_VALUE); /** * The 'turquoise' color name. */ - Value TURQUOISE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_TURQUOISE_VALUE); + Value TURQUOISE_VALUE = new IdentValue(CSSConstants.CSS_TURQUOISE_VALUE); /** * The 'violet' color name. */ - Value VIOLET_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_VIOLET_VALUE); + Value VIOLET_VALUE = new IdentValue(CSSConstants.CSS_VIOLET_VALUE); /** * The 'wheat' color name. */ - Value WHEAT_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_WHEAT_VALUE); + Value WHEAT_VALUE = new IdentValue(CSSConstants.CSS_WHEAT_VALUE); /** * The 'whitesmoke' color name. */ - Value WHITESMOKE_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_WHITESMOKE_VALUE); + Value WHITESMOKE_VALUE = new IdentValue(CSSConstants.CSS_WHITESMOKE_VALUE); /** * The 'yellowgreen' color name. */ - Value YELLOWGREEN_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_YELLOWGREEN_VALUE); + Value YELLOWGREEN_VALUE = new IdentValue(CSSConstants.CSS_YELLOWGREEN_VALUE); /** * The 'aliceblue' RGB color. 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 3e307b3eb..85c7f57f9 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 @@ -19,9 +19,9 @@ package io.sf.carte.echosvg.css.engine.value.svg; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; 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; @@ -33,8 +33,10 @@ /** * This class provides a manager for the '*-spacing' property values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public class SpacingManager extends LengthManager { @@ -119,12 +121,9 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { return super.createValue(lu, engine); } - /** - * Implements {@link ValueManager#createStringValue(short,String,CSSEngine)}. - */ @Override - public Value createStringValue(short type, String value, CSSEngine engine) throws DOMException { - if (type != CSSPrimitiveValue.CSS_IDENT) { + public Value createStringValue(Type type, String value, CSSEngine engine) throws DOMException { + if (type != Type.IDENT) { throw createInvalidStringTypeDOMException(type); } if (value.equalsIgnoreCase(CSSConstants.CSS_NORMAL_VALUE)) { 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 14fce3047..fa976a1f1 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 @@ -19,10 +19,9 @@ package io.sf.carte.echosvg.css.engine.value.svg; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; -import org.w3c.dom.css.CSSValue; 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; @@ -37,8 +36,10 @@ /** * This class provides a factory for the 'stroke-dasharray' property values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public class StrokeDasharrayManager extends LengthManager { @@ -120,12 +121,9 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { } } - /** - * Implements {@link ValueManager#createStringValue(short,String,CSSEngine)}. - */ @Override - public Value createStringValue(short type, String value, CSSEngine engine) throws DOMException { - if (type != CSSPrimitiveValue.CSS_IDENT) { + public Value createStringValue(Type type, String value, CSSEngine engine) throws DOMException { + if (type != Type.IDENT) { throw createInvalidStringTypeDOMException(type); } if (value.equalsIgnoreCase(CSSConstants.CSS_NONE_VALUE)) { @@ -142,16 +140,18 @@ public Value createStringValue(short type, String value, CSSEngine engine) throw public Value computeValue(CSSStylableElement elt, String pseudo, CSSEngine engine, int idx, StyleMap sm, Value value) { switch (value.getCssValueType()) { - case CSSValue.CSS_PRIMITIVE_VALUE: + case TYPED: return value; + case LIST: + ListValue result = new ListValue(' '); + for (int i = 0; i < value.getLength(); i++) { + result.append(super.computeValue(elt, pseudo, engine, idx, sm, value.item(i))); + } + return result; + default: + throw createDOMException(); } - ListValue lv = (ListValue) value; - ListValue result = new ListValue(' '); - for (int i = 0; i < lv.getLength(); i++) { - result.append(super.computeValue(elt, pseudo, engine, idx, sm, lv.item(i))); - } - return result; } /** diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/StrokeMiterlimitManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/StrokeMiterlimitManager.java index 94117a433..7a3203431 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/StrokeMiterlimitManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg/StrokeMiterlimitManager.java @@ -18,8 +18,8 @@ */ package io.sf.carte.echosvg.css.engine.value.svg; +import org.w3c.css.om.unit.CSSUnit; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; import io.sf.carte.doc.style.css.nsac.LexicalUnit; import io.sf.carte.echosvg.css.engine.CSSEngine; @@ -34,8 +34,10 @@ /** * This class provides a factory for the 'stroke-miterlimit' property values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public class StrokeMiterlimitManager extends AbstractValueManager { @@ -98,10 +100,10 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { return ValueConstants.INHERIT_VALUE; case INTEGER: - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, lu.getIntegerValue()); + return new FloatValue(CSSUnit.CSS_NUMBER, lu.getIntegerValue()); case REAL: - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, lu.getFloatValue()); + return new FloatValue(CSSUnit.CSS_NUMBER, lu.getFloatValue()); default: throw createInvalidLexicalUnitDOMException(lu.getLexicalUnitType()); @@ -113,7 +115,7 @@ public Value createValue(LexicalUnit lu, CSSEngine engine) throws DOMException { */ @Override public Value createFloatValue(short unitType, float floatValue) throws DOMException { - if (unitType == CSSPrimitiveValue.CSS_NUMBER) { + if (unitType == CSSUnit.CSS_NUMBER) { return new FloatValue(unitType, floatValue); } throw createInvalidFloatTypeDOMException(unitType); diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/AbstractCIEColor.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/AbstractCIEColor.java index 3d909795e..f0af88ee1 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/AbstractCIEColor.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/AbstractCIEColor.java @@ -18,9 +18,7 @@ */ package io.sf.carte.echosvg.css.engine.value.svg12; -import org.w3c.dom.css.CSSValue; - -import io.sf.carte.echosvg.css.engine.value.AbstractValue; +import io.sf.carte.echosvg.css.engine.value.ColorValue; /** * This is a base class for CIE Lab/LCH color values. @@ -28,7 +26,7 @@ * @author For later modifications, see Git history. * @version $Id$ */ -public abstract class AbstractCIEColor extends AbstractValue { +public abstract class AbstractCIEColor extends ColorValue { /** The three color values. */ protected float[] values = new float[3]; @@ -78,15 +76,6 @@ public float[] getWhitePoint() { public abstract String getFunctionName(); - /** - * Implements - * {@link io.sf.carte.echosvg.css.engine.value.Value#getCssValueType()}. - */ - @Override - public short getCssValueType() { - return CSSValue.CSS_CUSTOM; - } - /** * A string representation of the current value. */ diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/CIELCHColor.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/CIELCHColor.java deleted file mode 100644 index d7c6f4b4d..000000000 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/CIELCHColor.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - - 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.svg12; - -/** - * This class represents an CIE LCH color value. - * - * @author For later modifications, see Git history. - * @version $Id$ - */ -public class CIELCHColor extends AbstractCIEColor { - - public static final String CIE_LCH_COLOR_FUNCTION = "cielch"; - - /** - * Creates a new CIELCHColor. - * - * @param l the lightness (L) value - * @param c the chroma (C) value - * @param h the hue (H) value - * @param whitepoint the white point in CIE XYZ coordinates - */ - public CIELCHColor(float l, float c, float h, float[] whitepoint) { - super(new float[] { l, c, h }, whitepoint); - } - - /** - * Creates a new CIELCHColor with D65 as illuminant. - * - * @param l the lightness (L) value - * @param c the chroma (C) value - * @param h the hue (H) value - */ - public CIELCHColor(float l, float c, float h) { - this(l, c, h, null); - } - - /** {@inheritDoc} */ - @Override - public String getFunctionName() { - return CIE_LCH_COLOR_FUNCTION; - } - -} diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/CIELabColor.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/CIELabColor.java deleted file mode 100644 index 95b6e2d35..000000000 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/CIELabColor.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - - 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.svg12; - -/** - * This class represents an CIE L*a*b* color value. - * - * @author For later modifications, see Git history. - * @version $Id$ - */ -public class CIELabColor extends AbstractCIEColor { - - public static final String CIE_LAB_COLOR_FUNCTION = "cielab"; - - /** - * Creates a new CIELabColor. - * - * @param l the L* value - * @param a the a* value - * @param b the b* value - * @param whitepoint the white point in CIE XYZ coordinates - */ - public CIELabColor(float l, float a, float b, float[] whitepoint) { - super(new float[] { l, a, b }, whitepoint); - } - - /** - * Creates a new CIELabColor with D50 as illuminant. - */ - public CIELabColor(float l, float a, float b) { - this(l, a, b, null); - } - - /** {@inheritDoc} */ - @Override - public String getFunctionName() { - return CIE_LAB_COLOR_FUNCTION; - } - -} diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/DeviceColor.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/DeviceColor.java index cf6d71e12..8ff887d13 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/DeviceColor.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/DeviceColor.java @@ -19,17 +19,16 @@ package io.sf.carte.echosvg.css.engine.value.svg12; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSValue; -import io.sf.carte.echosvg.css.engine.value.AbstractValue; +import io.sf.carte.echosvg.css.engine.value.ColorValue; /** * This class represents an device-specific color value. * - * @author For later modifications, see Git history. * @version $Id$ */ -public class DeviceColor extends AbstractValue { +@Deprecated +public class DeviceColor extends ColorValue { public static final String DEVICE_GRAY_COLOR_FUNCTION = "device-gray"; public static final String DEVICE_RGB_COLOR_FUNCTION = "device-rgb"; @@ -58,15 +57,6 @@ public DeviceColor(boolean nChannel) { this.nChannel = nChannel; } - /** - * Implements - * {@link io.sf.carte.echosvg.css.engine.value.Value#getCssValueType()}. - */ - @Override - public short getCssValueType() { - return CSSValue.CSS_CUSTOM; - } - /** * Indicates whether this color uses an N-Channel color space. * @@ -90,6 +80,38 @@ public float getColor(int i) throws DOMException { return colors[i]; } + @Override + public String getCSSColorSpace() { + String cs; + if (nChannel) { + cs = DEVICE_NCHANNEL_COLOR_FUNCTION; + } else { + switch (count) { + case 1: + cs = DEVICE_GRAY_COLOR_FUNCTION; + break; + case 3: + cs = DEVICE_RGB_COLOR_FUNCTION; + break; + case 4: + cs = DEVICE_CMYK_COLOR_FUNCTION; + break; + default: + throw new IllegalStateException("Invalid number of components encountered"); + } + } + return cs; + } + + @Override + public DeviceColor clone() { + DeviceColor c = (DeviceColor) super.clone(); + c.nChannel = nChannel; + c.count = count; + c.colors = colors.clone(); + return c; + } + /** * A string representation of the current value. */ diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/ICCNamedColor.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/ICCNamedColor.java index ef5fd4c2a..744207c66 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/ICCNamedColor.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/ICCNamedColor.java @@ -19,17 +19,16 @@ package io.sf.carte.echosvg.css.engine.value.svg12; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSValue; -import io.sf.carte.echosvg.css.engine.value.AbstractValue; +import io.sf.carte.echosvg.css.engine.value.ColorValue; /** * This class represents an ICC named color value. * - * @author For later modifications, see Git history. * @version $Id$ */ -public class ICCNamedColor extends AbstractValue { +@Deprecated +public class ICCNamedColor extends ColorValue { public static final String ICC_NAMED_COLOR_FUNCTION = "icc-named-color"; @@ -51,13 +50,9 @@ public ICCNamedColor(String profileName, String colorName) { this.colorName = colorName; } - /** - * Implements - * {@link io.sf.carte.echosvg.css.engine.value.Value#getCssValueType()}. - */ @Override - public short getCssValueType() { - return CSSValue.CSS_CUSTOM; + public String getCSSColorSpace() { + return colorProfile; } /** @@ -74,6 +69,14 @@ public String getColorName() throws DOMException { return colorName; } + @Override + public ColorValue clone() { + ICCNamedColor c = (ICCNamedColor) super.clone(); + c.colorName = colorName; + c.colorProfile = colorProfile; + return c; + } + /** * A string representation of the current value. */ diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/LineHeightManager.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/LineHeightManager.java index cf96e4374..b067c0bfc 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/LineHeightManager.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/LineHeightManager.java @@ -20,9 +20,8 @@ package io.sf.carte.echosvg.css.engine.value.svg12; import org.w3c.dom.DOMException; -import org.w3c.dom.css.CSSPrimitiveValue; -import org.w3c.dom.css.CSSValue; +import org.w3c.css.om.unit.CSSUnit; import io.sf.carte.doc.style.css.nsac.LexicalUnit; import io.sf.carte.echosvg.css.engine.CSSEngine; import io.sf.carte.echosvg.css.engine.CSSStylableElement; @@ -39,8 +38,10 @@ /** * This class provides a factory for the 'margin-*' properties values. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public class LineHeightManager extends LengthManager { @@ -132,18 +133,18 @@ protected int getOrientation() { @Override public Value computeValue(CSSStylableElement elt, String pseudo, CSSEngine engine, int idx, StyleMap sm, Value value) { - if (value.getCssValueType() != CSSValue.CSS_PRIMITIVE_VALUE) + if (value.getCssValueType() != Value.CssType.TYPED) return value; - switch (value.getPrimitiveType()) { - case CSSPrimitiveValue.CSS_NUMBER: - return new LineHeightValue(CSSPrimitiveValue.CSS_NUMBER, value.getFloatValue(), true); + switch (value.getCSSUnit()) { + case CSSUnit.CSS_NUMBER: + return new LineHeightValue(CSSUnit.CSS_NUMBER, value.getFloatValue(), true); - case CSSPrimitiveValue.CSS_PERCENTAGE: { + case CSSUnit.CSS_PERCENTAGE: { float v = value.getFloatValue(); int fsidx = engine.getFontSizeIndex(); float fs = engine.getComputedStyle(elt, pseudo, fsidx).getFloatValue(); - return new FloatValue(CSSPrimitiveValue.CSS_NUMBER, v * fs * 0.01f); + return new FloatValue(CSSUnit.CSS_NUMBER, v * fs * 0.01f); } default: diff --git a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/SVG12ValueConstants.java b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/SVG12ValueConstants.java index 0d53a5355..18afe845d 100644 --- a/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/SVG12ValueConstants.java +++ b/echosvg-css/src/main/java/io/sf/carte/echosvg/css/engine/value/svg12/SVG12ValueConstants.java @@ -19,9 +19,7 @@ package io.sf.carte.echosvg.css.engine.value.svg12; -import org.w3c.dom.css.CSSPrimitiveValue; - -import io.sf.carte.echosvg.css.engine.value.StringValue; +import io.sf.carte.echosvg.css.engine.value.IdentValue; import io.sf.carte.echosvg.css.engine.value.Value; import io.sf.carte.echosvg.css.engine.value.svg.SVGValueConstants; import io.sf.carte.echosvg.util.CSSConstants; @@ -30,21 +28,23 @@ /** * This interface provides constants for SVG 1.2 values. * - * @author deweese - * @author For later modifications, see Git history. + *

+ * Original author: deweese. + * For later modifications, see Git history. + *

* @version $Id$ */ public interface SVG12ValueConstants extends SVGValueConstants { /** The 'start' keyword. */ - Value START_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, SVG12CSSConstants.CSS_FULL_VALUE); + Value START_VALUE = new IdentValue(SVG12CSSConstants.CSS_START_VALUE); /** The 'center' keyword. */ - Value CENTER_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, CSSConstants.CSS_CENTER_VALUE); + Value CENTER_VALUE = new IdentValue(CSSConstants.CSS_CENTER_VALUE); /** The 'end' keyword. */ - Value END_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, SVG12CSSConstants.CSS_END_VALUE); + Value END_VALUE = new IdentValue(SVG12CSSConstants.CSS_END_VALUE); /** The 'full' keyword. */ - Value FULL_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, SVG12CSSConstants.CSS_FULL_VALUE); + Value FULL_VALUE = new IdentValue(SVG12CSSConstants.CSS_FULL_VALUE); /** The 'normal' keyword, for 'line-height'. */ - Value NORMAL_VALUE = new StringValue(CSSPrimitiveValue.CSS_IDENT, SVG12CSSConstants.CSS_NORMAL_VALUE); + Value NORMAL_VALUE = new IdentValue(SVG12CSSConstants.CSS_NORMAL_VALUE); } diff --git a/echosvg-css/src/main/java/module-info.java b/echosvg-css/src/main/java/module-info.java index 46c922146..b8ae3f6f8 100644 --- a/echosvg-css/src/main/java/module-info.java +++ b/echosvg-css/src/main/java/module-info.java @@ -20,6 +20,7 @@ * CSS support. */ module io.sf.carte.echosvg.css { + exports io.sf.carte.echosvg.css; exports io.sf.carte.echosvg.css.engine; exports io.sf.carte.echosvg.css.engine.value.css2; exports io.sf.carte.echosvg.css.engine.value.svg; @@ -33,6 +34,7 @@ requires transitive io.sf.carte.css4j; requires io.sf.carte.util; requires transitive org.w3c.dom.svg; + requires transitive org.w3c.dom.view; requires java.xml; requires jdk.xml.dom; 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 f8e3d835d..30f1da964 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 @@ -22,17 +22,11 @@ invalid.access = \ The invoked method is not enabled for the "{0}" property. invalid.value.access = \ -The invoked method cannot be called for {0,choice,\ -0#the inherit value|\ -1#a primitive value|\ -2#the value list|\ -3#a custom value\ -} type. +The invoked method cannot be called for {0} type. invalid.string.type = \ The given string type ({1}) is invalid for \ -the "{0}" property \ -(see org.w3c.dom.css.CSSPrimitiveValue). +the "{0}" property. invalid.identifier = \ The "{1}" identifier is not a valid value for the "{0}" property. @@ -46,16 +40,7 @@ malformed.rect = \ The ''{0}'' property value is malformed. invalid.float.type = \ -The given CSS primitive value ({1,choice,\ -0#CSS_UNKNOWN|\ -19#CSS_STRING|\ -20#CSS_URI|\ -30#CSS_IDENT|\ -31#CSS_ATTR|\ -32#CSS_COUNTER|\ -33#CSS_RECT|\ -34#CSS_RGBCOLOR\ -}) represents an invalid type for the "{0}". +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. diff --git a/echosvg-dom/src/main/java/io/sf/carte/echosvg/dom/AbstractStylableDocument.java b/echosvg-dom/src/main/java/io/sf/carte/echosvg/dom/AbstractStylableDocument.java index 519d19a70..75a705d33 100644 --- a/echosvg-dom/src/main/java/io/sf/carte/echosvg/dom/AbstractStylableDocument.java +++ b/echosvg-dom/src/main/java/io/sf/carte/echosvg/dom/AbstractStylableDocument.java @@ -19,12 +19,12 @@ package io.sf.carte.echosvg.dom; +import org.w3c.css.om.CSSStyleDeclaration; import org.w3c.dom.DOMImplementation; import org.w3c.dom.DocumentType; import org.w3c.dom.Element; -import org.w3c.dom.css.CSSStyleDeclaration; -import org.w3c.dom.css.DocumentCSS; import org.w3c.dom.stylesheets.StyleSheetList; +import org.w3c.dom.view.DocumentCSS; import org.w3c.dom.views.AbstractView; import org.w3c.dom.views.DocumentView; 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 4d0e6b011..0a6ac758c 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 @@ -29,7 +29,7 @@ import org.w3c.dom.DocumentType; import org.w3c.dom.Element; import org.w3c.dom.css.DOMImplementationCSS; -import org.w3c.dom.css.ViewCSS; +import org.w3c.dom.view.ViewCSS; import io.sf.carte.doc.style.css.nsac.Parser; import io.sf.carte.doc.style.css.parser.CSSParser; diff --git a/echosvg-dom/src/main/java/io/sf/carte/echosvg/dom/util/CSSStyleDeclarationFactory.java b/echosvg-dom/src/main/java/io/sf/carte/echosvg/dom/util/CSSStyleDeclarationFactory.java index 789bfa509..f17c17a7c 100644 --- a/echosvg-dom/src/main/java/io/sf/carte/echosvg/dom/util/CSSStyleDeclarationFactory.java +++ b/echosvg-dom/src/main/java/io/sf/carte/echosvg/dom/util/CSSStyleDeclarationFactory.java @@ -18,13 +18,15 @@ */ package io.sf.carte.echosvg.dom.util; -import org.w3c.dom.css.CSSStyleDeclaration; +import org.w3c.css.om.CSSStyleDeclaration; /** * This interface represents CSSStyleDeclaration factories. * - * @author Stephane Hillion - * @author For later modifications, see Git history. + *

+ * Original author: Stephane Hillion. + * For later modifications, see Git history. + *

* @version $Id$ */ public interface CSSStyleDeclarationFactory { diff --git a/echosvg-dom/src/main/java/module-info.java b/echosvg-dom/src/main/java/module-info.java index efb7f0ad6..6789d62dc 100644 --- a/echosvg-dom/src/main/java/module-info.java +++ b/echosvg-dom/src/main/java/module-info.java @@ -37,6 +37,8 @@ requires io.sf.carte.xml.dtd; + requires transitive org.w3c.dom.view; + requires transitive java.xml; requires transitive jdk.xml.dom; diff --git a/echosvg-extension/src/main/java/io/sf/carte/echosvg/extension/StylableExtensionElement.java b/echosvg-extension/src/main/java/io/sf/carte/echosvg/extension/StylableExtensionElement.java index 0af8f556e..1f8fc3cb6 100644 --- a/echosvg-extension/src/main/java/io/sf/carte/echosvg/extension/StylableExtensionElement.java +++ b/echosvg-extension/src/main/java/io/sf/carte/echosvg/extension/StylableExtensionElement.java @@ -18,12 +18,13 @@ */ package io.sf.carte.echosvg.extension; +import org.w3c.css.om.CSSStyleDeclaration; +import org.w3c.css.om.typed.CSSStyleValue; import org.w3c.dom.Node; -import org.w3c.dom.css.CSSStyleDeclaration; -import org.w3c.dom.css.CSSValue; import org.w3c.dom.svg.SVGAnimatedString; -import org.w3c.dom.svg.SVGStylable; +import org.w3c.dom.svg.SVGStylableP; +import io.sf.carte.echosvg.css.dom.CSSValue; import io.sf.carte.echosvg.css.engine.CSSStylableElement; import io.sf.carte.echosvg.css.engine.StyleDeclarationProvider; import io.sf.carte.echosvg.css.engine.StyleMap; @@ -35,11 +36,14 @@ * usable as a foreign element within an SVGOMDocument, and the support for both * the 'style' attribute and the style attributes (ie: fill="red", ...). * - * @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 StylableExtensionElement extends ExtensionElement implements CSSStylableElement, SVGStylable { +public abstract class StylableExtensionElement extends ExtensionElement implements CSSStylableElement, + SVGStylableP { private static final long serialVersionUID = 1L; diff --git a/echosvg-test/src/test/java/io/sf/carte/echosvg/bridge/test/ModificationsTest.java b/echosvg-test/src/test/java/io/sf/carte/echosvg/bridge/test/ModificationsTest.java new file mode 100644 index 000000000..ea0c2399f --- /dev/null +++ b/echosvg-test/src/test/java/io/sf/carte/echosvg/bridge/test/ModificationsTest.java @@ -0,0 +1,134 @@ +/* + + 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.bridge.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.awt.Dimension; +import java.awt.geom.Dimension2D; + +import org.junit.jupiter.api.Test; +import org.w3c.css.om.CSSStyleDeclaration; +import org.w3c.css.om.typed.CSSStyleValue; +import org.w3c.dom.DOMImplementation; +import org.w3c.dom.Document; +import org.w3c.dom.DocumentType; +import org.w3c.dom.Element; +import org.w3c.dom.svg.SVGDocument; +import org.w3c.dom.svg.SVGSVGElement; +import org.w3c.dom.view.ViewCSS; +import org.w3c.dom.views.DocumentView; + +import io.sf.carte.echosvg.anim.dom.SVGDOMImplementation; +import io.sf.carte.echosvg.anim.dom.SVGStylableElement; +import io.sf.carte.echosvg.bridge.BridgeContext; +import io.sf.carte.echosvg.bridge.GVTBuilder; +import io.sf.carte.echosvg.bridge.UserAgentAdapter; +import io.sf.carte.echosvg.constants.XMLConstants; +import io.sf.carte.echosvg.css.dom.CSSValue; +import io.sf.carte.echosvg.css.dom.CSSValue.CssType; +import io.sf.carte.echosvg.gvt.GraphicsNode; +import io.sf.carte.echosvg.util.CSSConstants; +import io.sf.carte.echosvg.util.SVGConstants; + +/** + * Test value modifications. + */ +public class ModificationsTest { + + @Test + void testFillRGB() { + CSSStyleValue value = updateValue(CSSConstants.CSS_FILL_PROPERTY, "rgb(120, 30, 200)", + "color(display-p3 0.6 0.2 0.7)"); + assertNotNull(value); + } + + @Test + void testFillColorFunction() { + CSSStyleValue value = updateValue(CSSConstants.CSS_FILL_PROPERTY, "color(display-p3 0.6 0.2 0.7)", + "rgb(120, 30, 200)"); + assertNotNull(value); + } + + static CSSStyleValue updateValue(String ptyName, String ptyValue, String newValue) { + BridgeContext ctx = createBridgeContext(); + SVGDocument doc = createDocumentWithStyle(ptyName + ':' + ptyValue); + GraphicsNode gn = createGraphicsNode(ctx, doc); + assertNotNull(gn); + SVGStylableElement rect = (SVGStylableElement) doc.getElementById("rect1"); + assertNotNull(rect); + + ViewCSS view = (ViewCSS) ((DocumentView) doc).getDefaultView(); + CSSStyleDeclaration cs = view.getComputedStyle(rect, null); + CSSValue val = (CSSValue) cs.getCSSStyleValue(ptyName); + + assertNotNull(val); + assertEquals(CssType.TYPED, val.getCssValueType()); + assertEquals(ptyValue, val.getCssText()); + + rect.getStyle().setProperty(ptyName, newValue, null); + String styleDecl = ptyName + ": " + newValue + ';'; + assertEquals(styleDecl, rect.getStyle().getCssText().replace("\n", "")); + assertEquals(styleDecl, rect.getAttribute("style").replace("\n", "")); + + cs = view.getComputedStyle(rect, null); + CSSStyleValue modval = cs.getCSSStyleValue(ptyName); + + assertNotNull(modval); + assertEquals(newValue, modval.toString()); + + return modval; + } + + private static SVGDocument createDocumentWithStyle(String rectStyle) { + DOMImplementation impl = SVGDOMImplementation.getDOMImplementation(); + DocumentType dtd = impl.createDocumentType("svg", "-//W3C//DTD SVG 1.1//EN", + "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"); + SVGDocument doc = (SVGDocument) impl.createDocument(SVGConstants.SVG_NAMESPACE_URI, + SVGConstants.SVG_SVG_TAG, dtd); + SVGSVGElement svg = doc.getRootElement(); + svg.setAttribute("width", "200"); + svg.setAttribute("height", "200"); + Element rect = doc.createElementNS(SVGConstants.SVG_NAMESPACE_URI, SVGConstants.SVG_RECT_TAG); + rect.setAttribute(XMLConstants.XML_ID_ATTRIBUTE, "rect1"); + rect.setAttribute(SVGConstants.SVG_STYLE_ATTRIBUTE, rectStyle); + svg.appendChild(rect); + return doc; + } + + private static BridgeContext createBridgeContext() { + BridgeContext ctx = new BridgeContext(new UserAgentAdapter() { + + @Override + public Dimension2D getViewportSize() { + return new Dimension(200, 200); + } + + }); + ctx.setDynamic(true); + + return ctx; + } + + private static GraphicsNode createGraphicsNode(BridgeContext ctx, Document document) { + return new GVTBuilder().build(ctx, document); + } + +} diff --git a/echosvg-test/src/test/java/io/sf/carte/echosvg/bridge/test/PaintServerTest.java b/echosvg-test/src/test/java/io/sf/carte/echosvg/bridge/test/PaintServerTest.java new file mode 100644 index 000000000..fa50f2259 --- /dev/null +++ b/echosvg-test/src/test/java/io/sf/carte/echosvg/bridge/test/PaintServerTest.java @@ -0,0 +1,162 @@ +/* + + 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.bridge.test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Paint; +import java.awt.geom.Dimension2D; + +import org.junit.jupiter.api.Test; +import org.w3c.dom.DOMImplementation; +import org.w3c.dom.Document; +import org.w3c.dom.DocumentType; +import org.w3c.dom.Element; +import org.w3c.dom.svg.SVGDocument; +import org.w3c.dom.svg.SVGSVGElement; + +import io.sf.carte.echosvg.anim.dom.SVGDOMImplementation; +import io.sf.carte.echosvg.bridge.BridgeContext; +import io.sf.carte.echosvg.bridge.CSSUtilities; +import io.sf.carte.echosvg.bridge.GVTBuilder; +import io.sf.carte.echosvg.bridge.PaintServer; +import io.sf.carte.echosvg.bridge.UserAgentAdapter; +import io.sf.carte.echosvg.constants.XMLConstants; +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.value.ColorValue; +import io.sf.carte.echosvg.css.engine.value.Value; +import io.sf.carte.echosvg.gvt.GraphicsNode; +import io.sf.carte.echosvg.util.CSSConstants; +import io.sf.carte.echosvg.util.SVGConstants; + +/** + * Test PaintServer. + */ +public class PaintServerTest { + + @Test + public void testConvertRGB() { + Color color = convertPaint(CSSConstants.CSS_FILL_PROPERTY, "rgb(120, 30, 200)", + ColorValue.RGB_FUNCTION); + assertNotNull(color); + assertEquals(120, color.getRed()); + assertEquals(30, color.getGreen()); + assertEquals(200, color.getBlue()); + assertEquals(255, color.getAlpha()); + } + + @Test + public void testConvertColorFunction() { + Color color = convertPaint(CSSConstants.CSS_FILL_PROPERTY, "color(display-p3 0.6 0.2 0.7)", + ColorValue.CS_DISPLAY_P3); + assertNotNull(color); + float[] comp = new float[3]; + color.getColorComponents(comp); + assertEquals(.6f, comp[0]); + assertEquals(.2f, comp[1]); + assertEquals(.7f, comp[2]); + assertEquals(255, color.getAlpha()); + } + + @Test + public void testConvertColorFunctionXYZD50() { + Color color = convertPaint(CSSConstants.CSS_FILL_PROPERTY, "color(xyz-d50 0.06 0.08 0.09 / 0.969)", + ColorValue.CS_XYZ_D50); + assertNotNull(color); + float[] comp = new float[3]; + color.getColorComponents(comp); + assertEquals(.06f, comp[0], 1e-5f); + assertEquals(.08f, comp[1], 1e-5f); + assertEquals(.09f, comp[2], 1e-5f); + assertEquals(247, color.getAlpha()); + } + + @Test + public void testConvertColorFunctionXYZD65() { + Color color = convertPaint(CSSConstants.CSS_FILL_PROPERTY, "color(xyz-d65 0.065 0.033 0.06 / 0.2)", + ColorValue.CS_XYZ_D65); + assertNotNull(color); + float[] comp = new float[3]; + color.getColorComponents(comp); + assertEquals(.06586f, comp[0], 1e-5f); // D50 + assertEquals(.0335833f, comp[1], 1e-5f); // D50 + assertEquals(.045024f, comp[2], 1e-5f); // D50 + assertEquals(51, color.getAlpha()); + } + + private static Color convertPaint(String ptyName, String paintDef, String cssSpace) { + BridgeContext ctx = createBridgeContext(); + SVGDocument doc = createDocumentWithPaint(ptyName + ':' + paintDef); + GraphicsNode gn = createGraphicsNode(ctx, doc); + CSSStylableElement rect = (CSSStylableElement) doc.getElementById("rect1"); + assertNotNull(rect); + + CSSEngine cssEng = CSSUtilities.getCSSEngine(rect); + int index = cssEng.getPropertyIndex(ptyName); + Value val = cssEng.getComputedStyle(rect, null, index); + + assertNotNull(val); + assertEquals(Type.COLOR, val.getPrimitiveType()); + ColorValue cssColor = val.getColorValue(); + assertEquals(cssSpace, cssColor.getCSSColorSpace()); + assertEquals(paintDef, cssColor.getCssText()); + + Paint paint = PaintServer.convertPaint(rect, gn, val, 1f, ctx); + assertNotNull(paint); + + return PaintServer.convertColor(cssColor, 1f); + } + + private static SVGDocument createDocumentWithPaint(String rectStyle) { + DOMImplementation impl = SVGDOMImplementation.getDOMImplementation(); + DocumentType dtd = impl.createDocumentType("svg", "-//W3C//DTD SVG 1.1//EN", + "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"); + SVGDocument doc = (SVGDocument) impl.createDocument(SVGConstants.SVG_NAMESPACE_URI, + SVGConstants.SVG_SVG_TAG, dtd); + SVGSVGElement svg = doc.getRootElement(); + svg.setAttribute("width", "200"); + svg.setAttribute("height", "200"); + Element rect = doc.createElementNS(SVGConstants.SVG_NAMESPACE_URI, SVGConstants.SVG_RECT_TAG); + rect.setAttribute(XMLConstants.XML_ID_ATTRIBUTE, "rect1"); + rect.setAttribute(SVGConstants.SVG_STYLE_ATTRIBUTE, rectStyle); + svg.appendChild(rect); + return doc; + } + + private static BridgeContext createBridgeContext() { + return new BridgeContext(new UserAgentAdapter() { + + @Override + public Dimension2D getViewportSize() { + return new Dimension(200, 200); + } + + }); + } + + private static GraphicsNode createGraphicsNode(BridgeContext ctx, Document document) { + return new GVTBuilder().build(ctx, document); + } + +} diff --git a/echosvg-test/src/test/java/io/sf/carte/echosvg/svggen/test/FontDecoration.java b/echosvg-test/src/test/java/io/sf/carte/echosvg/svggen/test/FontDecoration.java index ff1ba8780..2323a37f5 100644 --- a/echosvg-test/src/test/java/io/sf/carte/echosvg/svggen/test/FontDecoration.java +++ b/echosvg-test/src/test/java/io/sf/carte/echosvg/svggen/test/FontDecoration.java @@ -79,6 +79,7 @@ public void paint(Graphics2D g) { float[] comps = { 0.33f, 0.34f, 0.43f }; stColor = new Color(cs, comps, 1f); } catch (IOException e) { + e.printStackTrace(); stColor = new Color(0x666699); } // The color will be translated to XYZ (D50) @@ -101,6 +102,7 @@ public void paint(Graphics2D g) { float[] comps = { .55f, .6f, .34f }; lColor = new Color(cs, comps, 1f); } catch (IOException e) { + e.printStackTrace(); lColor = Color.magenta; } @@ -119,6 +121,7 @@ public void paint(Graphics2D g) { float[] comps = { .36f, .35f, .33f }; ulColor = new Color(cs, comps, 1f); } catch (IOException e) { + e.printStackTrace(); ulColor = Color.black; } diff --git a/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/SamplesCanvgRenderingTest.java b/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/SamplesCanvgRenderingTest.java index 3f3dfb632..7134857f7 100644 --- a/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/SamplesCanvgRenderingTest.java +++ b/echosvg-test/src/test/java/io/sf/carte/echosvg/test/svg/SamplesCanvgRenderingTest.java @@ -913,7 +913,7 @@ public void testIssue289() throws TranscoderException, IOException { */ @Test public void testIssue320() throws TranscoderException, IOException { - testNVErrIgnore("samples/canvg/issue320.svg", BROWSER_MEDIA, 1); + testNV("samples/canvg/issue320.svg"); } @Test @@ -1049,7 +1049,7 @@ public void testIssue620() throws TranscoderException, IOException { @Test public void testIssue690() throws TranscoderException, IOException { - testNVErrIgnore("samples/canvg/issue690.svg", BROWSER_MEDIA, 4); + testNV("samples/canvg/issue690.svg"); } @Test 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 31dbd5cf0..729213f8e 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 @@ -27,6 +27,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import io.sf.carte.echosvg.test.ScriptUtil; import io.sf.carte.echosvg.test.TestFonts; import io.sf.carte.echosvg.transcoder.TranscoderException; @@ -47,6 +48,7 @@ public class SamplesSpecRenderingTest extends AbstractSamplesRendering { @BeforeAll public static void setUpBeforeClass() throws Exception { TestFonts.loadTestFonts(); + ScriptUtil.defaultRhinoShutter(); } /* diff --git a/gradle.properties b/gradle.properties index 59c8f269d..3c5adc532 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,8 @@ css4jAwtVersion=4.0 xmlDtdVersion=4.3 rhinoVersion=1.7.15 legacyColorsVersion=1.0 -svgomVersion=1.0.1 +domViewVersion=1.0 +svgomVersion=1.1 xmlApisVersion=1.4.01 commonsIOVersion=2.16.1 htmlParserVersion=1.4.16 diff --git a/samples/tests/spec/scripting/domSVGColor.svg b/samples/tests/spec/scripting/domSVGColor.svg index 9a97c3915..126e4ebd7 100644 --- a/samples/tests/spec/scripting/domSVGColor.svg +++ b/samples/tests/spec/scripting/domSVGColor.svg @@ -23,8 +23,8 @@ - - + + @@ -45,60 +45,67 @@ test(); } - function showFill(id, suff) { + function showFill(id, suff, newValue) { var elem = document.getElementById(id); - var fill = elem.style.getPropertyCSSValue("fill"); - var tb = document.getElementById(id+suff); - tb.appendChild(document.createTextNode(fill.getCssText())); + var st = elem.style; + var fill = st.getCSSStyleValue("fill"); + var tb = document.getElementById(id+suff); + var text = fill.getCssText(); + tb.appendChild(document.createTextNode(text)); + if (newValue) { + st.setProperty("fill", newValue, ""); + fill = st.getCSSStyleValue("fill"); + } return fill; } function test() { var fill, r, g, b; - fill = showFill("r1", ".b"); - fill.setCssText("gold"); - showFill("r1", ".a"); - - fill = showFill("r2", ".b"); - fill.setCssText("gold"); - showFill("r2", ".a"); + fill = showFill("r1", ".b", "gold"); + showFill("r1", ".a"); - fill = showFill("r3", ".b"); - r = fill.getRed(); r.setCssText("50"); - showFill("r3", ".a"); + fill = showFill("r2", ".b"); + r = fill.getR(); r.setValue(31.4); + fill.b.setValue(50); + showFill("r2", ".a"); - fill = showFill("r4", ".b"); - r = fill.getRed(); r.setFloatValue(UNIT_NUMBER, 50); - showFill("r4", ".a"); - - fill = showFill("r5", ".b"); - r = fill.getRed(); r.setFloatValue(UNIT_NUMBER, 128); - showFill("r5", ".a"); - - fill = showFill("r6", ".b"); - g = fill.getGreen(); g.setCssText("50"); - showFill("r6", ".a"); + fill = showFill("r3", ".b"); + r = fill.getR(); r.setValue(19.6); + showFill("r3", ".a"); + + fill = showFill("r4", ".b", "color(display-p3 0.94 0.55 0.31)"); + fill.item(2).setValue(0.64); + showFill("r4", ".a"); + + fill = showFill("r5", ".b"); + r = fill.getR(); r.setValue("128"); + fill.setAlpha(0.95); + showFill("r5", ".a"); + + fill = showFill("r6", ".b"); + g = fill.getG(); g.setValue("19.6%"); + showFill("r6", ".a"); - fill = showFill("r7", ".b"); - g = fill.getGreen(); g.setFloatValue(UNIT_PERCENT, 19.6); - showFill("r7", ".a"); + fill = showFill("r7", ".b"); + g = fill.getG(); g.setValue(19.6); + showFill("r7", ".a"); - fill = showFill("r8", ".b"); - g = fill.getGreen(); g.setFloatValue(UNIT_NUMBER, 128); - showFill("r8", ".a"); + fill = showFill("r8", ".b"); + g = fill.getG(); g.setValue("50%"); + showFill("r8", ".a"); - fill = showFill("r9", ".b"); - b = fill.getBlue(); b.setCssText("50"); - showFill("r9", ".a"); - - fill = showFill("r10", ".b"); - b = fill.getBlue(); b.setFloatValue(UNIT_NUMBER, 50); - showFill("r10", ".a"); + fill = showFill("r9", ".b"); + b = fill.getB(); b.setValue("50"); + showFill("r9", ".a"); + + fill = showFill("r10", ".b"); + b = fill.getB(); b.setValue(19.6); + showFill("r10", ".a"); - fill = showFill("r11", ".b"); - fill.setCssText("rgb(220, 0, 128, 0.87)"); - showFill("r11", ".a"); + fill = showFill("r11", ".b", "rgba(220, 0, 128, 1)"); + fill.setAlpha(0.87); + showFill("r11", ".a"); } ]]> diff --git a/samples/tests/spec/scripting/paintType.svg b/samples/tests/spec/scripting/paintType.svg index 2c3cab35f..439eddde3 100644 --- a/samples/tests/spec/scripting/paintType.svg +++ b/samples/tests/spec/scripting/paintType.svg @@ -54,7 +54,7 @@ function getType(id, attr) { var e = document.getElementById(id); - var pa = e.getPresentationAttribute(attr); + var pa = e.getPresentationAttributeValue(attr); var pt = pa.paintType; var txt; if (pt == UNKNOWN) txt="UNKNOWN"; diff --git a/samples/tests/spec/scripting/relativeURI.svg b/samples/tests/spec/scripting/relativeURI.svg index a83684761..dcbaa2b61 100644 --- a/samples/tests/spec/scripting/relativeURI.svg +++ b/samples/tests/spec/scripting/relativeURI.svg @@ -83,7 +83,7 @@ function init() { cssStyle.setProperty("cursor", "url(#cur),crosshair",""); localStr = cssStyle.getPropertyValue("cursor"); - absStr = computedStyle.getPropertyCSSValue("cursor"); + absStr = computedStyle.getCSSStyleValue("cursor"); absStr = absStr.item(0).getCssText(); t3.firstChild.nodeValue = unifyURL(localStr); t4.firstChild.nodeValue = unifyURL(absStr); diff --git a/samples/tests/spec/scripting/setProperty.svg b/samples/tests/spec/scripting/setProperty.svg index 5960648bd..e26db294d 100644 --- a/samples/tests/spec/scripting/setProperty.svg +++ b/samples/tests/spec/scripting/setProperty.svg @@ -49,7 +49,7 @@ e = document.getElementById("r2"); style = e.getStyle(); - var paint = style.getPropertyCSSValue("fill"); + var paint = style.getCSSStyleValue("fill"); paint.setPaint(SVGPaint.SVG_PAINTTYPE_URI, "#lg", "", ""); if (paint.getPaintType() != SVGPaint.SVG_PAINTTYPE_URI) throw ("Wrong paint type: " + paint.getPaintType()); diff --git a/test-references/io/sf/carte/echosvg/svggen/rendering/ContextDrawImageICC.png b/test-references/io/sf/carte/echosvg/svggen/rendering/ContextDrawImageICC.png index 9f13bf707c595f350e6d11dd1f5cc8e97875675d..73c0be7d355833b9dab82fcbf34434fe9ae7f6cf 100644 GIT binary patch delta 870 zcmX@XeVlv3lzKT&7srr_TW{}f^q!I^bKv9s>bn9J4-z^i^XevbOq_*NU^2)ry9%Dg6Rpi&#TwZ=V$q9X7k5nEb@DxCqsd+@ypt1{SSOpa>eM$Fov!=4*80;`w?`M<;@o)ldsrR$ zO1!GzI}3hJ#Ej+zuNUSh#njuB!i+oTKNFWs`Z%SkTojvisy|>M$ z2Qi;c=DuH>zD?rP;#+SX9B^H;%ul%AX3M3%gqw*Pg5MLt5r7gIO|0OEiSfRi&e@)> zye$0^-yDBGmHBt}{B8ZjzIwI(qH>kD2c92q50n2eO#tkE0Uc0yP5#5otE;eg*?FO3 zp1O}#Oe=ZNyl>x^&DOWJ9}f7H081UmH-G)IdG+sQRY1*?^_e7C95(1MPBvt%mt?pw avyP$tROW_HyE(Z)e(`kmb6Mw<&;$U~wv)#I delta 864 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 delta 5269 zcmXYycR1VK`^QmT=+g4ksFtF{Dq7S^Cu;8w$FCCjm~~QiqD9h<-n1TMfZV={EXZbDgr{9}l(jGHhD_<||qvUt8R4y~(eH8otn& zkTB25chROvO{<4fh>Z1jxSi;?qy?$Tl}pr$7)074q0tT6bX8}fH9b}dyC1v63KV*lxNR=_#K^hZDvnKMvf0wB*?8) z>c=B{U-20My>iqB>#+;7%R+pOit@aQ%?F|bW&Tn|=h9un(=4P!rw^*a`eT+EKv-+@ z$8DHMhLLIS#*T*Bz+D6ZlT8xS;U{ zS(f=4#$^_dJ!51Om)R9$l>+Ecofy z>1_|_HTt$(*4MSN3TY9M>w;tUSY;LrjT6fNys1vr3dBw5YVkF^637S@JPcWcP$* zs+9zvN5cAuZ!%P&{|zr=>gUtBA)V2O9^OSg_19^U-%bqY9r#|=DaaQnm(IHe>B8!E zJe`o+&$a16??&b+;$p*HUA25i%q6J-ACt4fU(p$97PvsKwePzdr(H)ctWf`Q@umZt~frl&qmMnYE3b5^)fFD_rfe@dgUuVBBx zT1Ajyd*PDLtlsgSlA-A}-!XzI=}cEWQi&2M8x@@SkGJ{@*ArLYJT2MmuG_URfa->p zhe<6A#Rn4(d;AW55h=@)SI*3fD|EOy0k&St#f#Pnw93LZcp}-PCK!%r*$ec7xvuTJ zj7hTdGi(!QY^B}yHv4?~PuUBn;OA9MQB>gv$kHiX&VHdNFfiK9^;@94brn9YFe$p+ zLfDHMYJLIs^}@}Cjl(i0_(eJ4W9Zy`sgs8za)4dFga0^aR-KA&aj;c4*6U}m8hdAea z6>?15&11$`eJ#8(oTB(OWp(#gl%eH;Y~}mZjC$(&KMpxT>axSFb&-vbhSY<=Tl??2 zZXZGbF^WUF>p#8KsrA@YbRO^{oD=GJ+Oafn!VBqBh)gE+h3zu69i-G`bxj^i+9AavHPQ1G;P>uPGB}f4&@4zyrcm<#+?43eu}fAJeWH?&!Vu(<_}4 zNexWK(G>>?31A5c$u+rZ(9cxXLoFfYb;-r50F|c)rPHEE^5D!GBg5$1+8#T6*%8Xj z(2St(=h(UVEcJUnXkP`1wcMZQv}WQiIaWuS1=NR}-0NKhuaE+YL;C~UlKMJ})V^F+ zY+n}ubw>aif%n7lpBy66y~838HE%faTQ2#cXMJl!%_j3tCJzol>I%c4 z>{mQsettXo&CLOE(sG%UE$< zW~Y%6E1yzOqSg1_^XhU{5@l`A(w!$=mr1Z8J|Nsh@8FhC8@0AJZfSPIFVEq^Dfn#i zeDb8Ca45_<^R!q?kh?n!UndYcG5NzM==B*#nNPy+N8@M--M+2HUil9vM8l7eOmg!2 zh)9CSjh$u3r8%LD9sZQUuGUUIej~orz$M+Mlbo%IJ%F9QXfc(I^zSIFpKQs#s7Q+tl#Q+Dz_BtAk(?ja_d+$jV+s} zKx2`|YJBa2SJdfybS&`zGSz(5$9Nqp27nE`e4aJ1`l%QjT{G*^?)~WsPHpOeQL8bu z$nChPb??<*+(Qe>Yh%?GOA(9W4w*}up-P+{S(uyM0wCdq#y+LWj3RSuh=tPidJzTh zPitb=sKT|2lQqg>1^lET0mHj$4S7wscz&jnN^;9RXWfMi*b2sRAy<-_lDx?{K3{j8>J7^A|xu-xRD1D z^FprAX$-&;_vq1#>^kPz#Vg20nYU(ponU-=L8Ink+GxFVPMhG&LP6<_zm0f6YY56} z@5blhQHv6*LFwNgxvW*{E+tg}O(Yn2ke}dF+QtBUvx9E@K-@4~R)$>A&-u6DtcVXNU7#)yIGkEzwPjgnq_{Oe02SvzyPo&EpQR>2E>S(YNQ*;H~Yf z$W?#m7<}pw34&0oV&r!D!-$eB-^5nTpCep>?{ZAs*ye8%>ouoPp)Bw~{n5?a*m#48 zLnRh=bbn_ea1#6GF^N|xbgS{Na<+SclU#d-g%$PLv!vf=;I9?;&R^|6*yKw7_#X=O zp8o^>9&@#i5$1R7ZpTu9-T$-7{}?(2ni+}Ips<{;Qq3Qm>tgu)m3D4iP6A)gD3I|X zFZ%yo5Yz=QSc-TCnOA9a?>{-UY1SYO|G^WbxkX}Cc_GM)Q}F_9HkZfa9L97Z(uvxU zx{wI%vbj(P7)t^FQH4;E-l_lZ*#DZw!kP$Tx!b|U^1m^C6G^F||J%AkPa1-(9_%IC z!5X7?H=gb>KD7$&W2u1R>Vf33{vCrqnaO&+2c{mltzzj z-cQu@5k~0p7*vSBbG_5+rG7gm8FVH-Xkf;i^=x%)=vy0_5kTs3S@Nworn2+g{9bQ` zH*Z!Fu`i~m7Xz`Y$dRGkOJ;d>uY*6WP-9$iiM?d2^ktLm0O4k1@6wSzqh+La3j?de zU@*edLx8mFYnq9etKQ@vspZjwsyg@b#KbM_y zg#%i+beWD`33nkcIj02rrQID@QIUgQ7KKXasu!Dh;N7aKy{|yy$Te*t**Nigt3hf4 z|90s@U5*VtvR!^?V-W2D0R+ON1rQHb%|&NRaP^jhnN!@HysU%zhNsV==zjyx-au8b0~Y0tMXrL6&C zRMsS!VY*uTo6v$9$jr}v#XpabI^zMMi++ym6ZcD*pOhY!&wqLM2A4Gjvdt`IV5SCP z0URn7E!5-sP;en4a*1y!%l7A*H~+RT$K|=95ev7PRk`?xI|;;YJuUUTF2Njx!R=6! zQGEgQ%E7@dJ$!t*ikt(FG#Ka_2G*Y7V!Hn90Hjfihoxg>PKyl5g?l&3KCo|*AFBbidmNcsbD7Ia&6$i zEggUGliS|r(v@|o0<$p__lqeVlBWc#VoOMb!r_an^1SMf;zq>{mw4w8rS=(wCx>JN z_Lq)CH07*)FY)wsEqhYb%%_q(Zip6=ElNoL2w2Kcemr`3z8q3V0c**Cnj7X1c2j}q zZwfjkmb!}=-4j-8xk~`KD_GTRH+CSVBON^_zu0a6OO7bX^((qF@YvD3r++LvYNKxD zeFNlif{Bry-qrMfP1dJV>Gay3lgUf6%e@R8#E&I;xiXNCR%ur5O%b_$*B0r+h2d|xkHL7 zgZ5!D_UE$D&UR58wN9NwI00?IAcgUv?ilXIsv5S0dHr@`Mdlzib6h#hXw-)^bV&vc zIaugKPb@9GugY|NLBx1AEDm%p%y1$TPg&ljytF0DdCJLQQ^%@>Z1V~R7t(RGf#;9I zX}v>bEsQnrLcv(lt8sa`$v5L>5mRCKcFhGJ9*DKdfy#~S_2Y8a88)F?+$SikEZ08Q z@aeRLF6gb;S;Ka9+hp8p>rS;tub diff --git a/test-references/io/sf/carte/echosvg/svggen/rendering/DrawImageICC.png b/test-references/io/sf/carte/echosvg/svggen/rendering/DrawImageICC.png index 4a96bffc048d9b86b756ed1c3ce5bb3b0010cc42..9ebad569bb43480c00771819acb5e3a319fd2dd5 100644 GIT binary patch delta 931 zcmX@feVlv3lzKT&7srr_TW{}f%oYxmIq>oRQ648|S*_6NI(mz?Y}?`KIDOYI`5V5w zvqfZPEpu|*y(84!-JN~9pV*@ifz^}$H}Z)wDamG?Yg!;C#C>&o%)0sfBDY?D_;k;D zU(79QAw~uSaGmtk#!7DIQq2i|^J}FHzeYXzy7x$ZbIgvpHF9sapEpu}S`hO4Z_?V} zrklDonn%@4=lM@bl6(F=*>wNxiU}*PIicljF=MtHs{EboJR?7Yc^cCC&a`d){wy1#HtX%(8S6y z*_(yag89<-i*t70y*NK+dr;r`&!68&$q4EEc)#zOl3lN=tWx*++hS209^B83?Tgqy ztE9tg&6$W7pFWxEOg3PWwmNn8@OhpypN^$%`=6><(8>xno_onmNxd@K-Xw;><0?^(Df8?qYJYixdVz5MaS z^`%1nX2tf8F6~|7Y%yA$9EIAw}8TKnkp;~G?@5T)~CDGajngtJ+rr@b@D+b$;lg; z6pX>?>p(!tUcPJD6R&?4>aTfN_UYu-`*x>u45zqny?*fX?~SwW``UcE@=Bp8wSA$> zo%YGLERyvFDz@`g=j;<{>taP^#<&p9=|YvX{ICKArP%w(g_L5tkb8&$pXgS2ln9TZ1Wf5z*6?udP>;tti_#wXRHeeh5E$k^?0_ oj>!QmY|OwA1jbo|1cTdU{vBqSJ7bkEJ_Py4)78&qol`;+00StBq5uE@ delta 873 zcmX@keUf{^lzIhE7srr_TW{~4_ZCT%Iq>j(jy8*4g~k-UxLq!Rn)h5ToGyE7e_?j1 zK6g{pbq5XoyJr?3?~~nC;k6-HVCC|E%~mQp9vo9A3w&WN<6cu)W`+>P_%`$+fO_zf_GsDv0N+%s+l@_SQ3=H>I!o?T^Tu znow3O@4eBJ`*pgPVL!L~##Qnva!)=LnKvz!u?^bDGWi0Fn5IGm!|}kaEG4I>{_ME9 zb4#+!we(5nlMjY*i9HRs7B{q+XAx1oTkKY})8qwAVwMZMt?XtM|K9Lly*xtm`17BY zWxW4{bbh@5mM!?6eKOy~qwTrex)C4V$N9Ug@l%&wB;=hewrkHHUhc{3nWU^6iaviZ zj@`Ut<4oDwNRF69#wJ#v^-ZiCVhst59AaShhxEDcOY&`A{60B1>yG|$JyZ5MD<5!y z^lMJu&BSj74u^&ga1e0+T@@`GXMXhBkC-=~S6M#TqqQSzceDBOdE&oZ?Q09~o@-2~ zE&ums%2YL4hri^C04uop(j5T~e9e+XL-i zXFi!6y)&o}*%;qlVLzkf z!Q6=xzij@!A-R3wmxEQdf*Y;omOS`4`}^hd>ns!64}#N{B-25r$%d@;k_<1r?=x&z Wl(|zgW8DFe^F3YtT-G@yGywogSA4Pn diff --git a/test-references/io/sf/carte/echosvg/svggen/rendering/FontDecoration.png b/test-references/io/sf/carte/echosvg/svggen/rendering/FontDecoration.png index c0c1a1fcc49d4954e73ed932dc644cb6afd8bc58..c27a30c910015a2a3159aa492dfe8df89383ea61 100644 GIT binary patch delta 5292 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 THXpDU00000NkvXXu0mjfdSJJq diff --git a/test-references/samples/canvg/issue320.png b/test-references/samples/canvg/issue320.png index 6c76d3afd8abfffea9a4bbaa93742d8f7fe9b58b..65f66d7720e0fbc5f3a314adc37ec98f9b499168 100644 GIT binary patch delta 10792 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

AU+)V9L$h9@THx^=*2Io&K2*j$ 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 Qe7wuv#@YI@rC-v20NPEQ)&Kwi diff --git a/test-references/samples/tests/spec/scripting/domSVGColor.png b/test-references/samples/tests/spec/scripting/domSVGColor.png index 428697d1d7804f04c805df47402b45d0b8cb98a8..63bfc7d045683ebf6ca31d486a57426561a78622 100644 GIT binary patch literal 35278 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 diff --git a/test-references/samples/tests/spec/scripting/paintType.png b/test-references/samples/tests/spec/scripting/paintType.png index 6c8ccb9f33918ee48daf74118eb96578fbc4297f..72e7c98d6dc052702417df3fb6d8242951225362 100644 GIT binary patch delta 10936 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 delta 12463 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 diff --git a/test-resources/io/sf/carte/echosvg/css/dom/bug11670.svg b/test-resources/io/sf/carte/echosvg/css/dom/bug11670.svg index f7e8e7985..76ee42cab 100644 --- a/test-resources/io/sf/carte/echosvg/css/dom/bug11670.svg +++ b/test-resources/io/sf/carte/echosvg/css/dom/bug11670.svg @@ -64,15 +64,15 @@ return; } - var val = style.getPropertyCSSValue("fill"); + var val = style.getCSSStyleValue("fill"); if ( val == null ){ result.setAttributeNS(null, "errorCode", - "CSSStyleDeclaration.getPropertyCSSValue returned null"); + "CSSStyleDeclaration.getCSSStyleValue returned null"); return; } - val = val.getRGBColor() + val = val.getColorValue() if (val.red.getFloatValue(1) != 2 || val.green.getFloatValue(1) != 3 || diff --git a/test-resources/io/sf/carte/echosvg/css/dom/bug9740.svg b/test-resources/io/sf/carte/echosvg/css/dom/bug9740.svg index 403912392..dabf6ff7b 100644 --- a/test-resources/io/sf/carte/echosvg/css/dom/bug9740.svg +++ b/test-resources/io/sf/carte/echosvg/css/dom/bug9740.svg @@ -65,18 +65,18 @@ return; } - var val = style.getPropertyCSSValue("fill"); + var val = style.getCSSStyleValue("fill"); if ( val == null ){ - result.setAttributeNS(null, "errorCode", "CSSStyleDeclaration.getPropertyCSSValue returned null"); + result.setAttributeNS(null, "errorCode", "CSSStyleDeclaration.getCSSStyleValue returned null"); return; } - val = val.getRGBColor() + val = val.getColorValue() - if (val.red.getFloatValue(1) != 255 || - val.green.getFloatValue(1) != 0 || - val.blue.getFloatValue(1) != 0) { + if (val.red.getValue() != 255 || + val.green.getValue() != 0 || + val.blue.getValue() != 0) { result.setAttributeNS(null, "errorCode", "invalid color components"); return; } diff --git a/test-resources/io/sf/carte/echosvg/css/dom/rgbPresentationTest.svg b/test-resources/io/sf/carte/echosvg/css/dom/rgbPresentationTest.svg index 55877b98b..9aab14ef0 100644 --- a/test-resources/io/sf/carte/echosvg/css/dom/rgbPresentationTest.svg +++ b/test-resources/io/sf/carte/echosvg/css/dom/rgbPresentationTest.svg @@ -57,14 +57,14 @@ return } - var val = elt.getPresentationAttribute("fill") + var val = elt.getPresentationAttributeValue("fill") if (val == null) { result.setAttributeNS(null, "errorCode", "CSSStyleDeclaration.getPropertyCSSValue returned null") return } - var rgb = val.getRGBColor() + var rgb = val.getColorValue(); if (rgb.red.cssText != "1"){ result.setAttributeNS(null, "errorCode", "invalid red component"); diff --git a/test-resources/io/sf/carte/echosvg/css/dom/rgbTest.svg b/test-resources/io/sf/carte/echosvg/css/dom/rgbTest.svg index a04490c9b..2ac9c3e58 100644 --- a/test-resources/io/sf/carte/echosvg/css/dom/rgbTest.svg +++ b/test-resources/io/sf/carte/echosvg/css/dom/rgbTest.svg @@ -63,14 +63,14 @@ return; } - var val = decl.getPropertyCSSValue("fill"); + var val = decl.getCSSStyleValue("fill"); if ( val == null ){ - result.setAttributeNS(null, "errorCode", "CSSStyleDeclaration.getPropertyCSSValue returned null"); + result.setAttributeNS(null, "errorCode", "CSSStyleDeclaration.getCSSStyleValue returned null"); return; } - val = val.getRGBColor() + val = val.getColorValue() if (val.red.cssText != "1"){ result.setAttributeNS(null, "errorCode", "invalid red component"); diff --git a/test-resources/io/sf/carte/echosvg/css/dom/rgbUpdateTest.svg b/test-resources/io/sf/carte/echosvg/css/dom/rgbUpdateTest.svg index aa0f9e9ec..6433b15e3 100644 --- a/test-resources/io/sf/carte/echosvg/css/dom/rgbUpdateTest.svg +++ b/test-resources/io/sf/carte/echosvg/css/dom/rgbUpdateTest.svg @@ -64,14 +64,14 @@ return } - var val = decl.getPropertyCSSValue("fill") + var val = decl.getCSSStyleValue("fill") if (val == null) { result.setAttributeNS(null, "errorCode", "CSSStyleDeclaration.getPropertyCSSValue returned null") return } - val = val.getRGBColor() + val = val.getColorValue() val.red.cssText = 4 @@ -88,7 +88,7 @@ return } - val = decl.getPropertyCSSValue("fill") + val = decl.getCSSStyleValue("fill") val.cssText = "#050607"