Extensions. Fix for XAML export objects properties and layer visibility (Bug #516462...

diff --git a/share/extensions/svg2xaml.xsl b/share/extensions/svg2xaml.xsl
index 403ff756af0d41ec1b5ccacf4815563f6e247e1a..ef01e2023233e2b0b8fad01c81142c2246dfe1b6 100755 (executable)
--- a/share/extensions/svg2xaml.xsl
+++ b/share/extensions/svg2xaml.xsl
@@ -384,6 +384,10 @@ Unknown units are kept.
   <xsl:if test="ancestor::*[name(.) = 'defs']"><xsl:attribute name="x:Key"><xsl:value-of select="@id" /></xsl:attribute></xsl:if>\r
 </xsl:template>\r
 \r
+<xsl:template mode="desc" match="*">\r
+  <xsl:if test="*[name(.) = 'desc']/text()"><xsl:attribute name="Tag"><xsl:value-of select="*[name(.) = 'desc']/text()" /></xsl:attribute></xsl:if>\r
+</xsl:template>\r
+\r
 <xsl:template name="to_hex">\r
   <xsl:param name="convert" />\r
   <xsl:value-of select="concat(substring('0123456789ABCDEF', 1 + floor(round($convert) div 16), 1), substring('0123456789ABCDEF', 1 + round($convert) mod 16, 1))" />\r
@@ -540,8 +544,9 @@ Unknown units are kept.
   </xsl:choose>\r
 </xsl:template>\r
 \r
-<xsl:template mode="transform" match="*[@transform or @gradientTransform]">\r
+<xsl:template mode="transform" match="*">\r
   <xsl:param name="mapped_type" />\r
+  <xsl:if test="@transform or @gradientTransform">\r
   <xsl:variable name="transform">\r
     <xsl:choose>\r
        <xsl:when test="@transform"><xsl:value-of select="@transform" /></xsl:when>\r
@@ -575,6 +580,7 @@ Unknown units are kept.
       </xsl:choose>\r
     </xsl:otherwise>\r
   </xsl:choose>\r
+  </xsl:if>  \r
 </xsl:template>\r
 \r
 <xsl:template mode="clip" match="*">\r
@@ -620,6 +626,15 @@ Unknown units are kept.
         <!--\r
         <xsl:apply-templates mode="clip" select="." />\r
         -->\r
+        <xsl:if test="@style and contains(@style, 'display:none')"><xsl:attribute name="Visibility">Collapsed</xsl:attribute></xsl:if>\r
+        <xsl:if test="@style and contains(@style, 'opacity:')">\r
+        <xsl:attribute name="Opacity">\r
+            <xsl:choose>\r
+                <xsl:when test="contains(substring-after(@style, 'opacity:'), ';')"><xsl:value-of select="substring-before(substring-after(@style, 'opacity:'), ';')" /></xsl:when>\r
+                  <xsl:otherwise><xsl:value-of select="substring-after(@style, 'opacity:')" /></xsl:otherwise>\r
+            </xsl:choose>\r
+        </xsl:attribute>\r
+        </xsl:if>\r
         <xsl:if test="@width and not(contains(@width, '%'))">\r
         <xsl:attribute name="Width">\r
             <xsl:call-template name="convert_unit">\r
@@ -689,6 +704,10 @@ Unknown units are kept.
 <xsl:template mode="forward" match="*[name(.) = 'image']">\r
   <Image>\r
     <xsl:apply-templates mode="id" select="." />\r
+    <xsl:if test="@x"><xsl:attribute name="Canvas.Left"><xsl:value-of select="@x" /></xsl:attribute></xsl:if>\r
+    <xsl:if test="@y"><xsl:attribute name="Canvas.Top"><xsl:value-of select="@y" /></xsl:attribute></xsl:if>\r
+    <xsl:apply-templates mode="desc" select="." />\r
+\r
     <xsl:apply-templates mode="clip" select="." />\r
     <xsl:if test="@xlink:href"><xsl:attribute name="Source"><xsl:value-of select="@xlink:href" /></xsl:attribute></xsl:if>\r
     <xsl:if test="@width"><xsl:attribute name="Width">\r
@@ -701,6 +720,9 @@ Unknown units are kept.
             <xsl:with-param name="convert_value" select="@height" />\r
         </xsl:call-template>\r
     </xsl:attribute></xsl:if>\r
+    <xsl:apply-templates mode="transform" select=".">\r
+      <xsl:with-param name="mapped_type" select="'Image'" />\r
+    </xsl:apply-templates>\r
     <!--xsl:apply-templates mode="transform" /-->\r
     <xsl:apply-templates mode="forward" />\r
   </Image>\r
@@ -790,6 +812,9 @@ Unknown units are kept.
     <xsl:if test="@x"><xsl:attribute name="Canvas.Left"><xsl:value-of select="@x" /></xsl:attribute></xsl:if>\r
     <xsl:if test="@y"><xsl:attribute name="Canvas.Top"><xsl:value-of select="@y" /></xsl:attribute></xsl:if>\r
     <xsl:apply-templates mode="id" select="." />\r
+\r
+    <xsl:apply-templates mode="desc" select="." />\r
+\r
     <xsl:apply-templates mode="clip" select="." />\r
     <!--xsl:apply-templates mode="transform" select="." /-->\r
     <!--xsl:apply-templates mode="forward" /-->\r
@@ -993,7 +1018,9 @@ Unknown units are kept.
     <xsl:apply-templates mode="stroke_dashoffset" select="." />\r
     <xsl:apply-templates mode="stroke_linejoin" select="." />\r
     <xsl:apply-templates mode="stroke_linecap" select="." />\r
-    \r
+\r
+    <xsl:apply-templates mode="desc" select="." />\r
+\r
     <xsl:apply-templates mode="transform" select=".">\r
       <xsl:with-param name="mapped_type" select="'Line'" />\r
     </xsl:apply-templates>    \r
@@ -1020,6 +1047,7 @@ Unknown units are kept.
     <xsl:if test="@ry"><xsl:attribute name="RadiusY"><xsl:value-of select="@ry" /></xsl:attribute></xsl:if>\r
     <xsl:if test="@rx and not(@ry)"><xsl:attribute name="RadiusX"><xsl:value-of select="@rx" /></xsl:attribute><xsl:attribute name="RadiusY"><xsl:value-of select="@rx" /></xsl:attribute></xsl:if>\r
     <xsl:if test="@ry and not(@rx)"><xsl:attribute name="RadiusX"><xsl:value-of select="@ry" /></xsl:attribute><xsl:attribute name="RadiusY"><xsl:value-of select="@ry" /></xsl:attribute></xsl:if>\r
+\r
     <xsl:apply-templates mode="id" select="." />\r
     <xsl:apply-templates mode="template_fill" select="." />\r
     <xsl:apply-templates mode="template_stroke" select="." />\r
@@ -1032,6 +1060,8 @@ Unknown units are kept.
 \r
     <xsl:apply-templates mode="resources" select="." />\r
 \r
+    <xsl:apply-templates mode="desc" select="." />\r
+\r
     <xsl:apply-templates mode="clip" select="." />\r
 \r
     <xsl:apply-templates mode="transform" select=".">\r
@@ -1056,6 +1086,8 @@ Unknown units are kept.
     <xsl:apply-templates mode="stroke_linejoin" select="." />\r
     <xsl:apply-templates mode="stroke_linecap" select="." />\r
 \r
+    <xsl:apply-templates mode="desc" select="." />\r
+\r
     <xsl:apply-templates mode="transform" select=".">\r
       <xsl:with-param name="mapped_type" select="'Polygon'" />\r
     </xsl:apply-templates>\r
@@ -1078,6 +1110,8 @@ Unknown units are kept.
     <xsl:apply-templates mode="stroke_linejoin" select="." />\r
     <xsl:apply-templates mode="stroke_linecap" select="." />\r
 \r
+    <xsl:apply-templates mode="desc" select="." />\r
+\r
     <xsl:apply-templates mode="transform" select=".">\r
       <xsl:with-param name="mapped_type" select="'Polyline'" />\r
     </xsl:apply-templates>\r
@@ -1097,6 +1131,9 @@ Unknown units are kept.
     <xsl:apply-templates mode="stroke_dashoffset" select="." />\r
     <xsl:apply-templates mode="stroke_linejoin" select="." />\r
     <xsl:apply-templates mode="stroke_linecap" select="." />\r
+\r
+    <xsl:apply-templates mode="desc" select="." />\r
+\r
     <xsl:if test="@d">\r
       <xsl:choose>\r
         <xsl:when test="$silverlight_compatible = 1">\r
@@ -1157,6 +1194,8 @@ Unknown units are kept.
     <xsl:apply-templates mode="stroke_linejoin" select="." />\r
     <xsl:apply-templates mode="stroke_linecap" select="." />\r
 \r
+    <xsl:apply-templates mode="desc" select="." />\r
+\r
     <xsl:apply-templates mode="clip" select="." />\r
 \r
     <xsl:apply-templates mode="transform" select=".">\r
@@ -1197,6 +1236,8 @@ Unknown units are kept.
     <xsl:apply-templates mode="stroke_linejoin" select="." />\r
     <xsl:apply-templates mode="stroke_linecap" select="." />\r
 \r
+    <xsl:apply-templates mode="desc" select="." />\r
+\r
     <xsl:apply-templates mode="clip" select="." />\r
 \r
     <xsl:apply-templates mode="transform" select=".">\r