Update properties for SVG 2 text. Partial work from Alex Roman

4 files changed, 31 insertions, 21 deletions

diff --git a/share/attributes/css_defaults b/share/attributes/css_defaults
index ff9b39b6d..1a5c4ccf3 100644
--- a/share/attributes/css_defaults
+++ b/share/attributes/css_defaults
@@ -78,6 +78,8 @@
 
 "image-rendering" - "auto" - "yes"
 
+"inline-size" - "0" - "no"
+
 "isolation" - "auto" - "no"
 
 "kerning" - "auto" - "yes"
@@ -116,12 +118,12 @@
 
 "shape-margin" - "0" - "no"
 
-"shape-outside" - "auto" - "no"
-
-"shape-padding" - "none" - "no"
+"shape-padding" - "0" - "no"
 
 "shape-rendering" - "auto" - "yes"
 
+"shape-subtract" - "auto" - "no"
+
 "solid-color" - "#000000" - "no"
 
 "solid-opacity" - "1" - "no"
diff --git a/share/attributes/cssprops b/share/attributes/cssprops
index 5e796235e..18f04ce3c 100644
--- a/share/attributes/cssprops
+++ b/share/attributes/cssprops
@@ -78,6 +78,8 @@
 
 "image-rendering" - "pattern","image","feImage","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use"
 
+"inline-size" - "text"
+
 "isolation" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use"
 
 "kerning" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use"
@@ -112,16 +114,16 @@
 
 "pointer-events" - "circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use"
 
-"shape-inside" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan"
-
-"shape-margin" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan"
+"shape-inside" - "text"
 
-"shape-outside" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan"
+"shape-margin" - "text"
 
-"shape-padding" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan"
+"shape-padding" - "text"
 
 "shape-rendering" - "path","rect","circle","ellipse","line","polyline","polygon","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use"
 
+"shape-subtract" - "text"
+
 "solid-color" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use"
 
 "solid-opacity" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use"
diff --git a/share/attributes/genMapDataCSS.pl b/share/attributes/genMapDataCSS.pl
index a6f432a47..91d09e37b 100755
--- a/share/attributes/genMapDataCSS.pl
+++ b/share/attributes/genMapDataCSS.pl
@@ -215,22 +215,26 @@ push @{$properties{ "white-space" }->{elements}}, @text_content_elements;
 $properties{ "white-space" }->{default} = "normal";
 $properties{ "white-space" }->{inherit} = "yes";
 
-push @{$properties{ "shape-inside" }->{elements}}, @text_content_elements;
+push @{$properties{ "shape-inside" }->{elements}}, "text";
 $properties{ "shape-inside" }->{default} = "auto";
 $properties{ "shape-inside" }->{inherit} = "no";
 
-push @{$properties{ "shape-outside" }->{elements}}, @text_content_elements;
-$properties{ "shape-outside" }->{default} = "auto";
-$properties{ "shape-outside" }->{inherit} = "no";
+push @{$properties{ "shape-subtract" }->{elements}}, "text";
+$properties{ "shape-subtract" }->{default} = "auto";
+$properties{ "shape-subtract" }->{inherit} = "no";
 
-push @{$properties{ "shape-padding" }->{elements}}, @text_content_elements;
-$properties{ "shape-padding" }->{default} = "none";
+push @{$properties{ "shape-padding" }->{elements}}, "text";
+$properties{ "shape-padding" }->{default} = "0";
 $properties{ "shape-padding" }->{inherit} = "no";
 
-push @{$properties{ "shape-margin" }->{elements}}, @text_content_elements;
+push @{$properties{ "shape-margin" }->{elements}}, "text";
 $properties{ "shape-margin" }->{default} = "0";
 $properties{ "shape-margin" }->{inherit} = "no";
 
+push @{$properties{ "inline-size" }->{elements}}, "text";
+$properties{ "inline-size" }->{default} = "0";
+$properties{ "inline-size" }->{inherit} = "no";
+
 
 #CSS Text Level 3
 push @{$properties{ "text-indent" }->{elements}}, @container_elements;
diff --git a/share/attributes/svgprops b/share/attributes/svgprops
index 810ad5661..fc2c01d9b 100644
--- a/share/attributes/svgprops
+++ b/share/attributes/svgprops
@@ -516,6 +516,8 @@
 
 "image-rendering" - "pattern","image","feImage","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use"
 
+"inline-size" - "text"
+
 "isolation" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use"
 
 "kerning" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use"
@@ -524,7 +526,7 @@
 
 "lighting-color" - "feDiffuseLighting","feSpecularLighting"
 
-"line-height" - "text","flowRoot","flowPara"
+"line-height" - "text","tspan","flowRoot","flowPara"
 
 "marker" - "path","line","polyline","polygon","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use"
 
@@ -550,16 +552,16 @@
 
 "pointer-events" - "circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use"
 
-"shape-inside" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan"
-
-"shape-margin" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan"
+"shape-inside" - "text"
 
-"shape-outside" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan"
+"shape-margin" - "text"
 
-"shape-padding" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan"
+"shape-padding" - "text"
 
 "shape-rendering" - "path","rect","circle","ellipse","line","polyline","polygon","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use"
 
+"shape-subtract" - "text"
+
 "solid-color" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use"
 
 "solid-opacity" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use"