From 106e15e457a9b514a34bf6321d6c5cc386c2f569 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Sat, 21 Jun 2014 21:32:06 +0200
Subject: Add new named color 'rebeccapurple' (CSS4 Color).

(bzr r13435)
---
 share/extensions/colors.xml     | 1 +
 share/extensions/scour.py       | 1 +
 share/extensions/simplestyle.py | 1 +
 share/palettes/svg.gpl          | 1 +
 4 files changed, 4 insertions(+)

(limited to 'share')

diff --git a/share/extensions/colors.xml b/share/extensions/colors.xml
index 51167fdd7..7ed8592d5 100644
--- a/share/extensions/colors.xml
+++ b/share/extensions/colors.xml
@@ -119,6 +119,7 @@
 <color name="plum" hex="#dda0dd" rgb="221,160,221" />
 <color name="powderblue" hex="#b0e0e6" rgb="176,224,230" />
 <color name="purple" hex="#800080" rgb="128,0,128" />
+<color name="rebeccapurple" hex="#663399" rgb="102,51,153" />
 <color name="red" hex="#ff0000" rgb="255,0,0" />
 <color name="rosybrown" hex="#bc8f8f" rgb="188,143,143" />
 <color name="royalblue" hex="#4169e1" rgb="65,105,225" />
diff --git a/share/extensions/scour.py b/share/extensions/scour.py
index be40a27bd..236529daa 100644
--- a/share/extensions/scour.py
+++ b/share/extensions/scour.py
@@ -250,6 +250,7 @@ colors = {
 	'plum': 'rgb(221, 160, 221)',
 	'powderblue': 'rgb(176, 224, 230)',
 	'purple': 'rgb(128, 0, 128)',
+	'rebeccapurple': 'rgb(102, 51, 153)',
 	'red': 'rgb(255, 0, 0)',
 	'rosybrown': 'rgb(188, 143, 143)',
 	'royalblue': 'rgb( 65, 105, 225)',
diff --git a/share/extensions/simplestyle.py b/share/extensions/simplestyle.py
index 99b5938dd..806b81813 100644
--- a/share/extensions/simplestyle.py
+++ b/share/extensions/simplestyle.py
@@ -141,6 +141,7 @@ svgcolors={
     'plum':'#dda0dd',
     'powderblue':'#b0e0e6',
     'purple':'#800080',
+    'rebeccapurple':'#663399',
     'red':'#ff0000',
     'rosybrown':'#bc8f8f',
     'royalblue':'#4169e1',
diff --git a/share/palettes/svg.gpl b/share/palettes/svg.gpl
index b0893cd82..d8b868b5d 100644
--- a/share/palettes/svg.gpl
+++ b/share/palettes/svg.gpl
@@ -139,3 +139,4 @@ Name: SVG
 220  20  60	crimson (#DC143C)
 255 192 203	pink (#FFC0CB)
 255 182 193	lightpink (#FFB6C1)
+102  51 153     rebeccapurple (#663399)
-- 
cgit v1.2.3


From 497dfa84602b635c918d5e84059fd6b0377133da Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Wed, 25 Jun 2014 18:40:00 +0200
Subject: Extensions. Fix for Bug #1332461 (Datamatrix 22x22 is always
 incorrect).

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

(bzr r13440)
---
 share/extensions/render_barcode_datamatrix.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'share')

diff --git a/share/extensions/render_barcode_datamatrix.py b/share/extensions/render_barcode_datamatrix.py
index bca1d2241..83d009db8 100755
--- a/share/extensions/render_barcode_datamatrix.py
+++ b/share/extensions/render_barcode_datamatrix.py
@@ -140,7 +140,7 @@ def get_parameters(nrow, ncol):
     elif ( nrow ==  20 and ncol ==  20 ):
         return 18, 18, 1, 1, 22, 18, 1
     elif ( nrow ==  22 and ncol ==  22 ):
-        return 18, 18, 1, 1, 30, 20, 1
+        return 20, 20, 1, 1, 30, 20, 1
     elif ( nrow ==  24 and ncol ==  24 ):
         return 22, 22, 1, 1, 36, 24, 1
     elif ( nrow ==  26 and ncol ==  26 ):
-- 
cgit v1.2.3


From 9cc9f5aba7e0094ff16bba6e6ef8c4c6dc09916e Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurchor@gmail.com>
Date: Mon, 21 Jul 2014 16:58:05 +0200
Subject: Symbols: Fix typos in FlowSymbols.svg

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

(bzr r13456)
---
 share/symbols/FlowSymbols.svg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'share')

diff --git a/share/symbols/FlowSymbols.svg b/share/symbols/FlowSymbols.svg
index a9dde4798..91495034e 100644
--- a/share/symbols/FlowSymbols.svg
+++ b/share/symbols/FlowSymbols.svg
@@ -110,7 +110,7 @@
     </symbol>
 
     <symbol id="AuxillaryOp">
-      <title>Auxillary Operation</title>
+      <title>Auxiliary Operation</title>
       <desc>Offline operation.</desc>
       <rect x="35" y="35" width="80" height="80" style="stroke-width:2"/>
     </symbol>
@@ -123,12 +123,12 @@
 
     <symbol id="Extract">
       <title>Extract</title>
-      <desc>Removel of one or more specific sets of times from a set. (ISO)</desc>
+      <desc>Removal of one or more specific sets of times from a set. (ISO)</desc>
       <path d="m 35,115 40,-70 40,70 z" style="stroke-width:2"/>
     </symbol>
 
     <symbol id="Terminal">
-      <title>Terminal/Interupt</title>
+      <title>Terminal/Interrupt</title>
       <desc>A terminal point in a flowchart: start, stop, halt, etc.</desc>
       <path d="m 35,95 a 20,20 0 0 1 0,-40 l 80,0 a 20,20 0 0 1 0,40 z" style="stroke-width:2"/>
     </symbol>
-- 
cgit v1.2.3


From 1c936f11fdd5ee331b805d8d0966f407121d6d08 Mon Sep 17 00:00:00 2001
From: Bryce Harrington <bryce@bryceharrington.org>
Date: Tue, 22 Jul 2014 22:22:20 -0700
Subject: inkex: Clarify a dupe error msg, for easier debugging

(bzr r13463)
---
 share/extensions/inkex.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'share')

diff --git a/share/extensions/inkex.py b/share/extensions/inkex.py
index 947cb5b30..823242ede 100755
--- a/share/extensions/inkex.py
+++ b/share/extensions/inkex.py
@@ -168,7 +168,7 @@ class Effect:
             try:
                 stream = open(self.svg_file, 'r')
             except Exception:
-                errormsg(_("Unable to open specified file: %s") % self.svg_file)
+                errormsg(_("Unable to open object member file: %s") % self.svg_file)
                 sys.exit()
 
         # Finally, if the filename was not specified anywhere, use
-- 
cgit v1.2.3