r16526@tres: ted | 2007-09-11 22:19:01 -0700

 Removing some "
"s that were causing problems.

(bzr r3730)

9 files changed, 63 insertions, 105 deletions

diff --git a/share/extensions/svg2xaml.xsl b/share/extensions/svg2xaml.xsl
index d2e5716d4..faffb9ad9 100644
--- a/share/extensions/svg2xaml.xsl
+++ b/share/extensions/svg2xaml.xsl
@@ -543,7 +543,6 @@ exclude-result-prefixes="rdf xlink msxsl">
 </xsl:template>

 

 <xsl:template match="/">

-  <xsl:text>&#13;</xsl:text>

   <xsl:choose>

     <xsl:when test="$silverlight_compatible = 1">

       <xsl:apply-templates mode="forward" />

@@ -581,7 +580,7 @@ exclude-result-prefixes="rdf xlink msxsl">
               <xsl:attribute name="X"><xsl:value-of select="-number(substring-before($viewBox, ' '))" /></xsl:attribute>

               <xsl:attribute name="Y"><xsl:value-of select="-number(substring-before(substring-after($viewBox, ' '), ' '))" /></xsl:attribute>

             </TranslateTransform>

-          </Canvas.RenderTransform><xsl:text>&#13;</xsl:text>

+          </Canvas.RenderTransform>

         </xsl:if>

     <xsl:if test="@transform">

       <Canvas>

@@ -589,11 +588,10 @@ exclude-result-prefixes="rdf xlink msxsl">
           <TransformGroup><xsl:apply-templates mode="transform" select="." /></TransformGroup>

         </Canvas.RenderTransform>

         <xsl:apply-templates mode="forward" select="*" />

-      </Canvas><xsl:text>&#13;</xsl:text>

+      </Canvas>

     </xsl:if>

 

         <xsl:if test="*[name(.) = 'linearGradient' or name(.) = 'radialGradient' or name(.) = 'defs' or name(.) = 'clipPath']">

-          <xsl:text>&#13;</xsl:text>

           <Canvas.Resources>

             <xsl:apply-templates mode="forward" select="*[name(.) = 'linearGradient' or name(.) = 'radialGradient' or name(.) = 'defs' or name(.) = 'clipPath']" />

           </Canvas.Resources>

@@ -601,7 +599,7 @@ exclude-result-prefixes="rdf xlink msxsl">
         <xsl:if test="not(@transform)">

           <xsl:apply-templates mode="forward" select="*[name(.) != 'linearGradient' and name(.) != 'radialGradient' and name(.) != 'defs' and name(.) != 'clipPath']" />

         </xsl:if>  

-      </Canvas><xsl:text>&#13;</xsl:text>

+      </Canvas>

     </xsl:when>

     <xsl:when test="not(@transform)">

       <xsl:apply-templates mode="forward" select="*" />

@@ -617,7 +615,7 @@ exclude-result-prefixes="rdf xlink msxsl">
           <TransformGroup><xsl:apply-templates mode="transform" select="." /></TransformGroup>

         </Canvas.RenderTransform>

         <xsl:apply-templates mode="forward" select="." />

-      </Canvas><xsl:text>&#13;</xsl:text>

+      </Canvas>

     </xsl:when>

     <xsl:otherwise>

       <xsl:apply-templates mode="forward" select="." />

@@ -626,7 +624,6 @@ exclude-result-prefixes="rdf xlink msxsl">
 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = 'image']">

-  <xsl:text>&#13;</xsl:text>

   <Image>

     <xsl:apply-templates mode="id" select="." />

     <xsl:apply-templates mode="clip" select="." />

@@ -635,11 +632,10 @@ exclude-result-prefixes="rdf xlink msxsl">
     <xsl:if test="@height"><xsl:attribute name="Height"><xsl:value-of select="@height" /></xsl:attribute></xsl:if>

     <!--xsl:apply-templates mode="transform" /-->

     <xsl:apply-templates mode="forward" />

-  </Image><xsl:text>&#13;</xsl:text>

+  </Image>

 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = 'text']">

-  <xsl:text>&#13;</xsl:text>

   <TextBlock>

     <xsl:if test="@font-size"><xsl:attribute name="FontSize"><xsl:value-of select="@font-size" /></xsl:attribute></xsl:if>

     <xsl:if test="@style and contains(@style, 'font-size:')">

@@ -720,7 +716,7 @@ exclude-result-prefixes="rdf xlink msxsl">
     <!--xsl:apply-templates mode="forward" /-->

     <xsl:if test="text()"><xsl:value-of select="text()" /></xsl:if>

     <xsl:if test="*[name(.) = 'tspan']/text()"><xsl:value-of select="*[name(.) = 'tspan']/text()" /></xsl:if>

