update to trunk (r13532)

(bzr r13398.1.8)

5 files changed, 138 insertions, 56 deletions

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..040e6bcb2 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>
@@ -837,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
 -->
@@ -845,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" />
@@ -2650,7 +2653,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>
diff --git a/share/palettes/Ubuntu.gpl b/share/palettes/Ubuntu.gpl
index fba0283f7..157f5bc18 100644
--- a/share/palettes/Ubuntu.gpl
+++ b/share/palettes/Ubuntu.gpl
@@ -1,43 +1,121 @@
 GIMP Palette
 Name: Ubuntu
-Columns: 0
-#
-238 199  62	Orange Hilight
-240 165  19	Orange
-251 139   0	Orange Base
-244  72   0	Orange Shadow
-255 255 153	Accent Yellow Highlight
-255 255   0	Yellow
-253 202   1	Accent Yellow Base
-152 102   1	Accent Yellow Shadow
-244  72   0	Accent Orange
-253  51   1	Accent Red
-212   0   0	Accent Red Base
-152   1   1	Accent Deep Red
-253 217 155	Human Highlight
-217 187 122	Human
-129 102  71	Human Base
- 86  82  72	Environmental Shadow
-170 204 238	Environmental Blue Highlight
-102 153 204	Environmental Blue Medium
- 51 102 153	Environmental Blue Base
-  0  51 102	Environmental Blue Shadow
-179 222 253	Accent Blue Shadow
-  1 151 253	Accent Blue
-  1 105 201	Accent Blue Base
-  1  51 151	Accent Blue Shadow
-204 255 153	Accent Green Highlight
-152 252 102	Accent Green
- 51 153   0	Accent Green Base
-  1  90   1	Accent Green Shadow
-  0  43  61	Ubuntu Toner
-255 155 255	Accent Magenta Highlight
-255   0 255	Accent Magenta
-102   0 204	Accent Dark Violet
-238 238 238	Grey 1
-204 204 207	Grey 2
-170 170 170	Grey 3
-136 136 136	Grey 4
-102 102 102	Grey 5
- 51  51  51	Grey 6
-  0   0   0	Black
+# <http://design.ubuntu.com/brand/colour-palette>
+
+
+0	0	0	Black
+255	255	255	White
+
+
+221	72	20	Ubuntu orange
+224	90	44	Ubuntu orange 90%
+228	109	67	Ubuntu orange 80%
+231	127	91	Ubuntu orange 70%
+235	145	114	Ubuntu orange 60%
+238	164	138	Ubuntu orange 50%
+240	173	149	Ubuntu orange 45%
+241	182	161	Ubuntu orange 40%
+243	191	173	Ubuntu orange 35%
+245	200	185	Ubuntu orange 30%
+247	209	196	Ubuntu orange 25%
+248	218	208	Ubuntu orange 20%
+250	228	220	Ubuntu orange 15%
+252	237	232	Ubuntu orange 10%
+
+
+119	33	111	Light aubergine
+133	55	125	Light aubergine 90%
+146	77	140	Light aubergine 80%
+160	100	154	Light aubergine 70%
+173	122	169	Light aubergine 60%
+187	144	183	Light aubergine 50%
+194	155	190	Light aubergine 45%
+201	166	197	Light aubergine 40%
+207	177	205	Light aubergine 35%
+214	188	212	Light aubergine 30%
+221	200	219	Light aubergine 25%
+228	211	226	Light aubergine 20%
+235	222	233	Light aubergine 15%
+241	233	241	Light aubergine 10%
+
+
+94	39	80	Mid aubergine
+110	61	98	Mid aubergine 90%
+126	82	115	Mid aubergine 80%
+142	104	133	Mid aubergine 70%
+158	125	150	Mid aubergine 60%
+175	147	168	Mid aubergine 50%
+183	158	176	Mid aubergine 45%
+191	169	185	Mid aubergine 40%
+199	179	194	Mid aubergine 35%
+207	190	203	Mid aubergine 30%
+215	201	211	Mid aubergine 25%
+223	212	220	Mid aubergine 20%
+231	223	229	Mid aubergine 15%
+239	233	238	Mid aubergine 10%
+
+
+44	0	30	Dark aubergine
+65	26	53	Dark aubergine 90%
+86	51	75	Dark aubergine 80%
+107	77	98	Dark aubergine 70%
+128	102	120	Dark aubergine 60%
+150	128	143	Dark aubergine 50%
+160	140	154	Dark aubergine 45%
+171	153	165	Dark aubergine 40%
+181	166	176	Dark aubergine 35%
+192	179	188	Dark aubergine 30%
+202	191	199	Dark aubergine 25%
+213	204	210	Dark aubergine 20%
+223	217	221	Dark aubergine 15%
+234	230	233	Dark aubergine 10%
+
+
+174	167	159	Warm grey
+182	176	169	Warm grey 90%
+190	185	178	Warm grey 80%
+198	193	188	Warm grey 70%
+206	202	197	Warm grey 60%
+215	211	207	Warm grey 50%
+219	215	212	Warm grey 45%
+223	220	217	Warm grey 40%
+227	224	221	Warm grey 35%
+231	229	226	Warm grey 30%
+235	233	231	Warm grey 25%
+239	237	236	Warm grey 20%
+243	242	241	Warm grey 15%
+247	246	245	Warm grey 10%
+
+
+51	51	51	Cool grey
+71	71	71	Cool grey 90%
+92	92	92	Cool grey 80%
+112	112	112	Cool grey 70%
+133	133	133	Cool grey 60%
+153	153	153	Cool grey 50%
+163	163	163	Cool grey 45%
+173	173	173	Cool grey 40%
+184	184	184	Cool grey 35%
+194	194	194	Cool grey 30%
+204	204	204	Cool grey 25%
+214	214	214	Cool grey 20%
+224	224	224	Cool grey 15%
+235	235	235	Cool grey 10%
+
+
+119	41	83	Canonical aubergine
+133	62	100	Canonical aubergine 90%
+146	84	117	Canonical aubergine 80%
+160	105	135	Canonical aubergine 70%
+173	127	152	Canonical aubergine 60%
+187	148	169	Canonical aubergine 50%
+194	159	178	Canonical aubergine 45%
+201	169	186	Canonical aubergine 40%
+207	180	195	Canonical aubergine 35%
+214	191	203	Canonical aubergine 30%
+221	202	212	Canonical aubergine 25%
+228	212	221	Canonical aubergine 20%
+235	223	229	Canonical aubergine 15%
+241	234	238	Canonical aubergine 10%
+
+
diff --git a/share/tutorials/potrace-sk.png b/share/tutorials/potrace-sk.png
index fa2610907..fa2610907 100755..100644
--- a/share/tutorials/potrace-sk.png
+++ b/share/tutorials/potrace-sk.png
diff --git a/share/tutorials/potrace-zh_TW.png b/share/tutorials/potrace-zh_TW.png
index c7ace0090..c7ace0090 100755..100644
--- a/share/tutorials/potrace-zh_TW.png
+++ b/share/tutorials/potrace-zh_TW.png