update to trunk

(bzr r11950.1.127)

24 files changed, 105 insertions, 110 deletions

diff --git a/share/Makefile.am b/share/Makefile.am
index 27aaf0d28..fa778b031 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS = attributes \
-          clipart \
+          branding \
           examples \
           extensions \
           filters \
diff --git a/share/branding/Makefile.am b/share/branding/Makefile.am
new file mode 100644
index 000000000..f992c8165
--- /dev/null
+++ b/share/branding/Makefile.am
@@ -0,0 +1,16 @@
+
+brandingdir = $(datadir)/inkscape/branding
+iconsdir = $(datadir)/inkscape/icons
+
+branding_DATA =  \
+	README \
+	inkscape.svg \
+	sodipodi.svg \
+	tux.svg \
+	draw-freely.svg \
+	draw-freely.ru.svg
+
+icons_DATA = \
+	inkscape.svg
+
+EXTRA_DIST = $(branding_DATA) $(icons_DATA)
diff --git a/share/branding/README b/share/branding/README
new file mode 100644
index 000000000..957c1baad
--- /dev/null
+++ b/share/branding/README
@@ -0,0 +1,3 @@
+This directory is for the official Inkscape-related branding:
+Inkscape logo, banners, promotional graphics, etc.
+
diff --git a/share/clipart/draw-freely.ru.svg b/share/branding/draw-freely.ru.svg
index 61e98a9f7..61e98a9f7 100644
--- a/share/clipart/draw-freely.ru.svg
+++ b/share/branding/draw-freely.ru.svg
diff --git a/share/clipart/draw-freely.svg b/share/branding/draw-freely.svg
index bcf2fb16e..bcf2fb16e 100644
--- a/share/clipart/draw-freely.svg
+++ b/share/branding/draw-freely.svg
diff --git a/share/clipart/inkscape.logo.svg b/share/branding/inkscape.logo.svg
index 4c1ef03ac..4c1ef03ac 100644
--- a/share/clipart/inkscape.logo.svg
+++ b/share/branding/inkscape.logo.svg
diff --git a/share/icons/inkscape.svg b/share/branding/inkscape.svg
index 121bc3aef..121bc3aef 100644
--- a/share/icons/inkscape.svg
+++ b/share/branding/inkscape.svg
diff --git a/share/clipart/orav.svg b/share/branding/sodipodi.svg
index 139cc6ee5..139cc6ee5 100644
--- a/share/clipart/orav.svg
+++ b/share/branding/sodipodi.svg
diff --git a/share/clipart/tux.svg b/share/branding/tux.svg
index e3155ebfd..e3155ebfd 100644
--- a/share/clipart/tux.svg
+++ b/share/branding/tux.svg
diff --git a/share/clipart/Makefile.am b/share/clipart/Makefile.am
deleted file mode 100644
index 8e9a88159..000000000
--- a/share/clipart/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-
-clipartdir = $(datadir)/inkscape/clipart
-
-clipart_DATA =  \
-	README \
-	inkscape.logo.svg \
-	orav.svg \
-	tux.svg \
-	draw-freely.svg \
-	draw-freely.ru.svg
-
-EXTRA_DIST = $(clipart_DATA)
diff --git a/share/clipart/README b/share/clipart/README
deleted file mode 100644
index 862b5503e..000000000
--- a/share/clipart/README
+++ /dev/null
@@ -1,17 +0,0 @@
-This directory is for the official Inkscape-related clipart:
-Inkscape logo, banners, promotional graphics, etc.
-
-This is not for general-purpose SVG clipart. For that, there are
-several excellent sources:
-
-http://openclipart.org has thousands of public domain clipart images
-in SVG
-
-http://commons.wikimedia.org/wiki/Category:SVG has thousands of free
-encyclopedic images in SVG, many of them usable as clipart (maps,
-flags, diagrams, coats of arms, etc.)
-
-
-
-
-
diff --git a/share/extensions/eqtexsvg.py b/share/extensions/eqtexsvg.py
index bf2874ef9..a6000dc6d 100755
--- a/share/extensions/eqtexsvg.py
+++ b/share/extensions/eqtexsvg.py
@@ -118,6 +118,10 @@ class EQTEXSVG(inkex.Effect):
                 os.remove(err_file)
             os.rmdir(base_dir)
 
