Update CSS tables (font-variants, etc.).

(bzr r15121)

3 files changed, 94 insertions, 3 deletions

diff --git a/share/attributes/css_defaults b/share/attributes/css_defaults
index 396c8a2d9..ff9b39b6d 100644
--- a/share/attributes/css_defaults
+++ b/share/attributes/css_defaults
@@ -46,6 +46,8 @@
 
 "font-family" - "NO_DEFAULT" - "yes"
 
+"font-feature-settings" - "normal" - "yes"
+
 "font-size" - "medium" - "yes, the computed value is inherited"
 
 "font-size-adjust" - "none" - "yes"
@@ -56,6 +58,18 @@
 
 "font-variant" - "normal" - "yes"
 
+"font-variant-alternates" - "normal" - "yes"
+
+"font-variant-caps" - "normal" - "yes"
+
+"font-variant-east-asian" - "normal" - "yes"
+
+"font-variant-ligatures" - "normal" - "yes"
+
+"font-variant-numeric" - "normal" - "yes"
+
+"font-variant-position" - "normal" - "yes"
+
 "font-weight" - "normal" - "yes"
 
 "glyph-orientation-horizontal" - "0deg" - "yes"
@@ -110,7 +124,7 @@
 
 "solid-color" - "#000000" - "no"
 
-"solid-opacity" - "1.0" - "no"
+"solid-opacity" - "1" - "no"
 
 "stop-color" - "black" - "no"
 
@@ -148,10 +162,14 @@
 
 "text-decoration-style" - "solid" - "no"
 
+"text-indent" - "0" - "yes"
+
 "text-orientation" - "mixed" - "yes"
 
 "text-rendering" - "auto" - "yes"
 
+"text-transform" - "none" - "yes"
+
 "title" - "NO DEFAULT" - "no"
 
 "transform" - "none" - "no"
diff --git a/share/attributes/cssprops b/share/attributes/cssprops
index 1b7776284..fb7397c4e 100644
--- a/share/attributes/cssprops
+++ b/share/attributes/cssprops
@@ -46,6 +46,8 @@
 
 "font-family" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use"
 
+"font-feature-settings" - "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"
+
 "font-size" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use"
 
 "font-size-adjust" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use"
@@ -54,7 +56,19 @@
 
 "font-style" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use"
 
-"font-variant" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use"
+"font-variant" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan","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"
+
+"font-variant-alternates" - "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"
+
+"font-variant-caps" - "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"
+
+"font-variant-east-asian" - "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"
+
+"font-variant-ligatures" - "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"
+
+"font-variant-numeric" - "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"
+
+"font-variant-position" - "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"
 
 "font-weight" - "altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use"
 
@@ -148,10 +162,14 @@
 
 "text-decoration-style" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","altGlyph","textPath","text","tref","tspan","flowRoot","flowPara","flowSpan"
 
+"text-indent" - "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"
+
 "text-orientation" - "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"
 
 "text-rendering" - "text","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use"
 
+"text-transform" - "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"
+
 "title" - "circle","ellipse","image","line","path","polygon","polyline","rect","text","flowRoot","use","g"
 
 "transform" - "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 c025a68ec..46b0dd120 100755
--- a/share/attributes/genMapDataCSS.pl
+++ b/share/attributes/genMapDataCSS.pl
@@ -207,7 +207,7 @@ $properties{ "solid-color" }->{inherit} = "no";
 
 push @{$properties{ "solid-opacity" }->{elements}}, @container_elements;
 push @{$properties{ "solid-opacity" }->{elements}}, @graphics_elements;
-$properties{ "solid-opacity" }->{default} = "1.0";
+$properties{ "solid-opacity" }->{default} = "1";
 $properties{ "solid-opacity" }->{inherit} = "no";
 
 push @{$properties{ "white-space" }->{elements}}, @container_elements;
@@ -232,6 +232,18 @@ $properties{ "shape-margin" }->{default} = "0";
 $properties{ "shape-margin" }->{inherit} = "no";
 
 
