- From: CVS User ylafon <cvsmail@w3.org>
- Date: Wed, 02 Jan 2013 12:44:14 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css2 In directory roscoe:/tmp/cvs-serv20147/css2 Modified Files: Css2Style.java Added Files: CssRichness.java Log Message: richness --- /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java 2013/01/02 10:52:59 1.36 +++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java 2013/01/02 12:44:14 1.37 @@ -1,5 +1,5 @@ // -// $Id: Css2Style.java,v 1.36 2013/01/02 10:52:59 ylafon Exp $ +// $Id: Css2Style.java,v 1.37 2013/01/02 12:44:14 ylafon Exp $ // From Philippe Le Hegaret (Philippe.Le_Hegaret@sophia.inria.fr) // // (c) COPYRIGHT MIT and INRIA, 1997. @@ -33,6 +33,7 @@ import org.w3c.css.properties.css.CssOverflow; import org.w3c.css.properties.css.CssPosition; import org.w3c.css.properties.css.CssQuotes; +import org.w3c.css.properties.css.CssRichness; import org.w3c.css.properties.css.CssRight; import org.w3c.css.properties.css.CssSpeak; import org.w3c.css.properties.css.CssSpeakHeader; @@ -51,7 +52,7 @@ import org.w3c.css.values.CssIdent; /** - * @version $Revision: 1.36 $ + * @version $Revision: 1.37 $ */ public class Css2Style extends ACssStyle { @@ -66,6 +67,7 @@ public CssSpeechRate cssSpeechRate; public CssSpeakPunctuation cssSpeakPunctuation; public CssSpeakNumeral cssSpeakNumeral; + public CssRichness cssRichness; /** * font properties @@ -549,6 +551,15 @@ } return cssSpeakNumeral; } + + public final CssRichness getRichness() { + if (cssRichness == null) { + cssRichness = + (CssRichness) style.CascadingOrder(new CssRichness(), + style, selector); + } + return cssRichness; + } /** * Find conflicts in this Style * --- /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssRichness.java 2013/01/02 12:44:14 NONE +++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssRichness.java 2013/01/02 12:44:14 1.1 // $Id: CssRichness.java,v 1.1 2013/01/02 12:44:14 ylafon Exp $ // Author: Yves Lafon <ylafon@w3.org> // // (c) COPYRIGHT MIT, ERCIM and Keio University, 2012. // Please first read the full copyright statement in file COPYRIGHT.html package org.w3c.css.properties.css2; import org.w3c.css.util.ApplContext; import org.w3c.css.util.InvalidParamException; import org.w3c.css.values.CssExpression; import org.w3c.css.values.CssNumber; import org.w3c.css.values.CssTypes; import org.w3c.css.values.CssValue; /** * @spec http://www.w3.org/TR/2008/REC-CSS2-20080411/aural.html#propdef-richness */ public class CssRichness extends org.w3c.css.properties.css.CssRichness { /** * Create a new CssRichness */ public CssRichness() { } /** * Creates a new CssRichness * * @param expression The expression for this property * @throws org.w3c.css.util.InvalidParamException * Expressions are incorrect */ public CssRichness(ApplContext ac, CssExpression expression, boolean check) throws InvalidParamException { if (check && expression.getCount() > 1) { throw new InvalidParamException("unrecognize", ac); } setByUser(); CssValue val; char op; val = expression.getValue(); op = expression.getOperator(); switch (val.getType()) { case CssTypes.CSS_NUMBER: CssNumber n = val.getNumber(); n.warnPositiveness(ac, this); n.warnLowerEqualThan(ac, 100, this); // FIXME clip to 100 value = val; break; case CssTypes.CSS_IDENT: if (inherit.equals(val)) { value = inherit; break; } default: throw new InvalidParamException("value", val.toString(), getPropertyName(), ac); } expression.next(); } public CssRichness(ApplContext ac, CssExpression expression) throws InvalidParamException { this(ac, expression, false); } }
Received on Wednesday, 2 January 2013 12:44:15 UTC