+        if self.options.formula == "":
+            print >>sys.stderr, "empty LaTeX input.  Nothing to be done"
+            return
+
         add_header = parse_pkgs(self.options.packages)
         create_equation_tex(latex_file, self.options.formula, add_header)
         os.system('latex "-output-directory=%s" -halt-on-error "%s" > "%s"' \
diff --git a/share/extensions/guides_creator.py b/share/extensions/guides_creator.py
index da59a074d..178dc3c95 100755
--- a/share/extensions/guides_creator.py
+++ b/share/extensions/guides_creator.py
@@ -305,7 +305,7 @@ class Guides_Creator(inkex.Effect):
                 v_orientation = str(round(height,4)) + ',0'
 
                 # getting parent tag of the guides
-                nv = self.document.xpath('/svg:svg/sodipodi:namedview',namespaces=inkex.NSS)[0]
+                nv = self.document.find(inkex.addNS('namedview', 'sodipodi'))
 
                 if (tab == "\"regular_guides\""):
                         
@@ -487,9 +487,10 @@ class Guides_Creator(inkex.Effect):
 
                                 # creating vertical guides
                                 drawVerticalGuides(v_subdiv,rectangle_width,rectangle_height,0,nv,begin_from)
-                         
-# Create effect instance and apply it.
-effect = Guides_Creator()
-effect.affect()
+
+if __name__ == '__main__':
+	# Create effect instance and apply it.
+	effect = Guides_Creator()
+	effect.affect()
 
 ## end of file guide_creator.py ##
diff --git a/share/extensions/polyhedron_3d.py b/share/extensions/polyhedron_3d.py
index 063912cc2..1aea7fc51 100755
--- a/share/extensions/polyhedron_3d.py
+++ b/share/extensions/polyhedron_3d.py
@@ -367,22 +367,22 @@ class Poly_3D(inkex.Effect):
 #VEIW SETTINGS
         self.OptionParser.add_option("--r1_ax",
             action="store", type="string", 
-            dest="r1_ax", default=0)
+            dest="r1_ax", default="X-Axis")
         self.OptionParser.add_option("--r2_ax",
             action="store", type="string", 
-            dest="r2_ax", default=0)
+            dest="r2_ax", default="X-Axis")
         self.OptionParser.add_option("--r3_ax",
             action="store", type="string", 
-            dest="r3_ax", default=0)
+            dest="r3_ax", default="X-Axis")
         self.OptionParser.add_option("--r4_ax",
             action="store", type="string", 
-            dest="r4_ax", default=0)
+            dest="r4_ax", default="X-Axis")
         self.OptionParser.add_option("--r5_ax",
             action="store", type="string", 
-            dest="r5_ax", default=0)
+            dest="r5_ax", default="X-Axis")
         self.OptionParser.add_option("--r6_ax",
             action="store", type="string", 
-            dest="r6_ax", default=0)
+            dest="r6_ax", default="X-Axis")
         self.OptionParser.add_option("--r1_ang",
             action="store", type="float", 
             dest="r1_ang", default=0)
