- From: CVS User ylafon <cvsmail@w3.org>
- Date: Mon, 30 Sep 2013 01:08:42 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css2
In directory roscoe:/tmp/cvs-serv18602/css2
Modified Files:
Css2Style.java
Added Files:
CssOrphans.java CssWidows.java
Log Message:
windows and orphans per css2/css21/css3
--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java 2013/01/08 14:46:18 1.48
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java 2013/09/30 01:08:42 1.49
@@ -1,5 +1,5 @@
//
-// $Id: Css2Style.java,v 1.48 2013/01/08 14:46:18 ylafon Exp $
+// $Id: Css2Style.java,v 1.49 2013/09/30 01:08:42 ylafon Exp $
// From Philippe Le Hegaret (Philippe.Le_Hegaret@sophia.inria.fr)
//
// (c) COPYRIGHT MIT and INRIA, 1997.
@@ -28,6 +28,7 @@
import org.w3c.css.properties.css.CssMaxWidth;
import org.w3c.css.properties.css.CssMinHeight;
import org.w3c.css.properties.css.CssMinWidth;
+import org.w3c.css.properties.css.CssOrphans;
import org.w3c.css.properties.css.CssOutline;
import org.w3c.css.properties.css.CssOutlineColor;
import org.w3c.css.properties.css.CssOutlineStyle;
@@ -56,6 +57,7 @@
import org.w3c.css.properties.css.CssVisibility;
import org.w3c.css.properties.css.CssVoiceFamily;
import org.w3c.css.properties.css.CssVolume;
+import org.w3c.css.properties.css.CssWidows;
import org.w3c.css.properties.css1.Css1Style;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.Warning;
@@ -63,7 +65,7 @@
import org.w3c.css.values.CssIdent;
/**
- * @version $Revision: 1.48 $
+ * @version $Revision: 1.49 $
*/
public class Css2Style extends Css1Style {
@@ -137,6 +139,9 @@
public CssTableLayout cssTableLayout;
public CssSpeakHeader cssSpeakHeader;
+ public CssOrphans cssOrphans;
+ public CssWidows cssWidows;
+
/**
* Get the azimuth
*/
@@ -681,6 +686,24 @@
}
return cssVoiceFamily;
}
+
+ public final CssOrphans getOrphans() {
+ if (cssOrphans == null) {
+ cssOrphans =
+ (CssOrphans) style.CascadingOrder(new CssOrphans(),
+ style, selector);
+ }
+ return cssOrphans;
+ }
+
+ public final CssWidows getWidows() {
+ if (cssWidows == null) {
+ cssWidows =
+ (CssWidows) style.CascadingOrder(new CssWidows(),
+ style, selector);
+ }
+ return cssWidows;
+ }
/**
* Find conflicts in this Style
--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssOrphans.java 2013/09/30 01:08:42 NONE
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssOrphans.java 2013/09/30 01:08:42 1.1
// $Id: CssOrphans.java,v 1.1 2013/09/30 01:08:42 ylafon Exp $
// Author: Yves Lafon <ylafon@w3.org>
//
// (c) COPYRIGHT MIT, ERCIM, Keio University, Beihang 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.CssNumber;
import org.w3c.css.values.CssTypes;
import org.w3c.css.values.CssValue;
/**
* @spec http://www.w3.org/TR/2008/REC-CSS2-20080411/page.html#propdef-orphans
*/
public class CssOrphans extends org.w3c.css.properties.css.CssOrphans {
public static final CssNumber def = new CssNumber(2);
/**
* Create a new CssOrphans
*/
public CssOrphans() {
}
/**
* Create a new CssOrphans
*
* @param ac The context
* @param expression The expression for this property
* @param check true will test the number of parameters
* @throws org.w3c.css.util.InvalidParamException
* The expression is incorrect
*/
public CssOrphans(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
if (check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
CssValue val = expression.getValue();
setByUser();
switch (val.getType()) {
case CssTypes.CSS_NUMBER:
CssNumber number = val.getNumber();
number.checkInteger(ac, this);
number.checkStrictPositiveness(ac, this);
value = val;
break;
case CssTypes.CSS_IDENT:
CssIdent ide = (CssIdent) val;
if (inherit.equals(ide)) {
value = inherit;
break;
}
default:
throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
expression.next();
}
/**
* Create a new CssOrphans
*
* @param ac, the Context
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException
* The expression is incorrect
*/
public CssOrphans(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
public boolean isDefault() {
return (def.equals(value));
}
}
--- /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssWidows.java 2013/09/30 01:08:42 NONE
+++ /sources/public/2002/css-validator/org/w3c/css/properties/css2/CssWidows.java 2013/09/30 01:08:42 1.1
// $Id: CssWidows.java,v 1.1 2013/09/30 01:08:42 ylafon Exp $
// Author: Yves Lafon <ylafon@w3.org>
//
// (c) COPYRIGHT MIT, ERCIM, Keio University, Beihang 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.CssNumber;
import org.w3c.css.values.CssTypes;
import org.w3c.css.values.CssValue;
/**
* @spec http://www.w3.org/TR/2008/REC-CSS2-20080411/page.html#propdef-widows
*/
public class CssWidows extends org.w3c.css.properties.css.CssWidows {
public static final CssNumber def = new CssNumber(2);
/**
* Create a new CssWidows
*/
public CssWidows() {
}
/**
* Create a new CssWidows
*
* @param ac The context
* @param expression The expression for this property
* @param check true will test the number of parameters
* @throws org.w3c.css.util.InvalidParamException
* The expression is incorrect
*/
public CssWidows(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
if (check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
CssValue val = expression.getValue();
setByUser();
switch (val.getType()) {
case CssTypes.CSS_NUMBER:
CssNumber number = val.getNumber();
number.checkInteger(ac, this);
number.checkStrictPositiveness(ac, this);
value = val;
break;
case CssTypes.CSS_IDENT:
CssIdent ide = (CssIdent) val;
if (inherit.equals(ide)) {
value = inherit;
break;
}
default:
throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
expression.next();
}
/**
* Create a new CssWidows
*
* @param ac, the Context
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException
* The expression is incorrect
*/
public CssWidows(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
public boolean isDefault() {
return (def.equals(value));
}
}
Received on Monday, 30 September 2013 01:08:43 UTC