renamed scroll-snap-margin* in scroll-margin* per https://www.w3.org/TR/2019/CR-css-scroll-snap-1-20190131/#change-2017-rename-scroll-margin

Author: ylafon

org/w3c/css/properties/CSS3Properties.properties

@@ -71,17 +71,17 @@ scroll-padding-left:                    org.w3c.css.properties.css3.CssScrollPad
 scroll-padding-right:                   org.w3c.css.properties.css3.CssScrollPaddingRight
 scroll-padding-top:                     org.w3c.css.properties.css3.CssScrollPaddingTop
 scroll-snap-align:                      org.w3c.css.properties.css3.CssScrollSnapAlign
-scroll-snap-margin:                     org.w3c.css.properties.css3.CssScrollSnapMargin
-scroll-snap-margin-block:               org.w3c.css.properties.css3.CssScrollSnapMarginBlock
-scroll-snap-margin-block-end:           org.w3c.css.properties.css3.CssScrollSnapMarginBlockEnd
-scroll-snap-margin-block-start:         org.w3c.css.properties.css3.CssScrollSnapMarginBlockStart
-scroll-snap-margin-bottom:              org.w3c.css.properties.css3.CssScrollSnapMarginBottom
-scroll-snap-margin-inline:              org.w3c.css.properties.css3.CssScrollSnapMarginInline
-scroll-snap-margin-inline-end:          org.w3c.css.properties.css3.CssScrollSnapMarginInlineEnd
-scroll-snap-margin-inline-start:        org.w3c.css.properties.css3.CssScrollSnapMarginInlineStart
-scroll-snap-margin-left:                org.w3c.css.properties.css3.CssScrollSnapMarginLeft
-scroll-snap-margin-right:               org.w3c.css.properties.css3.CssScrollSnapMarginRight
-scroll-snap-margin-top:                 org.w3c.css.properties.css3.CssScrollSnapMarginTop
+scroll-margin:                          org.w3c.css.properties.css3.CssScrollMargin
+scroll-margin-block:                    org.w3c.css.properties.css3.CssScrollMarginBlock
+scroll-margin-block-end:                org.w3c.css.properties.css3.CssScrollMarginBlockEnd
+scroll-margin-block-start:              org.w3c.css.properties.css3.CssScrollMarginBlockStart
+scroll-margin-bottom:                   org.w3c.css.properties.css3.CssScrollMarginBottom
+scroll-margin-inline:                   org.w3c.css.properties.css3.CssScrollMarginInline
+scroll-margin-inline-end:               org.w3c.css.properties.css3.CssScrollMarginInlineEnd
+scroll-margin-inline-start:             org.w3c.css.properties.css3.CssScrollMarginInlineStart
+scroll-margin-left:                     org.w3c.css.properties.css3.CssScrollMarginLeft
+scroll-margin-right:                    org.w3c.css.properties.css3.CssScrollMarginRight
+scroll-margin-top:                      org.w3c.css.properties.css3.CssScrollMarginTop
 scroll-snap-stop:                       org.w3c.css.properties.css3.CssScrollSnapStop
 scroll-snap-type:                       org.w3c.css.properties.css3.CssScrollSnapType
 

…operties/css/CssScrollSnapMarginTop.java …/css/properties/css/CssScrollMargin.javaorg/w3c/css/properties/css/CssScrollSnapMarginTop.java renamed to org/w3c/css/properties/css/CssScrollMargin.java org/w3c/css/properties/css/CssScrollSnapMarginTop.java renamed to org/w3c/css/properties/css/CssScrollMargin.java

@@ -15,31 +15,31 @@
 /**
  * @since CSS3
  */
