- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 31 Aug 2012 09:49:02 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css3
In directory hutz:/tmp/cvs-serv21661/css3
Modified Files:
Css3Style.java CssTextAlignLast.java
Log Message:
text-align-last per http://www.w3.org/TR/2012/WD-css3-text-20120814/#text-align-last0
Index: Css3Style.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/Css3Style.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- Css3Style.java 31 Aug 2012 09:39:50 -0000 1.48
+++ Css3Style.java 31 Aug 2012 09:49:00 -0000 1.49
@@ -43,6 +43,7 @@
import org.w3c.css.properties.css.CssOverflowWrap;
import org.w3c.css.properties.css.CssWordBreak;
import org.w3c.css.properties.css.CssLineBreak;
+import org.w3c.css.properties.css.CssTextAlignLast;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.Util;
@@ -63,7 +64,6 @@
CssGlyphOrVert cssGlyphOrVert;
CssGlyphHor cssGlyphHor;
CssTextJustify cssTextJustify;
- CssTextAlignLast cssTextAlignLast;
CssDominantBaseLine cssDominantBaseLine;
CssAlignmentBaseLine cssAlignmentBaseLine;
CssAlignmentAdjust cssAlignmentAdjust;
@@ -140,6 +140,7 @@
public CssWordBreak cssWordBreak;
public CssHyphens cssHyphens;
public CssLineBreak cssLineBreak;
+ public CssTextAlignLast cssTextAlignLast;
CssDropInitialAfterAdjust cssDropInitialAfterAdjust;
CssDropInitialAfterAlign cssDropInitialAfterAlign;
Index: CssTextAlignLast.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssTextAlignLast.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssTextAlignLast.java 5 Jan 2010 13:49:54 -0000 1.3
+++ CssTextAlignLast.java 31 Aug 2012 09:49:00 -0000 1.4
@@ -1,185 +1,90 @@
-//
// $Id$
-// From Sijtsche de Jong (sy.de.jong@let.rug.nl)
+// Author: Yves Lafon <ylafon@w3.org>
//
-// (c) COPYRIGHT 1995-2000 World Wide Web Consortium (MIT, INRIA, Keio University)
-// Please first read the full copyright statement at
-// http://www.w3.org/Consortium/Legal/copyright-software-19980720
-
+// (c) COPYRIGHT MIT, ERCIM and Keio University, 2012.
+// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css3;
-import org.w3c.css.parser.CssStyle;
-import org.w3c.css.properties.css.CssProperty;
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;
/**
- * <P>
- * <EM>Value:</EM> auto || start || end || center || justify ||
- * size || inherit<BR>
- * <EM>Initial:</EM>auto<BR>
- * <EM>Applies to:</EM>block-level elements<BR>
- * <EM>Inherited:</EM>yes<BR>
- * <EM>Percentages:</EM>no<BR>
- * <EM>Media:</EM>:visual
- * <P>
- * This property describes how the last line of the inline content of a block
- * is aligned. This also applies to the only line of a block if it contains a
- * single line, the line preceding a BR element and to last lines of
- * anonymous blocks. Typically the last line is aligned like the other lines
- * of the block element, this is set by the 'text-align' property. However,
- * in some situations like when the 'text-align' property is set to
- * 'justify', the last line may be aligned differently.
+ * @spec http://www.w3.org/TR/2012/WD-css3-text-20120814/#text-align-last0
*/
+public class CssTextAlignLast extends org.w3c.css.properties.css.CssTextAlignLast {
-public class CssTextAlignLast extends CssProperty {
-
- CssValue alignlast;
-
- static CssIdent start = new CssIdent("start");
- static CssIdent end = new CssIdent("end");
- static CssIdent center = new CssIdent ("center");
- static CssIdent justify = new CssIdent("justify");
- static CssIdent size = new CssIdent("size");
- static CssIdent left = new CssIdent("left");
- static CssIdent right = new CssIdent("right");
-
- /**
- * Create a new CssTextAlignLast
- */
- public CssTextAlignLast() {
- alignlast = start;
- }
-
- /**
- * Create a new CssTextAlignLast
- *
- * @param expression The expression for this parameter
- * @exception InvalidParamException Incorrect value
- */
- public CssTextAlignLast(ApplContext ac, CssExpression expression,
- boolean check) throws InvalidParamException {
-
- setByUser();
- CssValue val = expression.getValue();
+ private static CssIdent[] allowed_values;
- if (val.equals(start)) {
- alignlast = start;
- expression.next();
- }
- else if (val.equals(end)) {
- alignlast = end;
- expression.next();
- }
- else if (val.equals(center)) {
- alignlast = center;
- expression.next();
- }
- else if (val.equals(justify)) {
- alignlast = justify;
- expression.next();
- }
- else if (val.equals(size)) {
- alignlast = size;
- expression.next();
- }
- else if (val.equals(inherit)) {
- alignlast = inherit;
- expression.next();
- }
- else if (val.equals(left)) {
- alignlast = left;
- }
- else if (val.equals(right)) {
- alignlast = right;
- }
- else {
- throw new InvalidParamException("value", expression.getValue(),
- getPropertyName(), ac);
+ static {
+ String id_values[] = {"auto", "start", "end",
+ "left", "right", "center", "justify"};
+ allowed_values = new CssIdent[id_values.length];
+ int i = 0;
+ for (String s : id_values) {
+ allowed_values[i++] = CssIdent.getIdent(s);
+ }
}
- }
-
- public CssTextAlignLast(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
- this(ac, expression, false);
- }
- /**
- * Add this property to the CssStyle
- *
- * @param style The CssStyle
- */
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((Css3Style) style).cssTextAlignLast != null)
- style.addRedefinitionWarning(ac, this);
- ((Css3Style) style).cssTextAlignLast = this;
- }
-
- /**
- * Get this property in the style.
- *
- * @param style The style where the property is
- * @param resolve if true, resolve the style to find this property
- */
- public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
- if (resolve) {
- return ((Css3Style) style).getTextAlignLast();
- }
- else {
- return ((Css3Style) style).cssTextAlignLast;
+ public static CssIdent getMatchingIdent(CssIdent ident) {
+ for (CssIdent id : allowed_values) {
+ if (id.equals(ident)) {
+ return id;
+ }
+ }
+ return null;
}
- }
-
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof CssTextAlignLast &&
- alignlast.equals(((CssTextAlignLast) property).alignlast));
- }
- /**
- * Returns the name of this property
- */
- public String getPropertyName() {
- return "text-align-last";
- }
+ /**
+ * Create a new CssTextAlignLast
+ */
+ public CssTextAlignLast() {
+ value = initial;
+ }
- /**
- * Returns the value of this property
- */
- public Object get() {
- return alignlast;
- }
+ /**
+ * Creates a new CssTextAlignLast
+ *
+ * @param expression The expression for this property
+ * @throws org.w3c.css.util.InvalidParamException
+ * Expressions are incorrect
+ */
+ public CssTextAlignLast(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
+ setByUser();
+ CssValue val = expression.getValue();
- /**
- * Returns true if this property is "softly" inherited
- */
- public boolean isSoftlyInherited() {
- return alignlast.equals(inherit);
- }
+ if (check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- return alignlast.toString();
- }
+ if (val.getType() != CssTypes.CSS_IDENT) {
+ throw new InvalidParamException("value",
+ expression.getValue(),
+ getPropertyName(), ac);
+ }
+ // ident, so inherit, or allowed value
+ if (inherit.equals(val)) {
+ value = inherit;
+ } else {
+ val = getMatchingIdent((CssIdent) val);
+ if (val == null) {
+ throw new InvalidParamException("value",
+ expression.getValue(),
+ getPropertyName(), ac);
+ }
+ value = val;
+ }
+ expression.next();
+ }
- /**
- * Is the value of this property a default value
- * It is used by alle macro for the function <code>print</code>
- */
- public boolean isDefault() {
- return alignlast == start;
- }
+ public CssTextAlignLast(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
}
-
-
Received on Friday, 31 August 2012 09:49:04 UTC