diff --git a/share/extensions/spirograph.py b/share/extensions/spirograph.py
index 21249831f..cb9d1ac24 100755
--- a/share/extensions/spirograph.py
+++ b/share/extensions/spirograph.py
@@ -35,7 +35,7 @@ class Spirograph(inkex.Effect):
                         help="The distance of the pen from the inner gear")
         self.OptionParser.add_option("-p", "--gearplacement",
                         action="store", type="string",
-                        dest="gearplacement", default=50.0,
+                        dest="gearplacement", default="inside",
                         help="Selects whether the gear is inside or outside the ring")
         self.OptionParser.add_option("-a", "--rotation",
                         action="store", type="float",
diff --git a/share/extensions/test/gears.test.py b/share/extensions/test/render_gears.test.py
index 964f675ad..ad1668126 100755
--- a/share/extensions/test/gears.test.py
+++ b/share/extensions/test/render_gears.test.py
@@ -10,7 +10,7 @@ import sys
 sys.path.append('..') # this line allows to import the extension code
 
 import unittest
-from gears import *
+from render_gears import *
 
 class GearsBasicTest(unittest.TestCase):
 
diff --git a/share/extensions/test/run-all-extension-tests b/share/extensions/test/run-all-extension-tests
index 1776e25b0..e7cba78f4 100755
--- a/share/extensions/test/run-all-extension-tests
+++ b/share/extensions/test/run-all-extension-tests
@@ -60,4 +60,8 @@ echo ""
 
 rm $py_cover_files $failed_tests
 
-$fail && exit 1
\ No newline at end of file
+if [ x$fail == xtrue ]; then
+	exit 1
+else
+	exit 0
+fi
diff --git a/share/extensions/test/simplestyle.test.py b/share/extensions/test/simplestyle.test.py
index 3c75ac43a..a4746ec09 100755
--- a/share/extensions/test/simplestyle.test.py
+++ b/share/extensions/test/simplestyle.test.py
@@ -1,63 +1,65 @@
 #!/usr/bin/env python
 
-import unittest, sys

-sys.path.append('..') # this line allows to import the extension code

-

-from simplestyle import parseColor, parseStyle

-

-

-class ParseColorTest(unittest.TestCase):

-    """Test for single transformations"""

-    def test_namedcolor(self):

-        "Parse 'red'"

-        col = parseColor('red')

-        self.failUnlessEqual((255,0,0),col)

-        

-    def test_hexcolor4digit(self):

-        "Parse '#ff0102'"

-        col = parseColor('#ff0102')

-        self.failUnlessEqual((255,1,2),col)

-        

-    def test_hexcolor3digit(self):

-        "Parse '#fff'"

-        col = parseColor('#fff')

-        self.failUnlessEqual((255,255,255),col)

-        

-    def test_rgbcolorint(self):

-        "Parse 'rgb(255,255,255)'"

-        col = parseColor('rgb(255,255,255)')

-        self.failUnlessEqual((255,255,255),col)

-        

-    def test_rgbcolorpercent(self):

-        "Parse 'rgb(100%,100%,100%)'"

-        col = parseColor('rgb(100%,100%,100%)')

-        self.failUnlessEqual((255,255,255),col)

-        

-    def test_rgbcolorpercent2(self):

-        "Parse 'rgb(100%,100%,100%)'"

-        col = parseColor('rgb(50%,0%,1%)')

-        self.failUnlessEqual((127,0,2),col)

-        

-    def test_rgbcolorpercentdecimal(self):

-        "Parse 'rgb(66.667%,0%,6.667%)'"

-        col = parseColor('rgb(66.667%,0%,6.667%)')

-        self.failUnlessEqual((170, 0, 17),col)

-    

-    def test_currentColor(self):

-        "Parse 'currentColor'"

-        col = parseColor('currentColor')

-        self.failUnlessEqual(('currentColor'),col)

-

-    def test_spaceinstyle(self):

-        "Parse 'stop-color: rgb(0,0,0)'"

-        col = parseStyle('stop-color: rgb(0,0,0)')

-        self.failUnlessEqual({'stop-color': 'rgb(0,0,0)'},col)

-

-    #def test_unknowncolor(self):

-    #    "Parse 'unknown'"

-    #    col = parseColor('unknown')

-    #    self.failUnlessEqual((0,0,0),col)

-    #

-    

-if __name__ == '__main__':

+import unittest, sys
+sys.path.append('..') # this line allows to import the extension code
+
+from simplestyle import parseColor, parseStyle
+
+
+class ParseColorTest(unittest.TestCase):
+    """Test for single transformations"""
+    def test_namedcolor(self):
+        "Parse 'red'"
+        col = parseColor('red')
+        self.failUnlessEqual((255,0,0),col)
+        
+    def test_hexcolor4digit(self):
+        "Parse '#ff0102'"
+        col = parseColor('#ff0102')
+        self.failUnlessEqual((255,1,2),col)
+        
+    def test_hexcolor3digit(self):
+        "Parse '#fff'"
+        col = parseColor('#fff')
+        self.failUnlessEqual((255,255,255),col)
+        
+    def test_rgbcolorint(self):
+        "Parse 'rgb(255,255,255)'"
+        col = parseColor('rgb(255,255,255)')
+        self.failUnlessEqual((255,255,255),col)
+        
+    def test_rgbcolorpercent(self):
+        "Parse 'rgb(100%,100%,100%)'"
+        col = parseColor('rgb(100%,100%,100%)')
+        self.failUnlessEqual((255,255,255),col)
+        
+    def test_rgbcolorpercent2(self):
+        "Parse 'rgb(100%,100%,100%)'"
+        col = parseColor('rgb(50%,0%,1%)')
+        self.failUnlessEqual((127,0,2),col)
+        
+    def test_rgbcolorpercentdecimal(self):
+        "Parse 'rgb(66.667%,0%,6.667%)'"
+        col = parseColor('rgb(66.667%,0%,6.667%)')
+        self.failUnlessEqual((170, 0, 17),col)
+    
+    # TODO: This test appears to be broken.  parseColor can
+    #       only return an RGB colour code
+    #def test_currentColor(self):
+    #    "Parse 'currentColor'"
+    #    col = parseColor('currentColor')
+    #    self.failUnlessEqual(('currentColor'),col)
+
+    def test_spaceinstyle(self):
+        "Parse 'stop-color: rgb(0,0,0)'"
+        col = parseStyle('stop-color: rgb(0,0,0)')
+        self.failUnlessEqual({'stop-color': 'rgb(0,0,0)'},col)
+
+    #def test_unknowncolor(self):
+    #    "Parse 'unknown'"
+    #    col = parseColor('unknown')
+    #    self.failUnlessEqual((0,0,0),col)
+    #
+    
+if __name__ == '__main__':
     unittest.main()
diff --git a/share/icons/Makefile.am b/share/icons/Makefile.am
index 0dfb1acd7..6053cd71c 100644
--- a/share/icons/Makefile.am
+++ b/share/icons/Makefile.am
@@ -43,7 +43,6 @@ pixmaps = \
 
 icons_DATA = \
 	$(pixmaps) \
-	inkscape.svg \
 	\
 	icons.svg \
 	tango_icons.svg \
diff --git a/share/keys/default.xml b/share/keys/default.xml
index cb1273013..52bbd486c 100644
--- a/share/keys/default.xml
+++ b/share/keys/default.xml
@@ -627,7 +627,6 @@ override) the bindings in the main default.xml.
   <bind action="DialogMetadata" />
   <bind action="DialogClonetiler" />
   <bind action="DialogGridArrange" />