-public class CssScrollSnapMarginTop extends CssProperty {
+public class CssScrollMargin extends CssProperty {
 
     public CssValue value;
 
     /**
-     * Create a new CssScrollSnapMarginTop
+     * Create a new CssScrollMargin
      */
-    public CssScrollSnapMarginTop() {
+    public CssScrollMargin() {
     }
 
     /**
-     * Creates a new CssScrollSnapMarginTop
+     * Creates a new CssScrollMargin
      *
      * @param expression The expression for this property
      * @throws org.w3c.css.util.InvalidParamException
      *          Expressions are incorrect
      */
-    public CssScrollSnapMarginTop(ApplContext ac, CssExpression expression, boolean check)
+    public CssScrollMargin(ApplContext ac, CssExpression expression, boolean check)
             throws InvalidParamException {
         throw new InvalidParamException("value",
                 expression.getValue().toString(),
                 getPropertyName(), ac);
     }
 
-    public CssScrollSnapMarginTop(ApplContext ac, CssExpression expression)
+    public CssScrollMargin(ApplContext ac, CssExpression expression)
             throws InvalidParamException {
         this(ac, expression, false);
     }
@@ -56,7 +56,7 @@ public Object get() {
      * Returns the name of this property
      */
     public final String getPropertyName() {
-        return "scroll-snap-margin-top";
+        return "scroll-margin";
     }
 
     /**
@@ -81,10 +81,10 @@ public String toString() {
      */
     public void addToStyle(ApplContext ac, CssStyle style) {
         Css3Style s = (Css3Style) style;
-        if (s.cssScrollSnapMarginTop != null) {
+        if (s.cssScrollMargin != null) {
             style.addRedefinitionWarning(ac, this);
         }
-        s.cssScrollSnapMarginTop = this;
+        s.cssScrollMargin = this;
     }
 
 
@@ -94,8 +94,8 @@ public void addToStyle(ApplContext ac, CssStyle style) {
      * @param property The other property.
      */
     public boolean equals(CssProperty property) {
-        return (property instanceof CssScrollSnapMarginTop &&
-                value.equals(((CssScrollSnapMarginTop) property).value));
+        return (property instanceof CssScrollMargin &&
+                value.equals(((CssScrollMargin) property).value));
     }
 
 
@@ -107,9 +107,9 @@ public boolean equals(CssProperty property) {
      */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
         if (resolve) {
-            return ((Css3Style) style).getScrollSnapMarginTop();
+            return ((Css3Style) style).getScrollMargin();
         } else {
-            return ((Css3Style) style).cssScrollSnapMarginTop;
+            return ((Css3Style) style).cssScrollMargin;
         }
     }
 }

…erties/css/CssScrollSnapMarginRight.java …properties/css/CssScrollMarginBlock.javaorg/w3c/css/properties/css/CssScrollSnapMarginRight.java renamed to org/w3c/css/properties/css/CssScrollMarginBlock.java org/w3c/css/properties/css/CssScrollSnapMarginRight.java renamed to org/w3c/css/properties/css/CssScrollMarginBlock.java

@@ -15,31 +15,31 @@
 /**
  * @since CSS3
  */
-public class CssScrollSnapMarginRight extends CssProperty {
+public class CssScrollMarginBlock extends CssProperty {
 
     public CssValue value;
 
     /**
-     * Create a new CssScrollSnapMarginRight
+     * Create a new CssScrollMarginBlock
      */
-    public CssScrollSnapMarginRight() {
+    public CssScrollMarginBlock() {
     }
 
     /**
-     * Creates a new CssScrollSnapMarginRight
+     * Creates a new CssScrollMarginBlock
      *
      * @param expression The expression for this property
      * @throws org.w3c.css.util.InvalidParamException
      *          Expressions are incorrect
      */
-    public CssScrollSnapMarginRight(ApplContext ac, CssExpression expression, boolean check)
+    public CssScrollMarginBlock(ApplContext ac, CssExpression expression, boolean check)
             throws InvalidParamException {
         throw new InvalidParamException("value",
                 expression.getValue().toString(),
                 getPropertyName(), ac);
     }
 
-    public CssScrollSnapMarginRight(ApplContext ac, CssExpression expression)
+    public CssScrollMarginBlock(ApplContext ac, CssExpression expression)
             throws InvalidParamException {
         this(ac, expression, false);
     }
@@ -56,7 +56,7 @@ public Object get() {
      * Returns the name of this property
      */
     public final String getPropertyName() {
-        return "scroll-snap-margin-right";
+        return "scroll-margin-block";
     }
 
     /**
@@ -81,10 +81,10 @@ public String toString() {
      */
     public void addToStyle(ApplContext ac, CssStyle style) {
         Css3Style s = (Css3Style) style;
-        if (s.cssScrollSnapMarginRight != null) {
+        if (s.cssScrollMarginBlock != null) {
             style.addRedefinitionWarning(ac, this);
         }
-        s.cssScrollSnapMarginRight = this;
+        s.cssScrollMarginBlock = this;
     }
 
 
@@ -94,8 +94,8 @@ public void addToStyle(ApplContext ac, CssStyle style) {
      * @param property The other property.
      */
     public boolean equals(CssProperty property) {
-        return (property instanceof CssScrollSnapMarginRight &&
-                value.equals(((CssScrollSnapMarginRight) property).value));
+        return (property instanceof CssScrollMarginBlock &&
+                value.equals(((CssScrollMarginBlock) property).value));
     }
 
 
@@ -107,9 +107,9 @@ public boolean equals(CssProperty property) {
      */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
         if (resolve) {
-            return ((Css3Style) style).getScrollSnapMarginRight();
+            return ((Css3Style) style).getScrollMarginBlock();
         } else {
-            return ((Css3Style) style).cssScrollSnapMarginRight;
+            return ((Css3Style) style).cssScrollMarginBlock;
         }
     }
 }

…perties/css/CssScrollSnapMarginLeft.java …perties/css/CssScrollMarginBlockEnd.javaorg/w3c/css/properties/css/CssScrollSnapMarginLeft.java renamed to org/w3c/css/properties/css/CssScrollMarginBlockEnd.java org/w3c/css/properties/css/CssScrollSnapMarginLeft.java renamed to org/w3c/css/properties/css/CssScrollMarginBlockEnd.java

@@ -15,31 +15,31 @@
 /**
  * @since CSS3
  */
-public class CssScrollSnapMarginLeft extends CssProperty {
+public class CssScrollMarginBlockEnd extends CssProperty {
 
     public CssValue value;
 
     /**
-     * Create a new CssScrollSnapMarginLeft
+     * Create a new CssScrollMarginBlockEnd
      */
-    public CssScrollSnapMarginLeft() {
+    public CssScrollMarginBlockEnd() {
     }
 
     /**
-     * Creates a new CssScrollSnapMarginLeft
+     * Creates a new CssScrollMarginBlockEnd
      *
      * @param expression The expression for this property
      * @throws org.w3c.css.util.InvalidParamException
      *          Expressions are incorrect
      */
-    public CssScrollSnapMarginLeft(ApplContext ac, CssExpression expression, boolean check)
+    public CssScrollMarginBlockEnd(ApplContext ac, CssExpression expression, boolean check)
             throws InvalidParamException {
         throw new InvalidParamException("value",
                 expression.getValue().toString(),
                 getPropertyName(), ac);
     }
 
-    public CssScrollSnapMarginLeft(ApplContext ac, CssExpression expression)
+    public CssScrollMarginBlockEnd(ApplContext ac, CssExpression expression)
             throws InvalidParamException {
         this(ac, expression, false);
     }
@@ -56,7 +56,7 @@ public Object get() {
      * Returns the name of this property
      */
     public final String getPropertyName() {
-        return "scroll-snap-margin-left";
+        return "scroll-margin-block-end";
     }
 
     /**
@@ -81,10 +81,10 @@ public String toString() {
      */
     public void addToStyle(ApplContext ac, CssStyle style) {
         Css3Style s = (Css3Style) style;
-        if (s.cssScrollSnapMarginLeft != null) {
+        if (s.cssScrollMarginBlockEnd != null) {
             style.addRedefinitionWarning(ac, this);
         }
-        s.cssScrollSnapMarginLeft = this;
+        s.cssScrollMarginBlockEnd = this;
     }
 
 
@@ -94,8 +94,8 @@ public void addToStyle(ApplContext ac, CssStyle style) {
      * @param property The other property.
      */
     public boolean equals(CssProperty property) {
-        return (property instanceof CssScrollSnapMarginLeft &&
-                value.equals(((CssScrollSnapMarginLeft) property).value));
+        return (property instanceof CssScrollMarginBlockEnd &&
+                value.equals(((CssScrollMarginBlockEnd) property).value));
     }
 
 
@@ -107,9 +107,9 @@ public boolean equals(CssProperty property) {
      */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
         if (resolve) {
-            return ((Css3Style) style).getScrollSnapMarginLeft();
+            return ((Css3Style) style).getScrollMarginBlockEnd();
         } else {
-            return ((Css3Style) style).cssScrollSnapMarginLeft;
+            return ((Css3Style) style).cssScrollMarginBlockEnd;
         }
     }
 }

…rties/css/CssScrollSnapMarginInline.java …rties/css/CssScrollMarginBlockStart.javaorg/w3c/css/properties/css/CssScrollSnapMarginInline.java renamed to org/w3c/css/properties/css/CssScrollMarginBlockStart.java org/w3c/css/properties/css/CssScrollSnapMarginInline.java renamed to org/w3c/css/properties/css/CssScrollMarginBlockStart.java

@@ -15,31 +15,31 @@
 /**
  * @since CSS3
  */
-public class CssScrollSnapMarginInline extends CssProperty {
+public class CssScrollMarginBlockStart extends CssProperty {
 
     public CssValue value;
 
     /**
-     * Create a new CssScrollSnapMarginInline
+     * Create a new CssScrollMarginBlockStart
      */
-    public CssScrollSnapMarginInline() {
+    public CssScrollMarginBlockStart() {
     }
 
     /**
-     * Creates a new CssScrollSnapMarginInline
+     * Creates a new CssScrollMarginBlockStart
      *
      * @param expression The expression for this property
      * @throws org.w3c.css.util.InvalidParamException
      *          Expressions are incorrect
      */
-    public CssScrollSnapMarginInline(ApplContext ac, CssExpression expression, boolean check)
+    public CssScrollMarginBlockStart(ApplContext ac, CssExpression expression, boolean check)
             throws InvalidParamException {
         throw new InvalidParamException("value",
                 expression.getValue().toString(),
                 getPropertyName(), ac);
     }
 
-    public CssScrollSnapMarginInline(ApplContext ac, CssExpression expression)
+    public CssScrollMarginBlockStart(ApplContext ac, CssExpression expression)
             throws InvalidParamException {
         this(ac, expression, false);
     }
@@ -56,7 +56,7 @@ public Object get() {
      * Returns the name of this property
      */
     public final String getPropertyName() {
-        return "scroll-snap-margin-inline";
+        return "scroll-margin-block-start";
     }
 
     /**
@@ -81,10 +81,10 @@ public String toString() {
      */
     public void addToStyle(ApplContext ac, CssStyle style) {
         Css3Style s = (Css3Style) style;
-        if (s.cssScrollSnapMarginInline != null) {
+        if (s.cssScrollMarginBlockStart != null) {
             style.addRedefinitionWarning(ac, this);
         }
-        s.cssScrollSnapMarginInline = this;
+        s.cssScrollMarginBlockStart = this;
     }
 
 
@@ -94,8 +94,8 @@ public void addToStyle(ApplContext ac, CssStyle style) {
      * @param property The other property.
      */
     public boolean equals(CssProperty property) {
-        return (property instanceof CssScrollSnapMarginInline &&
-                value.equals(((CssScrollSnapMarginInline) property).value));
+        return (property instanceof CssScrollMarginBlockStart &&
+                value.equals(((CssScrollMarginBlockStart) property).value));
     }
 
 
@@ -107,9 +107,9 @@ public boolean equals(CssProperty property) {
      */
     public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
         if (resolve) {
-            return ((Css3Style) style).getScrollSnapMarginInline();
+            return ((Css3Style) style).getScrollMarginBlockStart();
         } else {
-            return ((Css3Style) style).cssScrollSnapMarginInline;
+            return ((Css3Style) style).cssScrollMarginBlockStart;
         }
     }
 }