-  </TextBlock><xsl:text>&#13;</xsl:text>

+  </TextBlock>

 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = 'title' or name(.) = 'desc']">

@@ -732,23 +728,20 @@ exclude-result-prefixes="rdf xlink msxsl">
 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = 'symbol']">

-  <xsl:text>&#13;</xsl:text>

   <Style>

     <xsl:if test="@id"><xsl:attribute name="x:Key"><xsl:value-of select="@id" /></xsl:attribute></xsl:if>

-    <xsl:text>&#13;</xsl:text>

     <Canvas>

       <xsl:apply-templates mode="forward" />

-    </Canvas><xsl:text>&#13;</xsl:text>

-  </Style><xsl:text>&#13;</xsl:text>

+    </Canvas>

+  </Style>

 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = 'use']">

-  <xsl:text>&#13;</xsl:text>

   <Canvas>

     <xsl:if test="@xlink:href"><xsl:attribute name="Style"><xsl:value-of select="@xlink:href" /></xsl:attribute></xsl:if>

     <!--xsl:apply-templates mode="transform" select="." /-->

     <xsl:apply-templates mode="forward" />

-  </Canvas><xsl:text>&#13;</xsl:text>

+  </Canvas>

 </xsl:template>

 

 <xsl:template mode="forward" match="rdf:RDF | *[name(.) = 'foreignObject']">

@@ -762,7 +755,6 @@ exclude-result-prefixes="rdf xlink msxsl">
 <!-- BRUSHES -->

 

 <xsl:template mode="forward" match="*[name(.) = 'linearGradient']">

-  <xsl:text>&#13;</xsl:text>

   <LinearGradientBrush>

     <xsl:if test="@id"><xsl:attribute name="x:Key"><xsl:value-of select="@id" /></xsl:attribute></xsl:if>

     <xsl:attribute name="MappingMode">

@@ -805,7 +797,6 @@ exclude-result-prefixes="rdf xlink msxsl">
       </xsl:otherwise>

     </xsl:choose>

     <LinearGradientBrush.GradientStops>

-      <xsl:text>&#13;</xsl:text>

       <GradientStopCollection>

         <xsl:choose>

           <xsl:when test="@xlink:href">

@@ -815,17 +806,16 @@ exclude-result-prefixes="rdf xlink msxsl">
           <xsl:otherwise><xsl:apply-templates mode="forward" /></xsl:otherwise>  

         </xsl:choose>  

       </GradientStopCollection>

-    </LinearGradientBrush.GradientStops><xsl:text>&#13;</xsl:text>

+    </LinearGradientBrush.GradientStops>

     <xsl:if test="@gradientTransform">

     <LinearGradientBrush.Transform>

       <xsl:apply-templates mode="transform" select="." />

     </LinearGradientBrush.Transform>

   </xsl:if>  

-  </LinearGradientBrush><xsl:text>&#13;</xsl:text>

+  </LinearGradientBrush>

 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = 'radialGradient']">

-  <xsl:text>&#13;</xsl:text>

   <RadialGradientBrush>

     <xsl:if test="@id"><xsl:attribute name="x:Key"><xsl:value-of select="@id" /></xsl:attribute></xsl:if>

     <xsl:attribute name="MappingMode">

@@ -888,14 +878,14 @@ exclude-result-prefixes="rdf xlink msxsl">
           </xsl:when>

           <xsl:otherwise><xsl:apply-templates mode="forward" /></xsl:otherwise>

         </xsl:choose>

-      </GradientStopCollection><xsl:text>&#13;</xsl:text>

-    </RadialGradientBrush.GradientStops><xsl:text>&#13;</xsl:text>

+      </GradientStopCollection>

+    </RadialGradientBrush.GradientStops>

     <xsl:if test="@gradientTransform">

     <RadialGradientBrush.Transform>

       <xsl:apply-templates mode="transform" select="." />

     </RadialGradientBrush.Transform>

     </xsl:if>  

-  </RadialGradientBrush><xsl:text>&#13;</xsl:text>

+  </RadialGradientBrush>

 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = 'stop']">

@@ -904,13 +894,12 @@ exclude-result-prefixes="rdf xlink msxsl">
     <xsl:apply-templates mode="stop_color" select="." />

     <xsl:apply-templates mode="offset" select="." />

     <xsl:apply-templates mode="forward" />

-  </GradientStop><xsl:text>&#13;</xsl:text>

+  </GradientStop>

 </xsl:template>

 

 <!-- SHAPES -->

 

 <xsl:template mode="forward" match="*[name(.) = 'line']">