+#CSS Text Level 3
+push @{$properties{ "text-indent" }->{elements}}, @container_elements;
+push @{$properties{ "text-indent" }->{elements}}, @text_content_elements;
+$properties{ "text-indent" }->{default} = "0";
+$properties{ "text-indent" }->{inherit} = "yes";
+
+push @{$properties{ "text-transform" }->{elements}}, @container_elements;
+push @{$properties{ "text-transform" }->{elements}}, @text_content_elements;
+$properties{ "text-transform" }->{default} = "none";
+$properties{ "text-transform" }->{inherit} = "yes";
+
+
 # CSS Text Decoration
 push @{$properties{ "text-decoration-line" }->{elements}}, @container_elements;
 push @{$properties{ "text-decoration-line" }->{elements}}, @text_content_elements;
@@ -258,6 +270,49 @@ push @{$properties{ "text-decoration-stroke" }->{elements}}, @text_content_eleme
 $properties{ "text-decoration-stroke" }->{default} = "NO_DEFAULT";
 $properties{ "text-decoration-stroke" }->{inherit} = "no";
 
+
+# CSS Fonts
+push @{$properties{ "font-variant-ligatures" }->{elements}}, @container_elements;
+push @{$properties{ "font-variant-ligatures" }->{elements}}, @text_content_elements;
+$properties{ "font-variant-ligatures" }->{default} = "normal";
+$properties{ "font-variant-ligatures" }->{inherit} = "yes";
+
+push @{$properties{ "font-variant-position" }->{elements}}, @container_elements;
+push @{$properties{ "font-variant-position" }->{elements}}, @text_content_elements;
+$properties{ "font-variant-position" }->{default} = "normal";
+$properties{ "font-variant-position" }->{inherit} = "yes";
+
+push @{$properties{ "font-variant-caps" }->{elements}}, @container_elements;
+push @{$properties{ "font-variant-caps" }->{elements}}, @text_content_elements;
+$properties{ "font-variant-caps" }->{default} = "normal";
+$properties{ "font-variant-caps" }->{inherit} = "yes";
+
+push @{$properties{ "font-variant-numeric" }->{elements}}, @container_elements;
+push @{$properties{ "font-variant-numeric" }->{elements}}, @text_content_elements;
+$properties{ "font-variant-numeric" }->{default} = "normal";
+$properties{ "font-variant-numeric" }->{inherit} = "yes";
+
+push @{$properties{ "font-variant-alternates" }->{elements}}, @container_elements;
+push @{$properties{ "font-variant-alternates" }->{elements}}, @text_content_elements;
+$properties{ "font-variant-alternates" }->{default} = "normal";
+$properties{ "font-variant-alternates" }->{inherit} = "yes";
+
+push @{$properties{ "font-variant-east-asian" }->{elements}}, @container_elements;
+push @{$properties{ "font-variant-east-asian" }->{elements}}, @text_content_elements;
+$properties{ "font-variant-east-asian" }->{default} = "normal";
+$properties{ "font-variant-east-asian" }->{inherit} = "yes";
+
+push @{$properties{ "font-variant" }->{elements}}, @container_elements;
+push @{$properties{ "font-variant" }->{elements}}, @text_content_elements;
+$properties{ "font-variant" }->{default} = "normal";
+$properties{ "font-variant" }->{inherit} = "yes";
+
+push @{$properties{ "font-feature-settings" }->{elements}}, @container_elements;
+push @{$properties{ "font-feature-settings" }->{elements}}, @text_content_elements;
+$properties{ "font-feature-settings" }->{default} = "normal";
+$properties{ "font-feature-settings" }->{inherit} = "yes";
+
+
 # CSS Writing Modes
 push @{$properties{ "text-orientation" }->{elements}}, @container_elements;
 push @{$properties{ "text-orientation" }->{elements}}, @text_content_elements;