Proper inheritance level for writing-mode, Fixes w3c#98

Author: ylafon

org/w3c/css/properties/CSS3SVGProperties.properties

@@ -19,7 +19,8 @@ marker-end:                             org.w3c.css.properties.svg.CssMarkerEnd
 marker-mid:                             org.w3c.css.properties.svg.CssMarkerMid
 marker-start:                           org.w3c.css.properties.svg.CssMarkerStart
 kerning:                                org.w3c.css.properties.svg.CssKerning
-writing-mode:                           org.w3c.css.properties.svg.CssWritingMode
+# replaced with css3
+#writing-mode:                           org.w3c.css.properties.svg.CssWritingMode
 clip-path:                              org.w3c.css.properties.svg.CssClipPath
 clip-rule:                              org.w3c.css.properties.svg.CssClipRule
 mask:                                   org.w3c.css.properties.svg.CssMask
@@ -378,6 +379,7 @@ ruby-position:                          org.w3c.css.properties.css3.CssRubyPosit
 ruby-align:                             org.w3c.css.properties.css3.CssRubyAlign
 ruby-overhang:                          org.w3c.css.properties.css3.CssRubyOverhang
 alignment-adjust:                       org.w3c.css.properties.css3.CssAlignmentAdjust
+writing-mode:                           org.w3c.css.properties.css3.CssWritingMode
 fit:                                    org.w3c.css.properties.css3.CssFit
 handheld.background-clip:               org.w3c.css.properties.css3.CssBackgroundClip
 

org/w3c/css/properties/css/CssWritingMode.java

@@ -6,15 +6,15 @@
 package org.w3c.css.properties.css;
 
 import org.w3c.css.parser.CssStyle;
-import org.w3c.css.properties.svg.SVGBasicStyle;
-import org.w3c.css.properties.svg.SVGTinyStyle;
+import org.w3c.css.properties.css3.Css3Style;
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.InvalidParamException;
 import org.w3c.css.values.CssExpression;
 import org.w3c.css.values.CssValue;
 
 /**
- * @since SVG
+ * @since SVG OBSOLETED
+ * @since CSS3
  */
 public class CssWritingMode extends CssProperty {
 
@@ -81,7 +81,7 @@ public String toString() {
 	 * @param style The CssStyle
 	 */
 	public void addToStyle(ApplContext ac, CssStyle style) {
-		SVGBasicStyle s = (SVGBasicStyle) style;
+		Css3Style s = (Css3Style) style;
 		if (s.cssWritingMode != null) {
 			style.addRedefinitionWarning(ac, this);
 		}
@@ -108,9 +108,9 @@ public boolean equals(CssProperty property) {
 	 */
 	public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
 		if (resolve) {
-			return ((SVGBasicStyle) style).getWritingMode();
+			return ((Css3Style) style).getWritingMode();
 		} else {
-			return ((SVGBasicStyle) style).cssWritingMode;
+			return ((Css3Style) style).cssWritingMode;
 		}
 	}
 }

org/w3c/css/properties/css3/Css3Style.java

@@ -187,6 +187,7 @@
 import org.w3c.css.properties.css.CssVoiceStress;
 import org.w3c.css.properties.css.CssVoiceVolume;
 import org.w3c.css.properties.css.CssWillChange;
+import org.w3c.css.properties.css.CssWritingMode;
 import org.w3c.css.properties.css.CssWordBreak;
 import org.w3c.css.properties.css.counterstyle.CssAdditiveSymbols;
 import org.w3c.css.properties.css.counterstyle.CssFallback;
@@ -215,6 +216,8 @@ public class Css3Style extends ATSCStyle {
 	public CssAdditiveSymbols counterStyleCssAdditiveSymbols;
 	public CssNegative counterStyleCssNegative;
 
+	public CssWritingMode cssWritingMode;
+
 	public CssScrollSnapMarginBlockStart cssScrollSnapMarginBlockStart;
 	public CssScrollSnapMarginBlockEnd cssScrollSnapMarginBlockEnd;
 	public CssScrollSnapMarginInlineStart cssScrollSnapMarginInlineStart;
@@ -434,6 +437,15 @@ public class Css3Style extends ATSCStyle {
 	public CssFloatOffset cssFloatOffset;
 	public CssFloatDefer cssFloatDefer;
 
+	public CssWritingMode getWritingMode() {
+		if (cssWritingMode == null) {
+			cssWritingMode =
+					(CssWritingMode) style.CascadingOrder(new CssWritingMode(),
+							style, selector);
+		}
+		return cssWritingMode;
+	}
+
 	public org.w3c.css.properties.css.counterstyle.CssSpeakAs getCounterStyleCssSpeakAs() {
 		if (counterStyleCssSpeakAs == null) {
 			counterStyleCssSpeakAs = (org.w3c.css.properties.css.counterstyle.CssSpeakAs) style.CascadingOrder(new org.w3c.css.properties.css.counterstyle.CssSpeakAs(), style, selector);

org/w3c/css/properties/svg/SVGBasicStyle.java

@@ -27,7 +27,6 @@
 import org.w3c.css.properties.css.CssStrokeOpacity;
 import org.w3c.css.properties.css.CssTextAnchor;
 import org.w3c.css.properties.css.CssTextRendering;
-import org.w3c.css.properties.css.CssWritingMode;
 
 public class SVGBasicStyle extends SVGTinyStyle {
 
@@ -40,7 +39,6 @@ public class SVGBasicStyle extends SVGTinyStyle {
 	public CssFillOpacity cssFillOpacity;
 	public CssStrokeOpacity cssStrokeOpacity;
 	public CssKerning cssKerning;
-	public CssWritingMode cssWritingMode;
 	public CssClipPath cssClipPath;
 	public CssClipRule cssClipRule;
 	public CssMask cssMask;
@@ -133,15 +131,6 @@ public CssKerning getKerning() {
 		return cssKerning;
 	}
 
-	public CssWritingMode getWritingMode() {
-		if (cssWritingMode == null) {
-			cssWritingMode =
-					(CssWritingMode) style.CascadingOrder(new CssWritingMode(),
-							style, selector);
-		}
-		return cssWritingMode;
-	}
-
 	public CssClipPath getClipPath() {
 		if (cssClipPath == null) {
 			cssClipPath =