-  <xsl:text>&#13;</xsl:text>

   <Line>

     <xsl:if test="@x1"><xsl:attribute name="X1"><xsl:value-of select="@x1" /></xsl:attribute></xsl:if> 

     <xsl:if test="@y1"><xsl:attribute name="Y1"><xsl:value-of select="@y1" /></xsl:attribute></xsl:if> 

@@ -931,11 +920,10 @@ exclude-result-prefixes="rdf xlink msxsl">
     </xsl:apply-templates>    

     

     <xsl:apply-templates mode="forward" />

-  </Line><xsl:text>&#13;</xsl:text>

+  </Line>

 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = 'rect']">

-  <xsl:text>&#13;</xsl:text>

   <Rectangle>

     <xsl:if test="@x"><xsl:attribute name="Canvas.Left"><xsl:value-of select="@x" /></xsl:attribute></xsl:if>  

     <xsl:if test="@y"><xsl:attribute name="Canvas.Top"><xsl:value-of select="@y" /></xsl:attribute></xsl:if>  

@@ -962,11 +950,10 @@ exclude-result-prefixes="rdf xlink msxsl">
     </xsl:apply-templates>    

     

     <xsl:apply-templates mode="forward" />

-  </Rectangle><xsl:text>&#13;</xsl:text>

+  </Rectangle>

 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = 'polygon']">

-  <xsl:text>&#13;</xsl:text>

   <Polygon>

     <xsl:if test="@points"><xsl:attribute name="Points"><xsl:value-of select="@points" /></xsl:attribute></xsl:if>

     <xsl:apply-templates mode="id" select="." />

@@ -985,11 +972,10 @@ exclude-result-prefixes="rdf xlink msxsl">
     </xsl:apply-templates>    

     

     <xsl:apply-templates mode="forward" />

-  </Polygon><xsl:text>&#13;</xsl:text>

+  </Polygon>

 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = 'polyline']">

-  <xsl:text>&#13;</xsl:text>

   <Polyline>

     <xsl:if test="@points"><xsl:attribute name="Points"><xsl:value-of select="@points" /></xsl:attribute></xsl:if>

     <xsl:apply-templates mode="id" select="." />

@@ -1008,7 +994,7 @@ exclude-result-prefixes="rdf xlink msxsl">
     </xsl:apply-templates>    

     

     <xsl:apply-templates mode="forward" />

-  </Polyline><xsl:text>&#13;</xsl:text>

+  </Polyline>

 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = 'path']">

@@ -1047,11 +1033,10 @@ exclude-result-prefixes="rdf xlink msxsl">
     </xsl:apply-templates>

     

     <xsl:apply-templates mode="forward" />

-  </Path><xsl:text>&#13;</xsl:text>

+  </Path>

 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = 'ellipse']">

-  <xsl:text>&#13;</xsl:text>

   <Ellipse>

     <xsl:variable name="cx">

       <xsl:choose>

@@ -1090,11 +1075,10 @@ exclude-result-prefixes="rdf xlink msxsl">
     </xsl:apply-templates>

     

     <xsl:apply-templates mode="forward" />

-  </Ellipse><xsl:text>&#13;</xsl:text>

+  </Ellipse>

 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = 'circle']">

-  <xsl:text>&#13;</xsl:text>

   <Ellipse>

     <xsl:variable name="cx">

       <xsl:choose>

@@ -1131,7 +1115,7 @@ exclude-result-prefixes="rdf xlink msxsl">
     </xsl:apply-templates>

     

     <xsl:apply-templates mode="forward" />

-  </Ellipse><xsl:text>&#13;</xsl:text>

+  </Ellipse>

 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = 'clipPath']">

@@ -1164,4 +1148,4 @@ exclude-result-prefixes="rdf xlink msxsl">
   </RectangleGeometry>

 </xsl:template>

 

-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>

diff --git a/share/extensions/xaml2svg.xsl b/share/extensions/xaml2svg.xsl
index 902f16efc..b0e7925f1 100644
--- a/share/extensions/xaml2svg.xsl
+++ b/share/extensions/xaml2svg.xsl
@@ -39,7 +39,6 @@ xmlns:msxsl="urn:schemas-microsoft-com:xslt">
 <xsl:include href="xaml2svg/transform.xsl" />

 

 <xsl:template match="/">

-  <xsl:text>&#13;</xsl:text>

   <svg>

     <xsl:attribute name="overflow">visible</xsl:attribute>

     <xsl:variable name="viewBox"><xsl:apply-templates mode="boundingbox" /></xsl:variable>

@@ -52,11 +51,10 @@ xmlns:msxsl="urn:schemas-microsoft-com:xslt">
       </xsl:attribute>

     </xsl:if>  

     <xsl:apply-templates mode="svg" />

