- From: CVS User ylafon <cvsmail@w3.org>
- Date: Wed, 09 Jan 2013 09:03:06 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css3 In directory roscoe:/tmp/cvs-serv16664/css3 Modified Files: Css3Style.java Added Files: CssRestAfter.java Log Message: rest-after per http://www.w3.org/TR/2012/CR-css3-speech-20120320/#rest-after --- /sources/public/2002/css-validator/org/w3c/css/properties/css3/Css3Style.java 2013/01/08 14:46:19 1.147 +++ /sources/public/2002/css-validator/org/w3c/css/properties/css3/Css3Style.java 2013/01/09 09:03:06 1.148 @@ -1,6 +1,6 @@ // -// $Id: Css3Style.java,v 1.147 2013/01/08 14:46:19 ylafon Exp $ +// $Id: Css3Style.java,v 1.148 2013/01/09 09:03:06 ylafon Exp $ // From Sijtsche de Jong (sy.de.jong@let.rug.nl) // // COPYRIGHT (c) 1995-2000 World Wide Web Consortium, (MIT, INRIA, Keio University) @@ -89,6 +89,7 @@ import org.w3c.css.properties.css.CssPerspective; import org.w3c.css.properties.css.CssPerspectiveOrigin; import org.w3c.css.properties.css.CssResize; +import org.w3c.css.properties.css.CssRestAfter; import org.w3c.css.properties.css.CssTabSize; import org.w3c.css.properties.css.CssTextAlignLast; import org.w3c.css.properties.css.CssTextDecorationColor; @@ -128,6 +129,7 @@ public CssVoiceRate cssVoiceRate; public CssVoiceStress cssVoiceStress; public CssVoiceVolume cssVoiceVolume; + public CssRestAfter cssRestAfter; CssRubyPosition cssRubyPosition; @@ -1502,7 +1504,6 @@ return cssVoiceRate; } - public final CssVoiceVolume getVoiceVolume() { if (cssVoiceVolume == null) { cssVoiceVolume = @@ -1511,6 +1512,15 @@ } return cssVoiceVolume; } + + public final CssRestAfter getRestAfter() { + if (cssRestAfter == null) { + cssRestAfter = + (CssRestAfter) style.CascadingOrder(new CssRestAfter(), + style, selector); + } + return cssRestAfter; + } /// /** --- /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssRestAfter.java 2013/01/09 09:03:06 NONE +++ /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssRestAfter.java 2013/01/09 09:03:06 1.1 // $Id: CssRestAfter.java,v 1.1 2013/01/09 09:03:06 ylafon Exp $ // Author: Yves Lafon <ylafon@w3.org> // // (c) COPYRIGHT MIT, ERCIM and Keio University, 2013. // Please first read the full copyright statement in file COPYRIGHT.html package org.w3c.css.properties.css3; import org.w3c.css.util.ApplContext; import org.w3c.css.util.InvalidParamException; import org.w3c.css.values.CssExpression; import org.w3c.css.values.CssIdent; import org.w3c.css.values.CssTime; import org.w3c.css.values.CssTypes; import org.w3c.css.values.CssValue; /** * @spec http://www.w3.org/TR/2012/CR-css3-speech-20120320/#rest-after */ public class CssRestAfter extends org.w3c.css.properties.css.CssRestAfter { public static final CssIdent[] allowed_values; static { String[] _allowed_values = {"none", "x-weak", "weak", "medium", "strong", "x-strong"}; int i = 0; allowed_values = new CssIdent[_allowed_values.length]; for (String s : _allowed_values) { allowed_values[i++] = CssIdent.getIdent(s); } } public static final CssIdent getAllowedIdent(CssIdent ident) { for (CssIdent id : allowed_values) { if (id.equals(ident)) { return id; } } return null; } /** * Create a new CssRestAfter */ public CssRestAfter() { value = initial; } /** * Creates a new CssRestAfter * * @param expression The expression for this property * @throws org.w3c.css.util.InvalidParamException * Expressions are incorrect */ public CssRestAfter(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_TIME: CssTime t = val.getTime(); t.checkPositiveness(ac, this); value = val; break; case CssTypes.CSS_IDENT: CssIdent id = (CssIdent) val; if (inherit.equals(id)) { value = inherit; break; } value = getAllowedIdent(id); if (value != null) { break; } default: throw new InvalidParamException("value", val.toString(), getPropertyName(), ac); } expression.next(); } public CssRestAfter(ApplContext ac, CssExpression expression) throws InvalidParamException { this(ac, expression, false); } }
Received on Wednesday, 9 January 2013 09:03:07 UTC