update to trunk

(bzr r11950.1.311)

4 files changed, 31 insertions, 8 deletions

diff --git a/share/extensions/hpgl_output.py b/share/extensions/hpgl_output.py
index 5b5521926..c6713cb65 100755
--- a/share/extensions/hpgl_output.py
+++ b/share/extensions/hpgl_output.py
@@ -61,6 +61,13 @@ class HpglOutput(inkex.Effect):
             else:
                 type, value, traceback = sys.exc_info()
                 raise ValueError, ("", type, value), traceback
+        # convert raw HPGL to HPGL
+        hpglInit = 'IN;SP%d' % self.options.pen
+        if self.options.force > 0:
+            hpglInit += ';FS%d' % self.options.force
+        if self.options.speed > 0:
+            hpglInit += ';VS%d' % self.options.speed
+        self.hpgl = hpglInit + self.hpgl + ';PU0,0;SP0;IN;'
 
     def output(self):
         # print to file
diff --git a/share/extensions/text_extract.py b/share/extensions/text_extract.py
index a27cfff50..bf263ef39 100755
--- a/share/extensions/text_extract.py
+++ b/share/extensions/text_extract.py
@@ -22,14 +22,22 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 """
-import inkex, os, csv, math, chardataeffect, string
-
+# standard library
+import chardataeffect
+from copy import deepcopy
+import csv
+import math
+import os
+import string
 try:
     from subprocess import Popen, PIPE
     bsubprocess = True
 except:
     bsubprocess = False
 
+# local library
+import inkex
+
 class Extract(inkex.Effect):
     def __init__(self):
         inkex.Effect.__init__(self)
@@ -137,14 +145,19 @@ class Extract(inkex.Effect):
             objlist.sort()
             #move them to the top of the object stack in this order.
             for item in objlist:
-                self.recurse(self.selected[item[1]])
+                self.recurse(deepcopy(self.selected[item[1]]))
                 
     def recurse(self, node):
         istext = (node.tag == '{http://www.w3.org/2000/svg}flowPara' or node.tag == '{http://www.w3.org/2000/svg}flowDiv' or node.tag == '{http://www.w3.org/2000/svg}text')
-        if node.text != None:
-            inkex.errormsg(node.text)
-        for child in node:
-            self.recurse(child)
+        if node.text != None or node.tail != None:
+            for child in node:
+                if child.get('{http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd}role'):
+                    child.tail = "\n"
+            inkex.errormsg(inkex.etree.tostring(node, method='text').strip())
+        else:
+            for child in node:
+                self.recurse(child)
+
 
 if __name__ == '__main__':
     e = Extract()
diff --git a/share/extensions/text_merge.inx b/share/extensions/text_merge.inx
index c871f52c0..fbbe7e857 100644
--- a/share/extensions/text_merge.inx
+++ b/share/extensions/text_merge.inx
@@ -20,7 +20,7 @@
     <_item value="m">Middle</_item>
     <_item value="b">Bottom</_item>
   </param>
-  <param name="flowtext" type="boolean" _gui-text="Flow text">false</param>
+<!--  <param name="flowtext" type="boolean" _gui-text="Flow text">false</param> -->
   <param name="keepstyle" type="boolean" _gui-text="Keep style">true</param>
   <effect>
     <object-type>all</object-type>
diff --git a/share/extensions/text_merge.py b/share/extensions/text_merge.py
index 8cd8b751d..dc6ee331c 100644
--- a/share/extensions/text_merge.py
+++ b/share/extensions/text_merge.py
@@ -191,6 +191,9 @@ class Merge(inkex.Effect):
                 newspan.text = node.text
             for child in node:
                 self.recurse(child, newspan)
+            if (node.tail and node.tag != '{http://www.w3.org/2000/svg}text'):
+                newspan.tail = node.tail
+                
 
 if __name__ == '__main__':
     e = Merge()