-  </svg><xsl:text>&#13;</xsl:text>

+  </svg>

 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = 'Image']">

-  <xsl:text>&#13;</xsl:text>

   <xsl:if test="@Canvas.Left or @Canvas.Top"><xsl:value-of disable-output-escaping="yes" select="concat('&lt;svg x=&quot;', @Canvas.Left, '&quot; y=&quot;', @Canvas.Top, '&quot;&gt;')" /></xsl:if>

   <image>

     <xsl:if test="@Source"><xsl:attribute name="xlink:href"><xsl:value-of select="@Source" /></xsl:attribute></xsl:if>

@@ -65,12 +63,11 @@ xmlns:msxsl="urn:schemas-microsoft-com:xslt">
     <xsl:call-template name="template_properties" />

     <xsl:call-template name="template_transform" />

     <xsl:apply-templates mode="forward" />

-  </image><xsl:text>&#13;</xsl:text>

+  </image>

   <xsl:if test="@Canvas.Left or @Canvas.Top"><xsl:value-of disable-output-escaping="yes" select="'&lt;/svg&gt;&#13;'" /></xsl:if>

 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = 'TextBlock']">

-  <xsl:text>&#13;</xsl:text>

   <xsl:if test="@Canvas.Left or @Canvas.Top"><xsl:value-of disable-output-escaping="yes" select="concat('&lt;svg x=&quot;', @Canvas.Left, '&quot; y=&quot;', @Canvas.Top, '&quot;&gt;')" /></xsl:if>

   <text>

     <xsl:if test="@FontSize"><xsl:attribute name="font-size"><xsl:value-of select="@FontSize" /></xsl:attribute></xsl:if>

@@ -93,7 +90,7 @@ xmlns:msxsl="urn:schemas-microsoft-com:xslt">
     <xsl:call-template name="template_properties" />

     <xsl:call-template name="template_transform" />

     <xsl:apply-templates />

-  </text><xsl:text>&#13;</xsl:text>

+  </text>

   <xsl:if test="@Canvas.Left or @Canvas.Top"><xsl:value-of disable-output-escaping="yes" select="'&lt;/svg&gt;&#13;'" /></xsl:if>

 </xsl:template>

 

@@ -101,4 +98,4 @@ xmlns:msxsl="urn:schemas-microsoft-com:xslt">
 <xsl:comment><xsl:value-of select="concat('Unknown tag: ', name(.))" /></xsl:comment>

 </xsl:template>

 

-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>

diff --git a/share/extensions/xaml2svg/animation.xsl b/share/extensions/xaml2svg/animation.xsl
index 92e590965..6e7578cd2 100644
--- a/share/extensions/xaml2svg/animation.xsl
+++ b/share/extensions/xaml2svg/animation.xsl
@@ -78,24 +78,23 @@ exclude-result-prefixes="def">
 </xsl:template>

 

 <xsl:template match="*[name(.) = 'ByteAnimation' or name(.) = 'DecimalAnimation' or name(.) = 'DoubleAnimation' or name(.) = 'Int16Animation' or name(.) = 'Int32Animation' or name(.) = 'Int64Animation' or name(.) = 'LengthAnimation' or name(.) = 'SingleAnimation' or name(.) = 'SizeAnimation' or name(.) = 'ThicknessAnimation']">

-  <xsl:text>&#13;</xsl:text>

   <xsl:choose>

     <xsl:when test="../@Path">

       <animate>

         <xsl:attribute name="attributeName"><xsl:call-template name="template_animation_path"><xsl:with-param name="target" select="../@Path" /></xsl:call-template></xsl:attribute>

         <xsl:call-template name="template_animation" />

-      </animate><xsl:text>&#13;</xsl:text>  

+      </animate>

     </xsl:when>

     <xsl:when test="name(..) = concat(name(.), 'Collection')">

       <animate>

         <xsl:attribute name="attributeName"><xsl:value-of select="translate(substring-after(name(../..), concat(name(../../..), '.')), 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')" /></xsl:attribute>

         <xsl:call-template name="template_animation" />

-      </animate><xsl:text>&#13;</xsl:text>

+      </animate>

     </xsl:when>

     <xsl:when test="name(..) = concat(name(../..), '.AngleAnimations')">

       <animateTransform attributeName="transform" type="rotate">

         <xsl:call-template name="template_animation" />

-      </animateTransform><xsl:text>&#13;</xsl:text>

+      </animateTransform>

     </xsl:when>

   </xsl:choose>  

 </xsl:template>

