Update to trunk

(bzr r13090.1.22)

3 files changed, 27 insertions, 19 deletions

diff --git a/share/extensions/Makefile.am b/share/extensions/Makefile.am
index 41ddd576f..2c1e23954 100644
--- a/share/extensions/Makefile.am
+++ b/share/extensions/Makefile.am
@@ -13,9 +13,7 @@ otherstuffdir = $(datadir)/inkscape/extensions
 
 moduledir = $(datadir)/inkscape/extensions
 
-# If you remove an extension from here, either add it to EXTRA_DIST
-# below, or remove all mention of it from po/inkscape.pot as well.
-module_DATA = $(wildcard $(extensiondir)/*.py)
+extension_SCRIPTS = $(wildcard $(srcdir)/*.py)
 
 otherstuff_DATA = \
 	fontfix.conf \
@@ -30,7 +28,7 @@ otherstuff_DATA = \
 	svg2xaml.xsl \
 	xaml2svg.xsl
 
-module_DATA = $(wildcard $(moduledir)/*.inx)
+module_DATA = $(wildcard $(srcdir)/*.inx)
 
 EXTRA_DIST = \
 	$(extension_SCRIPTS) $(otherstuff_DATA) $(module_DATA)
diff --git a/share/extensions/hpgl_encoder.py b/share/extensions/hpgl_encoder.py
index 3d0b1bb7f..c7f0cd282 100644
--- a/share/extensions/hpgl_encoder.py
+++ b/share/extensions/hpgl_encoder.py
@@ -122,8 +122,8 @@ class hpglEncoder:
         # move drawing according to various modifiers
         if self.options.autoAlign:
             if self.options.center:
-                self.divergenceX += (self.sizeX - self.divergenceX) / 2
-                self.divergenceY += (self.sizeY - self.divergenceY) / 2
+                self.offsetX -= (self.sizeX - self.divergenceX) / 2
+                self.offsetY -= (self.sizeY - self.divergenceY) / 2
         else:
             self.divergenceX = 0.0
             self.divergenceY = 0.0
@@ -163,19 +163,24 @@ class hpglEncoder:
         if self.options.speed > 0:
             self.hpgl += ';VS%d' % self.options.speed
         # add move to zero point and precut
-        self.processOffset('PU', 0, 0)
         if self.toolOffset > 0.0 and self.options.precut:
             if self.options.center:
-                # TODO: get this FU to work or remove precut functionality
-                '''
-                newDoc = inkex.etree.parse(StringIO('<svg xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" width="10" height="' + str(10 * 3.5433070866) + '"></svg>'))
-                newLayer = inkex.etree.SubElement(newDoc.getroot(), 'g', {inkex.addNS('groupmode', 'inkscape'): 'layer', inkex.addNS('label', 'inkscape'): 'null'})
-                newPath = inkex.etree.SubElement(newLayer, 'path', {'d': 'M ' + str(oldDivergenceX) + ',' + str(oldDivergenceY) + ' L ' + str(oldDivergenceX) + ',' + str(oldDivergenceY + (self.options.toolOffset * 8 * 3.5433070866)), 'style': 'stroke:#000000; stroke-width:0.4; fill:none;'})
-                self.processPath(newPath, groupmat)
-                '''
-                pass
+                # position precut outside of drawing plus one times the tooloffset
+                if self.offsetX >= 0.0:
+                    precutX = self.offsetX + self.toolOffset
+                else:
+                    precutX = self.offsetX - self.toolOffset
+                if self.offsetY >= 0.0:
+                    precutY = self.offsetY + self.toolOffset
+                else:
+                    precutY = self.offsetY - self.toolOffset
+                self.processOffset('PU', precutX, precutY)
+                self.processOffset('PD', precutX, precutY + self.toolOffset * 8)
             else:
+                self.processOffset('PU', 0, 0)
                 self.processOffset('PD', 0, self.toolOffset * 8)
+        else:
+            self.processOffset('PU', 0, 0)
         # start conversion
         self.processGroups(self.doc, groupmat)
         # shift an empty node in in order to process last node in cache
diff --git a/share/extensions/tar_layers.py b/share/extensions/tar_layers.py
index 8cfb50a24..3707af1f8 100755
--- a/share/extensions/tar_layers.py
+++ b/share/extensions/tar_layers.py
@@ -17,7 +17,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 """
-An extention to export multiple svg files from a single svg file containing layers.
+An extension to export multiple svg files from a single svg file containing layers.
 
 Each defs is duplicated for each svg outputed.
 """
@@ -26,8 +26,8 @@ import sys
 import copy
 import tarfile
 import StringIO
-
-from datetime import datetime
+import calendar
+import time
 
 # Inkscape Libraries
 import inkex
@@ -87,7 +87,7 @@ class LayersOutput(inkex.Effect):
         doc.write(string)
         string.seek(0)
         info = tarfile.TarInfo(name=name+'.svg')
-        info.mtime = int(datetime.now().strftime('%s'))
+        info.mtime = calendar.timegm(time.gmtime())
         info.size  = len(string.buf)
         return dict(tarinfo=info, fileobj=string)
 
@@ -95,6 +95,11 @@ class LayersOutput(inkex.Effect):
         # open output tar file as a stream (to stdout)
         tar = tarfile.open(fileobj=sys.stdout, mode='w|')
 
+        # Switch stdout to binary on Windows.
+        if sys.platform == "win32":
+            import msvcrt
+            msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
+
         template = self.make_template()
 
         previous = None