W3C home > Mailing lists > Public > www-validator-cvs@w3.org > August 2012

2002/css-validator/org/w3c/css/properties/css3 CssFontLanguageOverride.java,NONE,1.1 Css3Style.java,1.22,1.23

From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
Date: Mon, 06 Aug 2012 11:56:23 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1SyLv5-0002yb-NO@lionel-hutz.w3.org>
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css3
In directory hutz:/tmp/cvs-serv11340/w3c/css/properties/css3

Modified Files:
	Css3Style.java 
Added Files:
	CssFontLanguageOverride.java 
Log Message:
font-language-override from http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#propdef-font-language-override

Index: Css3Style.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/Css3Style.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Css3Style.java	6 Aug 2012 08:28:31 -0000	1.22
+++ Css3Style.java	6 Aug 2012 11:56:21 -0000	1.23
@@ -29,6 +29,7 @@
 import org.w3c.css.properties.css.CssColumnWidth;
 import org.w3c.css.properties.css.CssColumns;
 import org.w3c.css.properties.css.CssFontKerning;
+import org.w3c.css.properties.css.CssFontLanguageOverride;
 import org.w3c.css.properties.css.CssOpacity;
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.Util;
@@ -141,9 +142,10 @@
     public CssBoxShadow cssBoxShadow;
     public CssBoxDecorationBreak cssBoxDecorationBreak;
 	public CssFontKerning cssFontKerning;
+	public CssFontLanguageOverride cssFontLanguageOverride;
 
 
-    CssDropInitialAfterAdjust cssDropInitialAfterAdjust;
+	CssDropInitialAfterAdjust cssDropInitialAfterAdjust;
     CssDropInitialAfterAlign cssDropInitialAfterAlign;
     CssDropInitialBeforeAdjust cssDropInitialBeforeAdjust;
     CssDropInitialBeforeAlign cssDropInitialBeforeAlign;
@@ -1561,6 +1563,15 @@
 		return cssFontKerning;
 	}
 
+	public CssFontLanguageOverride getFontLanguageOverride() {
+		if (cssFontLanguageOverride == null) {
+			cssFontLanguageOverride =
+					(CssFontLanguageOverride) style.CascadingOrder(
+							new CssFontLanguageOverride(), style, selector);
+		}
+		return cssFontLanguageOverride;
+	}
+
     public CssTextIndentCSS3 getTextIndentCSS3() {
         if (cssTextIndentCSS3 == null) {
             cssTextIndentCSS3 =

--- NEW FILE: CssFontLanguageOverride.java ---
// $Id: CssFontLanguageOverride.java,v 1.1 2012/08/06 11:56:21 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.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.CssString;
import org.w3c.css.values.CssTypes;
import org.w3c.css.values.CssValue;

/**
 * @spec http://www.w3.org/TR/2011/WD-css3-fonts-20111004/#propdef-font-language-override
 */
public class CssFontLanguageOverride extends org.w3c.css.properties.css.CssFontLanguageOverride {

	public static final CssIdent normal;

	static {
		normal = CssIdent.getIdent("normal");
	}

    /**
     * Create a new CssFontLanguageOverride
     */
    public CssFontLanguageOverride() {
		value = initial;
    }

    /**
     * Creates a new CssFontLanguageOverride
     *
     * @param expression The expression for this property
     * @throws org.w3c.css.util.InvalidParamException
     *          Expressions are incorrect
     */
    public CssFontLanguageOverride(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_STRING:
				CssString s = (CssString) val;
				// limit of 3 characters + two surrounding quotes
				if (s.toString().length() != 5) {
					throw new InvalidParamException("value",
							expression.getValue().toString(),
							getPropertyName(), ac);
				}
				value = s;
				break;
			case CssTypes.CSS_IDENT:
				CssIdent ident = (CssIdent) val;
				if (inherit.equals(ident)) {
					value = inherit;
					break;
				}
				if (normal.equals(ident)){
					value = normal;
					break;
				}
			default:
				throw new InvalidParamException("value",
						expression.getValue().toString(),
						getPropertyName(), ac);
		}
		expression.next();
    }

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

}
Received on Monday, 6 August 2012 11:56:25 UTC

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