@@ -109,7 +108,6 @@ exclude-result-prefixes="def">
 </xsl:template>

 

 <xsl:template match="*[name(.) = 'ColorAnimation']">

-  <xsl:text>&#13;</xsl:text>

   <animateColor>

     <xsl:if test="../@Path">

       <xsl:attribute name="attributeName"><xsl:call-template name="template_animation_path"><xsl:with-param name="target" select="../@Path" /></xsl:call-template></xsl:attribute>

@@ -124,7 +122,7 @@ exclude-result-prefixes="def">
       </xsl:choose>  

     </xsl:if>    

     <xsl:call-template name="template_animation" />

-  </animateColor><xsl:text>&#13;</xsl:text>

+  </animateColor>

 </xsl:template>

 

 <xsl:template match="*[name(.) = 'PointAnimation']">

@@ -140,4 +138,4 @@ exclude-result-prefixes="def">
 <!-- -->

 </xsl:template>

 

-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>

diff --git a/share/extensions/xaml2svg/brushes.xsl b/share/extensions/xaml2svg/brushes.xsl
index 7dd196836..a5d20e12d 100644
--- a/share/extensions/xaml2svg/brushes.xsl
+++ b/share/extensions/xaml2svg/brushes.xsl
@@ -32,7 +32,6 @@ exclude-result-prefixes="x">
 <xsl:output method="xml" encoding="ISO-8859-1"/>

 

 <xsl:template mode="forward" match="*[name(.) = 'LinearGradientBrush']">

-  <xsl:text>&#13;</xsl:text>

   <linearGradient>

     <xsl:attribute name="id">

       <xsl:choose>

@@ -74,12 +73,10 @@ exclude-result-prefixes="x">
     </xsl:choose>

     <xsl:call-template name="template_gradienttransform" />

     <xsl:apply-templates select="*[name(.) != 'Brush.Transform' and name(.) != concat(name(..), '.Transform') and name(.) != 'Brush.RelativeTransform' and name(.) != concat(name(..), '.RelativeTransform')]" />

-    <xsl:text>&#13;</xsl:text>

-  </linearGradient><xsl:text>&#13;</xsl:text>

+  </linearGradient>

 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = 'RadialGradientBrush']">

-  <xsl:text>&#13;</xsl:text>

   <radialGradient>

     <xsl:attribute name="id">

       <xsl:choose>

@@ -114,7 +111,7 @@ exclude-result-prefixes="x">
     <xsl:attribute name="r"><xsl:value-of select="@RadiusX" /></xsl:attribute>

     <xsl:call-template name="template_gradienttransform" />

     <xsl:apply-templates select="*[name(.) != 'Brush.Transform' and name(.) != concat(name(..), '.Transform') and name(.) != 'Brush.RelativeTransform' and name(.) != concat(name(..), '.RelativeTransform')]" />

-  </radialGradient><xsl:text>&#13;</xsl:text>

+  </radialGradient>

 </xsl:template>

 

 <xsl:template match="*[name(.) = 'GradientStopCollection' or name(.) = 'GradientBrush.GradientStops' or name(.) = concat(name(..), '.GradientStops')]">

@@ -122,7 +119,6 @@ exclude-result-prefixes="x">
 </xsl:template>

 

 <xsl:template match="*[name(.) = 'GradientStop']">

-  <xsl:text>&#13;</xsl:text>

   <stop>

     <xsl:if test="@Offset"><xsl:attribute name="offset"><xsl:value-of select="@Offset" /></xsl:attribute></xsl:if>

     <xsl:if test="@Color">

@@ -139,9 +135,7 @@ exclude-result-prefixes="x">
 </xsl:template>

 

 <xsl:template match="*[name(.) = 'ImageBrush']">

-  <xsl:text>&#13;</xsl:text>

   <defs>

-    <xsl:text>&#13;</xsl:text>

     <pattern>

       <xsl:choose>

         <xsl:when test="@TileMode != 'none' and @Viewport and @ViewportUnits = 'Absolute'">

@@ -174,7 +168,6 @@ exclude-result-prefixes="x">
         </xsl:otherwise>

       </xsl:choose>

       <xsl:attribute name="id"><xsl:value-of select="concat('id_', generate-id(..))" /></xsl:attribute>

-      <xsl:text>&#13;</xsl:text>

       <image>

         <xsl:attribute name="xlink:href"><xsl:value-of select="@ImageSource" /></xsl:attribute>

         <xsl:choose>

@@ -202,9 +195,9 @@ exclude-result-prefixes="x">
         </xsl:choose>

         <xsl:attribute name="style">opacity:1</xsl:attribute>

         <xsl:attribute name="image-rendering">optimizeSpeed</xsl:attribute>

