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

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

From: CVS User ylafon <cvsmail@w3.org>
Date: Wed, 29 Jan 2014 21:03:03 +0000
Message-Id: <E1W8cHn-0002ZD-6t@roscoe.w3.org>
To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css3
In directory roscoe:/tmp/cvs-serv9756/css3

Modified Files:
	CSS3Default.properties CssBreakAfter.java 
Added Files:
	CssPageBreakAfter.java CssPageBreakBefore.java 
	CssPageBreakInside.java 
Log Message:
page-break-[after|before|inside] per CSS2 CSS21 CSS3

--- /sources/public/2002/css-validator/org/w3c/css/properties/css3/CSS3Default.properties	2012/10/16 20:44:00	1.2
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css3/CSS3Default.properties	2014/01/29 21:03:02	1.3
@@ -71,3 +71,7 @@
 text-combine.inherited:			false
 text-fit.inherited:			false
 media.inherited:			false
+page-break-before.inherited:  true
+page-break-after.inherited:  true
+page-break-inside.inherited:  true
+
--- /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssBreakAfter.java	2012/08/30 20:49:17	1.5
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssBreakAfter.java	2014/01/29 21:03:03	1.6
@@ -1,4 +1,4 @@
-// $Id: CssBreakAfter.java,v 1.5 2012/08/30 20:49:17 ylafon Exp $
+// $Id: CssBreakAfter.java,v 1.6 2014/01/29 21:03:03 ylafon Exp $
 // From Sijtsche de Jong (sy.de.jong@let.rug.nl)
 // Rewritten 2010 by Yves Lafon <ylafon@w3.org>
 //
@@ -48,14 +48,14 @@
 	}
 
 	/**
-	 * Create a new CssBreakAfter
+	 * Create a new CssPageBreakAfter
 	 */
 	public CssBreakAfter() {
 		value = initial;
 	}
 
 	/**
-	 * Create a new CssBreakAfter
+	 * Create a new CssPageBreakAfter
 	 *
 	 * @param expression The expression for this property
 	 * @throws org.w3c.css.util.InvalidParamException

--- /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssPageBreakAfter.java	2014/01/29 21:03:03	NONE
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssPageBreakAfter.java	2014/01/29 21:03:03	1.1
// $Id: CssPageBreakAfter.java,v 1.1 2014/01/29 21:03:03 ylafon Exp $
// Author: Yves Lafon <ylafon@w3.org>
//
// (c) COPYRIGHT MIT, ERCIM, Keio University, Beihang University 2014.
// 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.CssIdent;
import org.w3c.css.values.CssTypes;
import org.w3c.css.values.CssValue;

/**
 * @spec http://www.w3.org/TR/2011/REC-CSS2-20110607/page.html#propdef-page-break-after
 */
public class CssPageBreakAfter extends org.w3c.css.properties.css.CssPageBreakAfter {

	public static final CssIdent[] allowed_values;

	static {
		String[] _allowed_values = {"auto", "always", "avoid", "left", "right"};
		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 CssPageBreakAfter
	 */
	public CssPageBreakAfter() {
		value = initial;
	}

	/**
	 * Creates a new CssPageBreakAfter
	 *
	 * @param expression The expression for this property
	 * @throws org.w3c.css.util.InvalidParamException
	 *          Expressions are incorrect
	 */
	public CssPageBreakAfter(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();

		if (val.getType() == CssTypes.CSS_IDENT) {
			CssIdent id = (CssIdent) val;
			if (inherit.equals(id)) {
				value = inherit;
			} else {
				value = getAllowedIdent(id);
				if (value == null) {
					throw new InvalidParamException("value",
							val.toString(),
							getPropertyName(), ac);
				}
			}
		} else {
			throw new InvalidParamException("value",
					val.toString(),
					getPropertyName(), ac);
		}
		expression.next();
	}

	public CssPageBreakAfter(ApplContext ac, CssExpression expression)
			throws InvalidParamException {
		this(ac, expression, false);
	}
}

--- /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssPageBreakBefore.java	2014/01/29 21:03:03	NONE
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssPageBreakBefore.java	2014/01/29 21:03:03	1.1
// $Id: CssPageBreakBefore.java,v 1.1 2014/01/29 21:03:03 ylafon Exp $
// Author: Yves Lafon <ylafon@w3.org>
//
// (c) COPYRIGHT MIT, ERCIM, Keio University, Beihang University 2014.
// 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.CssIdent;
import org.w3c.css.values.CssTypes;
import org.w3c.css.values.CssValue;

/**
 * @spec http://www.w3.org/TR/2011/REC-CSS2-20110607/page.html#propdef-page-break-before
 */
public class CssPageBreakBefore extends org.w3c.css.properties.css.CssPageBreakBefore {

