- From: CVS User ylafon <cvsmail@w3.org>
- Date: Fri, 04 Jan 2013 13:14:02 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css2 In directory roscoe:/tmp/cvs-serv26639/css2 Modified Files: Css2Style.java Added Files: CssPause.java CssPauseAfter.java CssPauseBefore.java Log Message: pause[-before|-after] per css2/css21 and css3 http://www.w3.org/TR/2012/CR-css3-speech-20120320/#pause --- /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java 2013/01/04 11:07:24 1.41 +++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java 2013/01/04 13:14:02 1.42 @@ -1,5 +1,5 @@ // -// $Id: Css2Style.java,v 1.41 2013/01/04 11:07:24 ylafon Exp $ +// $Id: Css2Style.java,v 1.42 2013/01/04 13:14:02 ylafon Exp $ // From Philippe Le Hegaret (Philippe.Le_Hegaret@sophia.inria.fr) // // (c) COPYRIGHT MIT and INRIA, 1997. @@ -34,6 +34,9 @@ import org.w3c.css.properties.css.CssOutlineStyle; import org.w3c.css.properties.css.CssOutlineWidth; import org.w3c.css.properties.css.CssOverflow; +import org.w3c.css.properties.css.CssPause; +import org.w3c.css.properties.css.CssPauseAfter; +import org.w3c.css.properties.css.CssPauseBefore; import org.w3c.css.properties.css.CssPitch; import org.w3c.css.properties.css.CssPitchRange; import org.w3c.css.properties.css.CssPosition; @@ -58,7 +61,7 @@ import org.w3c.css.values.CssIdent; /** - * @version $Revision: 1.41 $ + * @version $Revision: 1.42 $ */ public class Css2Style extends ACssStyle { @@ -80,6 +83,9 @@ public CssCueBefore cssCueBefore; public CssCue cssCue; public CssPitch cssPitch; + public CssPauseAfter cssPauseAfter; + public CssPauseBefore cssPauseBefore; + public CssPause cssPause; /** * font properties @@ -626,6 +632,34 @@ } return cssPitch; } + + public final CssPauseAfter getPauseAfter() { + if (cssPauseAfter == null) { + cssPauseAfter = + (CssPauseAfter) style.CascadingOrder(new CssPauseAfter(), + style, selector); + } + return cssPauseAfter; + } + + public final CssPauseBefore getPauseBefore() { + if (cssPauseBefore == null) { + cssPauseBefore = + (CssPauseBefore) style.CascadingOrder(new CssPauseBefore(), + style, selector); + } + return cssPauseBefore; + } + + public final CssPause getPause() { + if (cssPause == null) { + cssPause = + (CssPause) style.CascadingOrder(new CssPause(), + style, selector); + } + return cssPause; + } + /** * Find conflicts in this Style * --- /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssPause.java 2013/01/04 13:14:02 NONE +++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssPause.java 2013/01/04 13:14:02 1.1 // $Id: CssPause.java,v 1.1 2013/01/04 13:14:02 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.css2; import org.w3c.css.util.ApplContext; import org.w3c.css.util.InvalidParamException; import org.w3c.css.values.CssExpression; import org.w3c.css.values.CssOperator; import org.w3c.css.values.CssValue; import org.w3c.css.values.CssValueList; import java.util.ArrayList; /** * @spec http://www.w3.org/TR/2008/REC-CSS2-20080411/aural.html#propdef-pause */ public class CssPause extends org.w3c.css.properties.css.CssPause { /** * Create a new CssPause */ public CssPause() { } /** * Creates a new CssPause * * @param expression The expression for this property * @throws org.w3c.css.util.InvalidParamException * Expressions are incorrect */ public CssPause(ApplContext ac, CssExpression expression, boolean check) throws InvalidParamException { if (check && expression.getCount() > 2) { throw new InvalidParamException("unrecognize", ac); } setByUser(); char op; cssPauseBefore = new CssPauseBefore(ac, expression, false); if (expression.end()) { cssPauseAfter = new CssPauseAfter(); cssPauseAfter.value = cssPauseBefore.value; value = cssPauseBefore.value; } else { op = expression.getOperator(); if (op != CssOperator.SPACE) { throw new InvalidParamException("operator", ((new Character(op)).toString()), ac); } cssPauseAfter = new CssPauseAfter(ac, expression, false); if (cssPauseBefore.value == inherit || cssPauseAfter.value == inherit) { throw new InvalidParamException("value", inherit, getPropertyName(), ac); } ArrayList<CssValue> values = new ArrayList<CssValue>(2); values.add(cssPauseBefore.value); values.add(cssPauseAfter.value); value = new CssValueList(values); } } public CssPause(ApplContext ac, CssExpression expression) throws InvalidParamException { this(ac, expression, false); } } --- /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssPauseAfter.java 2013/01/04 13:14:02 NONE +++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssPauseAfter.java 2013/01/04 13:14:02 1.1 // $Id: CssPauseAfter.java,v 1.1 2013/01/04 13:14:02 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.css2; 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.CssPercentage; import org.w3c.css.values.CssTime; 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-pause-after */ public class CssPauseAfter extends org.w3c.css.properties.css.CssPauseAfter { /** * Create a new CssPauseAfter */ public CssPauseAfter() { } /** * Creates a new CssPauseAfter * * @param expression The expression for this property * @throws org.w3c.css.util.InvalidParamException * Expressions are incorrect */ public CssPauseAfter(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_PERCENTAGE: CssPercentage p = val.getPercentage(); p.checkPositiveness(ac, this); value = val; break; case CssTypes.CSS_IDENT: CssIdent id = (CssIdent) val; if (inherit.equals(id)) { value = inherit; break; } default: throw new InvalidParamException("value", val.toString(), getPropertyName(), ac); } expression.next(); } public CssPauseAfter(ApplContext ac, CssExpression expression) throws InvalidParamException { this(ac, expression, false); } } --- /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssPauseBefore.java 2013/01/04 13:14:02 NONE +++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssPauseBefore.java 2013/01/04 13:14:02 1.1 // $Id: CssPauseBefore.java,v 1.1 2013/01/04 13:14:02 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.css2; 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.CssPercentage; import org.w3c.css.values.CssTime; 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-pause-before */ public class CssPauseBefore extends org.w3c.css.properties.css.CssPauseBefore { /** * Create a new CssPauseBefore */ public CssPauseBefore() { } /** * Creates a new CssPauseBefore * * @param expression The expression for this property * @throws org.w3c.css.util.InvalidParamException * Expressions are incorrect */ public CssPauseBefore(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_PERCENTAGE: CssPercentage p = val.getPercentage(); p.checkPositiveness(ac, this); value = val; break; case CssTypes.CSS_IDENT: CssIdent id = (CssIdent) val; if (inherit.equals(id)) { value = inherit; break; } default: throw new InvalidParamException("value", val.toString(), getPropertyName(), ac); } expression.next(); } public CssPauseBefore(ApplContext ac, CssExpression expression) throws InvalidParamException { this(ac, expression, false); } }
Received on Friday, 4 January 2013 13:14:07 UTC