-      </image><xsl:text>&#13;</xsl:text>

-    </pattern><xsl:text>&#13;</xsl:text>

-  </defs><xsl:text>&#13;</xsl:text>

+      </image>

+    </pattern>

+  </defs>

 </xsl:template>

 

 <xsl:template match="*[name(.) = 'DrawingBrush']">

@@ -248,4 +241,4 @@ exclude-result-prefixes="x">
   <xsl:apply-templates mode="forward" />

 </xsl:template>

 

-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>

diff --git a/share/extensions/xaml2svg/canvas.xsl b/share/extensions/xaml2svg/canvas.xsl
index 0b4a93e76..0438bde67 100644
--- a/share/extensions/xaml2svg/canvas.xsl
+++ b/share/extensions/xaml2svg/canvas.xsl
@@ -31,7 +31,6 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 <xsl:output method="xml" encoding="ISO-8859-1"/>

 

 <xsl:template mode="forward" match="*[name(.) = 'Canvas' or name(.) = 'Window' or name(.) = 'StackPanel']">

-  <xsl:text>&#13;</xsl:text>

   <svg>

     <xsl:choose>

     <!--

@@ -47,7 +46,6 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <xsl:call-template name="template_properties" />

     <xsl:choose>

       <xsl:when test="@Transform or *[name(.) = 'UIElement.RenderTransform' or name(.) = 'Shape.RenderTransform' or name(.) = concat(name(..), '.RenderTransform')]">

-        <xsl:text>&#13;</xsl:text>

         <g>

           <xsl:call-template name="template_transform" />

           <xsl:apply-templates select="*[name(.) = 'UIElement.RenderTransform' or name(.) = 'Shape.RenderTransform' or name(.) = concat(name(..), '.RenderTransform')]" />

@@ -56,7 +54,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
       </xsl:when>

       <xsl:otherwise><xsl:apply-templates mode="svg" /></xsl:otherwise>

     </xsl:choose>

-  </svg><xsl:text>&#13;</xsl:text>

+  </svg>

 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = 'Border']">

@@ -79,4 +77,4 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <xsl:apply-templates mode="forward" />

 </xsl:template>

 

-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>

diff --git a/share/extensions/xaml2svg/geometry.xsl b/share/extensions/xaml2svg/geometry.xsl
index a3ccd7091..4468ef4ff 100644
--- a/share/extensions/xaml2svg/geometry.xsl
+++ b/share/extensions/xaml2svg/geometry.xsl
@@ -40,7 +40,6 @@ exclude-result-prefixes="def">
 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = 'ImageDrawing']">

-  <xsl:text>&#13;</xsl:text>

   <image>

     <xsl:if test="@ImageSource"><xsl:attribute name="xlink:href"><xsl:value-of select="@ImageSource" /></xsl:attribute></xsl:if>

     <xsl:if test="@Rect">

@@ -270,4 +269,4 @@ exclude-result-prefixes="def">
   <xsl:apply-templates mode="forward" />

 </xsl:template>

 

-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>

diff --git a/share/extensions/xaml2svg/properties.xsl b/share/extensions/xaml2svg/properties.xsl
index e7cedda1c..e00011549 100644
--- a/share/extensions/xaml2svg/properties.xsl
+++ b/share/extensions/xaml2svg/properties.xsl
@@ -87,7 +87,6 @@ xmlns:msxsl="urn:schemas-microsoft-com:xslt">
 <xsl:template mode="svg" match="*">

   <xsl:choose>

     <xsl:when test="false() and name(.) != 'Canvas' and name(.) != 'Image' and name(.) != 'Rect' and name(.) != 'Ellipse' and name(.) != 'Text' and name(.) != 'TextBlock' and (@Canvas.Left or @Canvas.Top)">

-      <xsl:text>&#13;</xsl:text>

       <svg>

         <xsl:if test="@Canvas.Left and @Canvas.Top and @Width and @Height">

           <xsl:attribute name="viewBox">

@@ -102,7 +101,7 @@ xmlns:msxsl="urn:schemas-microsoft-com:xslt">
         <xsl:if test="@Width"><xsl:attribute name="width"><xsl:value-of select="@Width" /></xsl:attribute></xsl:if>

         <xsl:if test="@Height"><xsl:attribute name="height"><xsl:value-of select="@Height" /></xsl:attribute></xsl:if>

         <xsl:apply-templates mode="g" select="." />

-      </svg><xsl:text>&#13;</xsl:text>

+      </svg>

     </xsl:when>

     <xsl:otherwise><xsl:apply-templates mode="g" select="." /></xsl:otherwise>

   </xsl:choose>