	public static final CssIdent[] allowed_values;

	static {
		String[] _allowed_values = {"auto", "always", "avoid", "left", "right"};
		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 CssPageBreakBefore
	 */
	public CssPageBreakBefore() {
		value = initial;
	}

	/**
	 * Creates a new CssPageBreakBefore
	 *
	 * @param expression The expression for this property
	 * @throws org.w3c.css.util.InvalidParamException
	 *          Expressions are incorrect
	 */
	public CssPageBreakBefore(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();

		if (val.getType() == CssTypes.CSS_IDENT) {
			CssIdent id = (CssIdent) val;
			if (inherit.equals(id)) {
				value = inherit;
			} else {
				value = getAllowedIdent(id);
				if (value == null) {
					throw new InvalidParamException("value",
							val.toString(),
							getPropertyName(), ac);
				}
			}
		} else {
			throw new InvalidParamException("value",
					val.toString(),
					getPropertyName(), ac);
		}
		expression.next();
	}

	public CssPageBreakBefore(ApplContext ac, CssExpression expression)
			throws InvalidParamException {
		this(ac, expression, false);
	}
}

--- /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssPageBreakInside.java	2014/01/29 21:03:03	NONE
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssPageBreakInside.java	2014/01/29 21:03:03	1.1
// $Id: CssPageBreakInside.java,v 1.1 2014/01/29 21:03:03 ylafon Exp $
// Author: Yves Lafon <ylafon@w3.org>
//
// (c) COPYRIGHT MIT, ERCIM, Keio University, Beihang University 2014.
// 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.CssIdent;
import org.w3c.css.values.CssTypes;
import org.w3c.css.values.CssValue;

/**
 * @spec http://www.w3.org/TR/2011/REC-CSS2-20110607/page.html#propdef-page-break-inside
 */
public class CssPageBreakInside extends org.w3c.css.properties.css.CssPageBreakInside {

	public static final CssIdent[] allowed_values;

	static {
		String[] _allowed_values = {"auto", "avoid"};
		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 CssPageBreakInside
	 */
	public CssPageBreakInside() {
		value = initial;
	}

	/**
	 * Creates a new CssPageBreakInside
	 *
	 * @param expression The expression for this property
	 * @throws org.w3c.css.util.InvalidParamException
	 *          Expressions are incorrect
	 */
	public CssPageBreakInside(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();

		if (val.getType() == CssTypes.CSS_IDENT) {
			CssIdent id = (CssIdent) val;
			if (inherit.equals(id)) {
				value = inherit;
			} else {
				value = getAllowedIdent(id);
				if (value == null) {
					throw new InvalidParamException("value",
							val.toString(),
							getPropertyName(), ac);
				}
			}
		} else {
			throw new InvalidParamException("value",
					val.toString(),
					getPropertyName(), ac);
		}
		expression.next();
	}

	public CssPageBreakInside(ApplContext ac, CssExpression expression)
			throws InvalidParamException {
		this(ac, expression, false);
	}
}
Received on Wednesday, 29 January 2014 21:03:06 UTC

This archive was generated by hypermail 2.3.1 : Wednesday, 7 January 2015 15:17:56 UTC