- From: CVS User ylafon <cvsmail@w3.org>
- Date: Wed, 02 Jan 2013 13:32:29 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css2
In directory roscoe:/tmp/cvs-serv28853/css2
Modified Files:
Css2Style.java CssRichness.java
Added Files:
CssStress.java
Log Message:
stress
--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java 2013/01/02 12:44:14 1.37
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java 2013/01/02 13:32:29 1.38
@@ -1,5 +1,5 @@
//
-// $Id: Css2Style.java,v 1.37 2013/01/02 12:44:14 ylafon Exp $
+// $Id: Css2Style.java,v 1.38 2013/01/02 13:32:29 ylafon Exp $
// From Philippe Le Hegaret (Philippe.Le_Hegaret@sophia.inria.fr)
//
// (c) COPYRIGHT MIT and INRIA, 1997.
@@ -40,6 +40,7 @@
import org.w3c.css.properties.css.CssSpeakNumeral;
import org.w3c.css.properties.css.CssSpeakPunctuation;
import org.w3c.css.properties.css.CssSpeechRate;
+import org.w3c.css.properties.css.CssStress;
import org.w3c.css.properties.css.CssTableLayout;
import org.w3c.css.properties.css.CssTextShadow;
import org.w3c.css.properties.css.CssTop;
@@ -52,7 +53,7 @@
import org.w3c.css.values.CssIdent;
/**
- * @version $Revision: 1.37 $
+ * @version $Revision: 1.38 $
*/
public class Css2Style extends ACssStyle {
@@ -68,6 +69,7 @@
public CssSpeakPunctuation cssSpeakPunctuation;
public CssSpeakNumeral cssSpeakNumeral;
public CssRichness cssRichness;
+ public CssStress cssStress;
/**
* font properties
@@ -560,6 +562,15 @@
}
return cssRichness;
}
+
+ public final CssStress getStress() {
+ if (cssStress == null) {
+ cssStress =
+ (CssStress) style.CascadingOrder(new CssStress(),
+ style, selector);
+ }
+ return cssStress;
+ }
/**
* Find conflicts in this Style
*
--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssRichness.java 2013/01/02 12:44:14 1.1
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssRichness.java 2013/01/02 13:32:29 1.2
@@ -1,4 +1,4 @@
-// $Id: CssRichness.java,v 1.1 2013/01/02 12:44:14 ylafon Exp $
+// $Id: CssRichness.java,v 1.2 2013/01/02 13:32:29 ylafon Exp $
// Author: Yves Lafon <ylafon@w3.org>
//
// (c) COPYRIGHT MIT, ERCIM and Keio University, 2012.
@@ -46,9 +46,8 @@
switch (val.getType()) {
case CssTypes.CSS_NUMBER:
CssNumber n = val.getNumber();
- n.warnPositiveness(ac, this);
- n.warnLowerEqualThan(ac, 100, this);
- // FIXME clip to 100
+ n.checkPositiveness(ac, this);
+ n.checkLowerEqualThan(ac, 100, this);
value = val;
break;
case CssTypes.CSS_IDENT:
--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssStress.java 2013/01/02 13:32:29 NONE
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssStress.java 2013/01/02 13:32:29 1.1
// $Id: CssStress.java,v 1.1 2013/01/02 13:32:29 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-stress
*/
public class CssStress extends org.w3c.css.properties.css.CssStress {
/**
* Create a new CssStress
*/
public CssStress() {
}
/**
* Creates a new CssStress
*
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException
* Expressions are incorrect
*/
public CssStress(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 CssStress(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
}
Received on Wednesday, 2 January 2013 13:32:31 UTC