- From: CVS User ylafon <cvsmail@w3.org>
- Date: Fri, 11 Jan 2013 10:47:27 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css3 In directory roscoe:/tmp/cvs-serv6168/css3 Modified Files: Css3Style.java Added Files: CssVoicePitch.java Log Message: voice-pitch per http://www.w3.org/TR/2012/CR-css3-speech-20120320/#voice-pitch --- /sources/public/2002/css-validator/org/w3c/css/properties/css3/Css3Style.java 2013/01/10 11:34:20 1.151 +++ /sources/public/2002/css-validator/org/w3c/css/properties/css3/Css3Style.java 2013/01/11 10:47:26 1.152 @@ -1,6 +1,6 @@ // -// $Id: Css3Style.java,v 1.151 2013/01/10 11:34:20 ylafon Exp $ +// $Id: Css3Style.java,v 1.152 2013/01/11 10:47:26 ylafon Exp $ // From Sijtsche de Jong (sy.de.jong@let.rug.nl) // // COPYRIGHT (c) 1995-2000 World Wide Web Consortium, (MIT, INRIA, Keio University) @@ -116,6 +116,7 @@ import org.w3c.css.properties.css.CssTransitionTimingFunction; import org.w3c.css.properties.css.CssVoiceBalance; import org.w3c.css.properties.css.CssVoiceDuration; +import org.w3c.css.properties.css.CssVoicePitch; import org.w3c.css.properties.css.CssVoiceRate; import org.w3c.css.properties.css.CssVoiceStress; import org.w3c.css.properties.css.CssVoiceVolume; @@ -136,7 +137,7 @@ public CssRestBefore cssRestBefore; public CssRest cssRest; public CssSpeakAs cssSpeakAs; - + public CssVoicePitch cssVoicePitch; CssRubyPosition cssRubyPosition; CssRubyAlign cssRubyAlign; @@ -1552,6 +1553,13 @@ } return cssSpeakAs; } + + public final CssVoicePitch getVoicePitch() { + if (cssVoicePitch == null) { + cssVoicePitch = (CssVoicePitch) style.CascadingOrder(new CssVoicePitch(), style, selector); + } + return cssVoicePitch; + } /// /** --- /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssVoicePitch.java 2013/01/11 10:47:27 NONE +++ /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssVoicePitch.java 2013/01/11 10:47:27 1.1 // $Id: CssVoicePitch.java,v 1.1 2013/01/11 10:47:26 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.CssFrequency; import org.w3c.css.values.CssIdent; import org.w3c.css.values.CssTypes; import org.w3c.css.values.CssValue; import org.w3c.css.values.CssValueList; import java.util.ArrayList; import static org.w3c.css.values.CssOperator.SPACE; /** * @spec http://www.w3.org/TR/2012/CR-css3-speech-20120320/#voice-pitch */ public class CssVoicePitch extends org.w3c.css.properties.css.CssVoicePitch { public static final CssIdent[] allowed_values; public static final CssIdent absolute; static { String[] _allowed_values = {"x-low", "low", "medium", "high", "x-high"}; int i = 0; allowed_values = new CssIdent[_allowed_values.length]; for (String s : _allowed_values) { allowed_values[i++] = CssIdent.getIdent(s); } absolute = CssIdent.getIdent("absolute"); } public static final CssIdent getAllowedIdent(CssIdent ident) { for (CssIdent id : allowed_values) { if (id.equals(ident)) { return id; } } return null; } /** * Create a new CssVoicePitch */ public CssVoicePitch() { value = initial; } /** * Creates a new CssVoicePitch * * @param expression The expression for this property * @throws org.w3c.css.util.InvalidParamException * Expressions are incorrect */ public CssVoicePitch(ApplContext ac, CssExpression expression, boolean check) throws InvalidParamException { if (check && expression.getCount() > 2) { throw new InvalidParamException("unrecognize", ac); } setByUser(); CssValue val; char op; CssValue identVal = null; CssValue numVal = null; while (!expression.end()) { val = expression.getValue(); op = expression.getOperator(); switch (val.getType()) { case CssTypes.CSS_FREQUENCY: case CssTypes.CSS_SEMITONE: case CssTypes.CSS_PERCENTAGE: if (numVal != null) { throw new InvalidParamException("value", val, getPropertyName(), ac); } numVal = val; value = val; break; case CssTypes.CSS_IDENT: if (inherit.equals(val)) { if (expression.getCount() > 1) { throw new InvalidParamException("value", inherit, getPropertyName(), ac); } value = inherit; break; } if (identVal == null) { CssIdent id = (CssIdent) val; if (absolute.equals(id)) { identVal = absolute; value = absolute; break; } identVal = getAllowedIdent(id); if (identVal != null) { value = val; break; } // unrecognized... let it fail } default: throw new InvalidParamException("value", val, getPropertyName(), ac); } if (op != SPACE) { throw new InvalidParamException("operator", ((new Character(op)).toString()), ac); } expression.next(); } if (expression.getCount() > 1) { if (identVal == absolute) { if (numVal.getType() != CssTypes.CSS_FREQUENCY) { throw new InvalidParamException("value", expression.toStringFromStart(), getPropertyName(), ac); } CssFrequency frequency = numVal.getFrequency(); frequency.warnPositiveness(ac, this); } ArrayList<CssValue> values = new ArrayList<CssValue>(2); values.add(numVal); values.add(identVal); value = new CssValueList(values); } } public CssVoicePitch(ApplContext ac, CssExpression expression) throws InvalidParamException { this(ac, expression, false); } }
Received on Friday, 11 January 2013 10:47:32 UTC