@@ -187,27 +186,25 @@ xmlns:msxsl="urn:schemas-microsoft-com:xslt">
       <xsl:when test="contains(@Clip, '{')"><xsl:attribute name="fill"><xsl:value-of select="concat('url(#', substring-before(substring-after(@Clip, '{'), '}'), ')')" /></xsl:attribute></xsl:when>

       <xsl:otherwise>

         <xsl:attribute name="clip-path"><xsl:value-of select="concat('url(#clippath_', generate-id(.),')')" /></xsl:attribute>

-	<defs><xsl:text>&#13;</xsl:text>

+	<defs>

 	  <clipPath>

 	    <xsl:attribute name="id"><xsl:value-of select="concat('clippath_', generate-id(.))" /></xsl:attribute>

-	    <xsl:text>&#13;</xsl:text>

 	    <path>

 	      <xsl:attribute name="d">

                 <xsl:choose>

                   <xsl:when test="contains(@Clip, 'F1')"><xsl:value-of select="substring-after(@Clip, 'F1')" /></xsl:when>

                   <xsl:otherwise><xsl:value-of select="@Clip" /></xsl:otherwise>

                 </xsl:choose>	

-	      </xsl:attribute></path><xsl:text>&#13;</xsl:text>

-	  </clipPath><xsl:text>&#13;</xsl:text>

-        </defs><xsl:text>&#13;</xsl:text>

+	      </xsl:attribute></path>

+	  </clipPath>

+        </defs>

       </xsl:otherwise>

     </xsl:choose>

   </xsl:if>

 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = concat(name(..), '.Resources')]">

-  <xsl:text>&#13;</xsl:text>

-  <defs><xsl:apply-templates mode="forward" /></defs><xsl:text>&#13;</xsl:text>

+  <defs><xsl:apply-templates mode="forward" /></defs>

 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = concat(name(..), '.Children')]">

@@ -253,17 +250,16 @@ xmlns:msxsl="urn:schemas-microsoft-com:xslt">
 </xsl:template>

 

 <xsl:template mode="defs" match="*[name(.) = 'UIElement.Clip' or name(.) = concat(name(..), '.Clip')]">

-  <defs><xsl:text>&#13;</xsl:text>

+  <defs>

     <clipPath>

       <xsl:attribute name="id"><xsl:value-of select="concat('clippath_', generate-id(.))" /></xsl:attribute>

-      <xsl:text>&#13;</xsl:text>

       <path>

         <xsl:attribute name="d">

           <xsl:apply-templates mode="forward" />

         </xsl:attribute>

-      </path><xsl:text>&#13;</xsl:text>

-    </clipPath><xsl:text>&#13;</xsl:text>

-  </defs><xsl:text>&#13;</xsl:text>

+      </path>

+    </clipPath>

+  </defs>

 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = 'UIElement.OpacityMask' or name(.) = concat(name(..), '.OpacityMask')]">

@@ -271,12 +267,12 @@ xmlns:msxsl="urn:schemas-microsoft-com:xslt">
 </xsl:template>

 

 <xsl:template mode="defs" match="*[name(.) = 'UIElement.OpacityMask' or name(.) = concat(name(..), '.OpacityMask')]">

-  <defs><xsl:text>&#13;</xsl:text>

+  <defs>

     <mask>

       <xsl:attribute name="id"><xsl:value-of select="concat('mask_', generate-id(.))" /></xsl:attribute>

       <xsl:apply-templates mode="svg" />

-    </mask><xsl:text>&#13;</xsl:text>

-  </defs><xsl:text>&#13;</xsl:text>

+    </mask>

+  </defs>

 </xsl:template>

 

 

diff --git a/share/extensions/xaml2svg/shapes.xsl b/share/extensions/xaml2svg/shapes.xsl
index 48548616b..45510e33f 100644
--- a/share/extensions/xaml2svg/shapes.xsl
+++ b/share/extensions/xaml2svg/shapes.xsl
@@ -32,7 +32,6 @@ exclude-result-prefixes="def">
 <xsl:output method="xml" encoding="ISO-8859-1"/>

 

 <xsl:template mode="forward" match="*[name(.) = 'Path']">

-  <xsl:text>&#13;</xsl:text>

   <path>

     <xsl:if test="@Data">

       <xsl:attribute name="d">

@@ -49,7 +48,7 @@ exclude-result-prefixes="def">
     <xsl:call-template name="template_properties" />  

     <xsl:call-template name="template_transform" />  

     <xsl:apply-templates mode="forward" />

-  </path><xsl:text>&#13;</xsl:text>

+  </path>

 </xsl:template>    

 

 <xsl:template mode="forward" match="*[name(.) = 'Path.Data']">

