W3C home > Mailing lists > Public > www-validator-cvs@w3.org > January 2013

CVS 2002/css-validator/org/w3c/css/properties/css2

From: CVS User ylafon <cvsmail@w3.org>
Date: Fri, 04 Jan 2013 11:07:24 +0000
Message-Id: <E1Tr57U-0000vO-Ti@roscoe.w3.org>
To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css2
In directory roscoe:/tmp/cvs-serv3517/css2

Modified Files:
	Css2Style.java 
Added Files:
	CssPitch.java 
Log Message:
pitch

--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java	2013/01/03 14:57:08	1.40
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java	2013/01/04 11:07:24	1.41
@@ -1,5 +1,5 @@
 //
-// $Id: Css2Style.java,v 1.40 2013/01/03 14:57:08 ylafon Exp $
+// $Id: Css2Style.java,v 1.41 2013/01/04 11:07:24 ylafon Exp $
 // From Philippe Le Hegaret (Philippe.Le_Hegaret@sophia.inria.fr)
 //
 // (c) COPYRIGHT MIT and INRIA, 1997.
@@ -34,6 +34,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.CssPitch;
 import org.w3c.css.properties.css.CssPitchRange;
 import org.w3c.css.properties.css.CssPosition;
 import org.w3c.css.properties.css.CssQuotes;
@@ -57,7 +58,7 @@
 import org.w3c.css.values.CssIdent;
 
 /**
- * @version $Revision: 1.40 $
+ * @version $Revision: 1.41 $
  */
 public class Css2Style extends ACssStyle {
 
@@ -78,6 +79,7 @@
 	public CssCueAfter cssCueAfter;
 	public CssCueBefore cssCueBefore;
 	public CssCue cssCue;
+	public CssPitch cssPitch;
 
 	/**
 	 * font properties
@@ -615,6 +617,15 @@
 		}
 		return cssCue;
 	}
+
+	public final CssPitch getPitch() {
+		if (cssPitch == null) {
+			cssPitch =
+					(CssPitch) style.CascadingOrder(new CssPitch(),
+							style, selector);
+		}
+		return cssPitch;
+	}
 	/**
 	 * Find conflicts in this Style
 	 *

--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssPitch.java	2013/01/04 11:07:24	NONE
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssPitch.java	2013/01/04 11:07:24	1.1
// $Id: CssPitch.java,v 1.1 2013/01/04 11:07:24 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.CssTypes;
import org.w3c.css.values.CssValue;

/**
 * @spec http://www.w3.org/TR/2008/REC-CSS2-20080411/aural.html#propdef-pitch
 */
public class CssPitch extends org.w3c.css.properties.css.CssPitch {

	public static final CssIdent[] allowed_values;

	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);
		}
	}

	public static final CssIdent getAllowedIdent(CssIdent ident) {
		for (CssIdent id : allowed_values) {
			if (id.equals(ident)) {
				return id;
			}
		}
		return null;
	}

	/**
	 * Create a new CssPitch
	 */
	public CssPitch() {
	}

	/**
	 * Creates a new CssPitch
	 *
	 * @param expression The expression for this property
	 * @throws org.w3c.css.util.InvalidParamException
	 *          Expressions are incorrect
	 */
	public CssPitch(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_FREQUENCY:
				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 CssPitch(ApplContext ac, CssExpression expression)
			throws InvalidParamException {
		this(ac, expression, false);
	}
}
Received on Friday, 4 January 2013 11:07:26 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Friday, 4 January 2013 11:07:42 GMT