Add some SVG2 text properties to tables.

(bzr r14500)

4 files changed, 52 insertions, 0 deletions

diff --git a/share/attributes/css_defaults b/share/attributes/css_defaults
index 05735a0f2..396c8a2d9 100644
--- a/share/attributes/css_defaults
+++ b/share/attributes/css_defaults
@@ -98,6 +98,14 @@
 
 "pointer-events" - "visiblePainted" - "yes"
 
+"shape-inside" - "auto" - "no"
+
+"shape-margin" - "0" - "no"
+
+"shape-outside" - "auto" - "no"
+
+"shape-padding" - "none" - "no"
+
 "shape-rendering" - "auto" - "yes"
 
 "solid-color" - "#000000" - "no"
@@ -158,6 +166,8 @@
 
 "visibility" - "visible" - "yes"
 
+"white-space" - "normal" - "yes"
+
 "word-spacing" - "normal" - "yes"
 
 "writing-mode" - "lr-tb" - "yes"
diff --git a/share/attributes/cssprops b/share/attributes/cssprops
index 3767200a4..ee8c74843 100644
--- a/share/attributes/cssprops
+++ b/share/attributes/cssprops
@@ -98,6 +98,14 @@
 
 "pointer-events" - "circle","ellipse","image","line","path","polygon","polyline","rect","text","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-outside" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan"
+
+"shape-padding" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan"
+
 "shape-rendering" - "path","rect","circle","ellipse","line","polyline","polygon","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use"
 
 "solid-color" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","use"
@@ -158,6 +166,8 @@
 
 "visibility" - "text","tspan","tref","altGlyph","textPath","a","circle","ellipse","image","line","path","polygon","polyline","rect","text","use","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use"
 
+"white-space" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use"
+
 "word-spacing" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use"
 
 "writing-mode" - "text","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use"
diff --git a/share/attributes/genMapDataCSS.pl b/share/attributes/genMapDataCSS.pl
index 0d6e5c13d..f5f14e1e6 100755
--- a/share/attributes/genMapDataCSS.pl
+++ b/share/attributes/genMapDataCSS.pl
@@ -210,6 +210,28 @@ push @{$properties{ "solid-opacity" }->{elements}}, @graphics_elements;
 $properties{ "solid-opacity" }->{default} = "1.0";
 $properties{ "solid-opacity" }->{inherit} = "no";
 
+push @{$properties{ "white-space" }->{elements}}, @container_elements;
+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;
+$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-padding" }->{elements}}, @text_content_elements;
+$properties{ "shape-padding" }->{default} = "none";
+$properties{ "shape-padding" }->{inherit} = "no";
+
+push @{$properties{ "shape-margin" }->{elements}}, @text_content_elements;
+$properties{ "shape-margin" }->{default} = "0";
+$properties{ "shape-margin" }->{inherit} = "no";
+
+
 # CSS Text Decoration
 push @{$properties{ "text-decoration-line" }->{elements}}, @container_elements;
 push @{$properties{ "text-decoration-line" }->{elements}}, @text_content_elements;
diff --git a/share/attributes/svgprops b/share/attributes/svgprops
index 4fbcb16b4..a34b79202 100644
--- a/share/attributes/svgprops
+++ b/share/attributes/svgprops
@@ -534,6 +534,14 @@
 
 "pointer-events" - "circle","ellipse","image","line","path","polygon","polyline","rect","text","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-outside" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan"
+
+"shape-padding" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan"
+
 "shape-rendering" - "path","rect","circle","ellipse","line","polyline","polygon","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use"
 
 "solid-color" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","use"
@@ -594,6 +602,8 @@
 
 "visibility" - "text","tspan","tref","altGlyph","textPath","a","circle","ellipse","image","line","path","polygon","polyline","rect","text","use","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use"
 
+"white-space" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use"
+
 "word-spacing" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use"
 
 "writing-mode" - "text","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use"