@@ -67,7 +66,6 @@ exclude-result-prefixes="def">
 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = 'Line']">

-  <xsl:text>&#13;</xsl:text>

   <line>

     <xsl:if test="@X1"><xsl:attribute name="x1"><xsl:value-of select="@X1" /></xsl:attribute></xsl:if> 

     <xsl:if test="@Y1"><xsl:attribute name="y1"><xsl:value-of select="@Y1" /></xsl:attribute></xsl:if> 

@@ -76,11 +74,10 @@ exclude-result-prefixes="def">
     <xsl:call-template name="template_properties" />  

     <xsl:call-template name="template_transform" />  

     <xsl:apply-templates mode="forward" />

-  </line><xsl:text>&#13;</xsl:text>

+  </line>

 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = 'Ellipse']">

-  <xsl:text>&#13;</xsl:text>

   <ellipse>

     <xsl:if test="@Width">

       <xsl:attribute name="rx"><xsl:value-of select="@Width div 2" /></xsl:attribute>

@@ -97,11 +94,10 @@ exclude-result-prefixes="def">
     <xsl:call-template name="template_properties" />  

     <xsl:call-template name="template_transform" />  

     <xsl:apply-templates mode="forward" />

-  </ellipse><xsl:text>&#13;</xsl:text>

+  </ellipse>

 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = 'Rectangle']">

-  <xsl:text>&#13;</xsl:text>

   <rect>

     <xsl:if test="@Canvas.Left"><xsl:attribute name="x"><xsl:value-of select="@Canvas.Left" /></xsl:attribute></xsl:if>  

     <xsl:if test="@Canvas.Top"><xsl:attribute name="y"><xsl:value-of select="@Canvas.Top" /></xsl:attribute></xsl:if>  

@@ -113,11 +109,10 @@ exclude-result-prefixes="def">
     <xsl:call-template name="template_transform" />

     <xsl:call-template name="template_timeline_animations" />

     <xsl:apply-templates mode="forward" />

-  </rect><xsl:text>&#13;</xsl:text>

+  </rect>

 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = 'Polyline']">

-  <xsl:text>&#13;</xsl:text>

   <polyline>

     <xsl:if test="@Points"><xsl:attribute name="points"><xsl:value-of select="@Points" /></xsl:attribute></xsl:if>

     <xsl:attribute name="fill-rule">

@@ -129,11 +124,10 @@ exclude-result-prefixes="def">
     <xsl:call-template name="template_properties" />  

     <xsl:call-template name="template_transform" />  

     <xsl:apply-templates mode="forward" />

-  </polyline><xsl:text>&#13;</xsl:text>

+  </polyline>

 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = 'Polygon']">

-  <xsl:text>&#13;</xsl:text>

   <polygon>

     <xsl:if test="@Points"><xsl:attribute name="points"><xsl:value-of select="@Points" /></xsl:attribute></xsl:if>

     <xsl:attribute name="fill-rule">

@@ -145,11 +139,10 @@ exclude-result-prefixes="def">
     <xsl:call-template name="template_properties" />  

     <xsl:call-template name="template_transform" />  

     <xsl:apply-templates mode="forward" />

-  </polygon><xsl:text>&#13;</xsl:text>

+  </polygon>

 </xsl:template>

 

 <xsl:template mode="forward" match="*[name(.) = 'Glyphs']">

-  <xsl:text>&#13;</xsl:text>

   <defs>

     <font-face>

       <xsl:attribute name="font-family"><xsl:value-of select="concat('TrueType ', generate-id(.))" /></xsl:attribute>

@@ -164,7 +157,7 @@ exclude-result-prefixes="def">
     <xsl:call-template name="template_properties" />  

     <xsl:call-template name="template_transform" />  

     <xsl:if test="@UnicodeString"><xsl:value-of select="@UnicodeString" /></xsl:if>

-  </text><xsl:text>&#13;</xsl:text>

+  </text>

 </xsl:template>

 

-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>

diff --git a/share/extensions/xaml2svg/transform.xsl b/share/extensions/xaml2svg/transform.xsl
index 19f1222a1..66312dfcb 100644
--- a/share/extensions/xaml2svg/transform.xsl
+++ b/share/extensions/xaml2svg/transform.xsl
@@ -80,7 +80,7 @@ exclude-result-prefixes="def">
     </xsl:attribute>

   <xsl:apply-templates select="*[name(.) = 'TransformDecorator.Transform']/*/*" />  

   <xsl:apply-templates mode="forward" select="*[name(.) != 'TransformDecorator.Transform']" />

-  </g><xsl:text>&#13;</xsl:text>

+  </g>

 </xsl:template>

 -->