update to trunk (r13488)

(bzr r13398.1.6)

6 files changed, 26 insertions, 8 deletions

diff --git a/share/attributes/css_defaults b/share/attributes/css_defaults
index 5675c6a3b..1f8e8835b 100644
--- a/share/attributes/css_defaults
+++ b/share/attributes/css_defaults
@@ -94,6 +94,10 @@
 
 "shape-rendering" - "auto" - "yes"
 
+"solid-color" - "#000000" - "no"
+
+"solid-opacity" - "1.0" - "no"
+
 "stop-color" - "black" - "no"
 
 "stop-opacity" - "1" - "no"
diff --git a/share/attributes/cssprops b/share/attributes/cssprops
index a4bc8a398..aefb60cc1 100644
--- a/share/attributes/cssprops
+++ b/share/attributes/cssprops
@@ -94,6 +94,10 @@
 
 "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"
+
+"solid-opacity" - "a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use","circle","ellipse","image","line","path","polygon","polyline","rect","text","use"
+
 "stop-color" - "stop"
 
 "stop-opacity" - "stop"
diff --git a/share/attributes/genMapDataCSS.pl b/share/attributes/genMapDataCSS.pl
index 4a32f96c7..9b013c758 100755
--- a/share/attributes/genMapDataCSS.pl
+++ b/share/attributes/genMapDataCSS.pl
@@ -200,6 +200,16 @@ push @{$properties{ "paint-order" }->{elements}}, @graphics_elements;
 $properties{ "paint-order" }->{default} = "normal";
 $properties{ "paint-order" }->{inherit} = "yes";
 
+push @{$properties{ "solid-color" }->{elements}}, @container_elements;
+push @{$properties{ "solid-color" }->{elements}}, @graphics_elements;
+$properties{ "solid-color" }->{default} = "#000000";
+$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" }->{inherit} = "no";
+
 
 # Output
 