-  <bind action="DialogScript" />
   <bind action="DialogDebug" />
   <bind action="DialogInput" />
 
diff --git a/share/keys/inkscape.xml b/share/keys/inkscape.xml
index cb1273013..52bbd486c 100644
--- a/share/keys/inkscape.xml
+++ b/share/keys/inkscape.xml
@@ -627,7 +627,6 @@ override) the bindings in the main default.xml.
   <bind action="DialogMetadata" />
   <bind action="DialogClonetiler" />
   <bind action="DialogGridArrange" />
-  <bind action="DialogScript" />
   <bind action="DialogDebug" />
   <bind action="DialogInput" />
 
diff --git a/share/keys/macromedia-freehand-mx.xml b/share/keys/macromedia-freehand-mx.xml
index 9297f4d2b..60a9719b5 100644
--- a/share/keys/macromedia-freehand-mx.xml
+++ b/share/keys/macromedia-freehand-mx.xml
@@ -413,7 +413,6 @@ File, Edit, View, Modify, Text, Xtras, Window, Help.
   <bind action="DialogMetadata" />
   <bind action="DialogClonetiler" />
   <bind action="DialogGridArrange" />
-  <bind action="DialogScript" />
   <bind action="DialogDebug" />
   <bind action="DialogInput" />
 
diff --git a/share/keys/right-handed-illustration.xml b/share/keys/right-handed-illustration.xml
index 28af163da..33125edba 100644
--- a/share/keys/right-handed-illustration.xml
+++ b/share/keys/right-handed-illustration.xml
@@ -530,7 +530,6 @@ Future improvements:
   <bind action="DialogMetadata" />
   <bind action="DialogClonetiler" />
   <bind action="DialogGridArrange" />
-  <bind action="DialogScript" />
   <bind action="DialogDebug" />
   <bind action="DialogInput" />
 
diff --git a/share/keys/xara.xml b/share/keys/xara.xml
index 936ee1fd3..5229964ae 100644
--- a/share/keys/xara.xml
+++ b/share/keys/xara.xml
@@ -535,7 +535,6 @@ Hom/end keys-select minimum or maximum feather values
   <bind action="DialogMetadata" />
   <bind action="DialogClonetiler" />
   <bind action="DialogGridArrange" />
-  <bind action="DialogScript" />
   <bind action="DialogDebug" />
   <bind action="DialogInput" />