From 4436eae1a6810e3630679898f91fe1995d1fae7e Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Sun, 10 Aug 2014 15:29:46 +0200
Subject: Export. Fix for Bug #1166184 (XAML export not compatible with
 Silverlight).

Fixed bugs:
  - https://launchpad.net/bugs/1166184

(bzr r13505)
---
 share/extensions/svg2xaml.inx |  1 +
 share/extensions/svg2xaml.xsl | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'share/extensions')

diff --git a/share/extensions/svg2xaml.inx b/share/extensions/svg2xaml.inx
index da621b8f7..74b8f731a 100644
--- a/share/extensions/svg2xaml.inx
+++ b/share/extensions/svg2xaml.inx
@@ -2,6 +2,7 @@
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
     <_name>XAML Output</_name>
     <id>org.inkscape.output.xaml</id>
+    <param name="silverlight" type="boolean" _gui-text="Silverlight compatible XAML">false</param>
     <output>
         <extension>.xaml</extension>
         <mimetype>text/xml+xaml</mimetype>
diff --git a/share/extensions/svg2xaml.xsl b/share/extensions/svg2xaml.xsl
index 40b1f400b..516f68b76 100755
--- a/share/extensions/svg2xaml.xsl
+++ b/share/extensions/svg2xaml.xsl
@@ -3,7 +3,7 @@
 <!--
 Copyright (c) 2005-2007 authors:
 Original version: Toine de Greef (a.degreef@chello.nl)
-Modified (2010-2011) by Nicolas Dufour (nicoduf@yahoo.fr) (blur support, units
+Modified (2010-2014) by Nicolas Dufour (nicoduf@yahoo.fr) (blur support, units
 convertion, comments, and some other fixes)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -39,7 +39,7 @@ exclude-result-prefixes="rdf xlink xs exsl libxslt">
 <xsl:strip-space elements="*" />
 <xsl:output method="xml" encoding="UTF-8" indent="yes"/>
 
-<xsl:param name="silverlight_compatible" select="2" />
+<xsl:param name="silverlight_compatible" select="$silverlight" />
 
 <!-- 
   // Containers //
@@ -53,10 +53,16 @@ exclude-result-prefixes="rdf xlink xs exsl libxslt">
 -->
 <xsl:template match="/">
   <xsl:choose>
-    <xsl:when test="$silverlight_compatible = 1">
+    <xsl:when test="$silverlight_compatible = 'true'">
+      <xsl:comment>
+        <xsl:value-of select="'This file is compatible with Silverlight'" />
+      </xsl:comment>
       <xsl:apply-templates mode="forward" />
     </xsl:when>
     <xsl:otherwise>
+      <xsl:comment>
+        <xsl:value-of select="'This file is NOT compatible with Silverlight'" />
+      </xsl:comment>
       <Viewbox Stretch="Uniform">
         <xsl:apply-templates mode="forward" />
       </Viewbox>
@@ -2650,7 +2656,7 @@ exclude-result-prefixes="rdf xlink xs exsl libxslt">
     
     <xsl:if test="@d">
       <xsl:choose>
-        <xsl:when test="$silverlight_compatible = 1">
+        <xsl:when test="$silverlight_compatible = 'true'">
           <xsl:attribute name="Data">
             <xsl:value-of select="translate(@d , ',', ' ')" />
           </xsl:attribute>
-- 
cgit v1.2.3


From fb52cd78973148895d5d5d8e00d15ee086a161df Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Sun, 10 Aug 2014 20:59:52 +0200
Subject: =?UTF-8?q?Export.=20Fix=20for=20Bug=20#1350817=20(XAML=20export?=
 =?UTF-8?q?=20omits=20fractional=20stroke=20widths)=20by=20Johannes=20R?=
 =?UTF-8?q?=C3=B6ssel.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixed bugs:
  - https://launchpad.net/bugs/1350817

(bzr r13507)
---
 share/extensions/svg2xaml.xsl | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'share/extensions')

diff --git a/share/extensions/svg2xaml.xsl b/share/extensions/svg2xaml.xsl
index 516f68b76..040e6bcb2 100755
--- a/share/extensions/svg2xaml.xsl
+++ b/share/extensions/svg2xaml.xsl
@@ -843,7 +843,7 @@ exclude-result-prefixes="rdf xlink xs exsl libxslt">
 
 <!-- 
   // Unit to pixel converter //
-  Values with units (except %) are converted to pixels and rounded.
+  Values with units (except %) are converted to pixels.
   Unknown units are kept.
   em, ex and % not implemented
 -->
@@ -851,28 +851,25 @@ exclude-result-prefixes="rdf xlink xs exsl libxslt">
   <xsl:param name="convert_value" />
   <xsl:choose>
     <xsl:when test="contains($convert_value, 'px')">
-      <xsl:value-of select="round(translate($convert_value, 'px', ''))" />
+      <xsl:value-of select="translate($convert_value, 'px', '')" />
     </xsl:when>
     <xsl:when test="contains($convert_value, 'pt')">
-      <xsl:value-of select="round(translate($convert_value, 'pt', '') * 1.25)" />
+      <xsl:value-of select="translate($convert_value, 'pt', '') * 1.25" />
     </xsl:when>
     <xsl:when test="contains($convert_value, 'pc')">
-      <xsl:value-of select="round(translate($convert_value, 'pc', '') * 15)" />
+      <xsl:value-of select="translate($convert_value, 'pc', '') * 15" />
     </xsl:when>
     <xsl:when test="contains($convert_value, 'mm')">
-      <xsl:value-of select="round(translate($convert_value, 'mm', '') * 3.543307)" />
+      <xsl:value-of select="translate($convert_value, 'mm', '') * 3.543307" />
     </xsl:when>
     <xsl:when test="contains($convert_value, 'cm')">
-      <xsl:value-of select="round(translate($convert_value, 'cm', '') * 35.43307)" />
+      <xsl:value-of select="translate($convert_value, 'cm', '') * 35.43307" />
     </xsl:when>
     <xsl:when test="contains($convert_value, 'in')">
-      <xsl:value-of select="round(translate($convert_value, 'in', '') * 90)" />
+      <xsl:value-of select="translate($convert_value, 'in', '') * 90" />
     </xsl:when>
     <xsl:when test="contains($convert_value, 'ft')">
-      <xsl:value-of select="round(translate($convert_value, 'ft', '') * 1080)" />
-    </xsl:when>
-    <xsl:when test="not(string(number($convert_value))='NaN')">
-      <xsl:value-of select="round($convert_value)" />
+      <xsl:value-of select="translate($convert_value, 'ft', '') * 1080" />
     </xsl:when>
     <xsl:otherwise>
       <xsl:value-of select="$convert_value" />
-- 
cgit v1.2.3