diff --git a/share/attributes/genMapDataSVG.pl b/share/attributes/genMapDataSVG.pl
index 8cd18128e..f3d84d2c5 100755
--- a/share/attributes/genMapDataSVG.pl
+++ b/share/attributes/genMapDataSVG.pl
@@ -78,9 +78,9 @@ while( my $t = $p->get_token ) {
 
 # Adjustments
 push @{$attributes{ "in" }->{elements}}, "feMergeNode";
-push @{$attributes{ "class" }->{elements}}, "flowRoot","flowPara","flowSpan","flowRect","flowRegion";
-push @{$attributes{ "id"    }->{elements}}, "flowRoot","flowPara","flowSpan","flowRect","flowRegion";
-push @{$attributes{ "style" }->{elements}}, "flowRoot","flowPara","flowSpan","flowRect","flowRegion";
+push @{$attributes{ "class" }->{elements}}, "flowRoot","flowPara","flowSpan","flowRect","flowRegion","solidColor";
+push @{$attributes{ "id"    }->{elements}}, "flowRoot","flowPara","flowSpan","flowRect","flowRegion","solidColor";
+push @{$attributes{ "style" }->{elements}}, "flowRoot","flowPara","flowSpan","flowRect","flowRegion","solidColor";
 push @{$attributes{ "xml:space" }->{elements}}, "flowRoot","flowPara","flowSpan";
 push @{$attributes{ "transform" }->{elements}}, "flowRoot","flowPara","flowSpan";
 
diff --git a/share/attributes/svgprops b/share/attributes/svgprops
index 3e72fc65f..6e8925177 100644
--- a/share/attributes/svgprops
+++ b/share/attributes/svgprops
@@ -34,7 +34,7 @@
 
 "cap-height" - "font-face"
 
-"class" - "a","altGlyph","circle","clipPath","defs","desc","ellipse","feBlend","feColorMatrix","feComponentTransfer","feComposite","feConvolveMatrix","feDiffuseLighting","feDisplacementMap","feFlood","feGaussianBlur","feImage","feMerge","feMorphology","feOffset","feSpecularLighting","feTile","feTurbulence","filter","font","foreignObject","g","glyph","glyphRef","image","line","linearGradient","marker","mask","missing-glyph","path","pattern","polygon","polyline","radialGradient","rect","stop","svg","switch","symbol","text","textPath","title","tref","tspan","use","flowRoot","flowPara","flowSpan","flowRect","flowRegion"
+"class" - "a","altGlyph","circle","clipPath","defs","desc","ellipse","feBlend","feColorMatrix","feComponentTransfer","feComposite","feConvolveMatrix","feDiffuseLighting","feDisplacementMap","feFlood","feGaussianBlur","feImage","feMerge","feMorphology","feOffset","feSpecularLighting","feTile","feTurbulence","filter","font","foreignObject","g","glyph","glyphRef","image","line","linearGradient","marker","mask","missing-glyph","path","pattern","polygon","polyline","radialGradient","rect","stop","svg","switch","symbol","text","textPath","title","tref","tspan","use","flowRoot","flowPara","flowSpan","flowRect","flowRegion","solidColor"
 
 "clipPathUnits" - "clipPath"
 
@@ -118,7 +118,7 @@
 
 "horiz-origin-y" - "font"
 
-"id" - "a","altGlyph","altGlyphDef","altGlyphItem","animate","animateColor","animateMotion","animateTransform","circle","clipPath","color-profile","cursor","defs","desc","ellipse","feBlend","feColorMatrix","feComponentTransfer","feComposite","feConvolveMatrix","feDiffuseLighting","feDisplacementMap","feDistantLight","feFlood","feFuncA","feFuncB","feFuncG","feFuncR","feGaussianBlur","feImage","feMerge","feMergeNode","feMorphology","feOffset","fePointLight","feSpecularLighting","feSpotLight","feTile","feTurbulence","filter","font","font-face","font-face-format","font-face-name","font-face-src","font-face-uri","foreignObject","g","glyph","glyphRef","hkern","image","line","linearGradient","marker","mask","metadata","missing-glyph","mpath","path","pattern","polygon","polyline","radialGradient","rect","script","set","stop","style","svg","switch","symbol","text","textPath","title","tref","tspan","use","view","vkern","flowRoot","flowPara","flowSpan","flowRect","flowRegion"
+"id" - "a","altGlyph","altGlyphDef","altGlyphItem","animate","animateColor","animateMotion","animateTransform","circle","clipPath","color-profile","cursor","defs","desc","ellipse","feBlend","feColorMatrix","feComponentTransfer","feComposite","feConvolveMatrix","feDiffuseLighting","feDisplacementMap","feDistantLight","feFlood","feFuncA","feFuncB","feFuncG","feFuncR","feGaussianBlur","feImage","feMerge","feMergeNode","feMorphology","feOffset","fePointLight","feSpecularLighting","feSpotLight","feTile","feTurbulence","filter","font","font-face","font-face-format","font-face-name","font-face-src","font-face-uri","foreignObject","g","glyph","glyphRef","hkern","image","line","linearGradient","marker","mask","metadata","missing-glyph","mpath","path","pattern","polygon","polyline","radialGradient","rect","script","set","stop","style","svg","switch","symbol","text","textPath","title","tref","tspan","use","view","vkern","flowRoot","flowPara","flowSpan","flowRect","flowRegion","solidColor"
 
 "ideographic" - "font-face"
 
@@ -320,7 +320,7 @@
 
 "string" - "font-face-format"
 
-"style" - "a","altGlyph","circle","clipPath","defs","desc","ellipse","feBlend","feColorMatrix","feComponentTransfer","feComposite","feConvolveMatrix","feDiffuseLighting","feDisplacementMap","feFlood","feGaussianBlur","feImage","feMerge","feMorphology","feOffset","feSpecularLighting","feTile","feTurbulence","filter","font","foreignObject","g","glyph","glyphRef","image","line","linearGradient","marker","mask","missing-glyph","path","pattern","polygon","polyline","radialGradient","rect","stop","svg","switch","symbol","text","textPath","title","tref","tspan","use","flowRoot","flowPara","flowSpan","flowRect","flowRegion"
+"style" - "a","altGlyph","circle","clipPath","defs","desc","ellipse","feBlend","feColorMatrix","feComponentTransfer","feComposite","feConvolveMatrix","feDiffuseLighting","feDisplacementMap","feFlood","feGaussianBlur","feImage","feMerge","feMorphology","feOffset","feSpecularLighting","feTile","feTurbulence","filter","font","foreignObject","g","glyph","glyphRef","image","line","linearGradient","marker","mask","missing-glyph","path","pattern","polygon","polyline","radialGradient","rect","stop","svg","switch","symbol","text","textPath","title","tref","tspan","use","flowRoot","flowPara","flowSpan","flowRect","flowRegion","solidColor"
 
 "surfaceScale" - "feDiffuseLighting","feSpecularLighting"
 
diff --git a/share/extensions/svg2xaml.xsl b/share/extensions/svg2xaml.xsl
index 7536c9e0e..40b1f400b 100755
--- a/share/extensions/svg2xaml.xsl
+++ b/share/extensions/svg2xaml.xsl
@@ -134,10 +134,10 @@ exclude-result-prefixes="rdf xlink xs exsl libxslt">
           <Canvas.RenderTransform>
             <TranslateTransform>
               <xsl:attribute name="X">
-                <xsl:value-of select="-number(substring-before($viewBox, ' '))" />
+                <xsl:value-of select="format-number(-number(substring-before($viewBox, ' ')), '#.#')" />
               </xsl:attribute>
               <xsl:attribute name="Y">
-                <xsl:value-of select="-number(substring-before(substring-after($viewBox, ' '), ' '))" />
+                <xsl:value-of select="format-number(-number(substring-before(substring-after($viewBox, ' '), ' ')), '#.#')" />
               </xsl:attribute>
             </TranslateTransform>
           </Canvas.RenderTransform>