- From: CVS User ylafon <cvsmail@w3.org>
- Date: Wed, 02 Jan 2013 13:48:15 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css2
In directory roscoe:/tmp/cvs-serv9137/css2
Modified Files:
Css2Style.java
Added Files:
CssPitchRange.java
Log Message:
pitch-range
--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java 2013/01/02 13:32:29 1.38
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java 2013/01/02 13:48:14 1.39
@@ -1,5 +1,5 @@
//
-// $Id: Css2Style.java,v 1.38 2013/01/02 13:32:29 ylafon Exp $
+// $Id: Css2Style.java,v 1.39 2013/01/02 13:48:14 ylafon Exp $
// From Philippe Le Hegaret (Philippe.Le_Hegaret@sophia.inria.fr)
//
// (c) COPYRIGHT MIT and INRIA, 1997.
@@ -31,6 +31,7 @@
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.CssPitchRange;
import org.w3c.css.properties.css.CssPosition;
import org.w3c.css.properties.css.CssQuotes;
import org.w3c.css.properties.css.CssRichness;
@@ -53,7 +54,7 @@
import org.w3c.css.values.CssIdent;
/**
- * @version $Revision: 1.38 $
+ * @version $Revision: 1.39 $
*/
public class Css2Style extends ACssStyle {
@@ -70,6 +71,7 @@
public CssSpeakNumeral cssSpeakNumeral;
public CssRichness cssRichness;
public CssStress cssStress;
+ public CssPitchRange cssPitchRange;
/**
* font properties
@@ -571,6 +573,15 @@
}
return cssStress;
}
+
+ public final CssPitchRange getPitchRange() {
+ if (cssPitchRange == null) {
+ cssPitchRange =
+ (CssPitchRange) style.CascadingOrder(new CssPitchRange(),
+ style, selector);
+ }
+ return cssPitchRange;
+ }
/**
* Find conflicts in this Style
*
--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssPitchRange.java 2013/01/02 13:48:15 NONE
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssPitchRange.java 2013/01/02 13:48:15 1.1
// $Id: CssPitchRange.java,v 1.1 2013/01/02 13:48: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-pitch-range
*/
public class CssPitchRange extends org.w3c.css.properties.css.CssPitchRange {
/**
* Create a new CssPitchRange
*/
public CssPitchRange() {
}
/**
* Creates a new CssPitchRange
*
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException
* Expressions are incorrect
*/
public CssPitchRange(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.checkPositiveness(ac, this);
n.checkLowerEqualThan(ac, 100, this);
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 CssPitchRange(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
}
Received on Wednesday, 2 January 2013 13:48:16 UTC