Merge branch 'v1.0.x'

leejjoon · leejjoon · commit 9ca2c4118f68 · 2011-04-25T14:50:00.000+09:00
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -1386,6 +1386,19 @@ def gs_distill(tmpfile, eps=False, ptype='letter', bbox=None, rotated=False):
     shutil.move(psfile, tmpfile)
 
 
+    # While it is best if above steps preserve the original bounding
+    # box, there seem to be cases when it is not. For those cases,
+    # the original bbox can be restored during the pstoeps step.
+
+    if eps:
+        # pstoeps(tmpfile, bbox, rotated=rotated)
+
+        # For some versions of gs, above steps result in an ps file
+        # where the original bbox is no more correct. Do not adjust
+        # bbox for now.
+        pstoeps(tmpfile)
+
+
 def xpdf_distill(tmpfile, eps=False, ptype='letter', bbox=None, rotated=False):
     """
     Use ghostscript's ps2pdf and xpdf's/poppler's pdftops to distill a file.
@@ -1490,13 +1503,18 @@ def get_bbox(tmpfile, bbox):
     return '\n'.join([bbox_info, hires_bbox_info])
 
 
-def pstoeps(tmpfile, bbox, rotated=False):
+def pstoeps(tmpfile, bbox=None, rotated=False):
     """
-    Convert the postscript to encapsulated postscript.
+    Convert the postscript to encapsulated postscript.  The bbox of
+    the eps file will be replaced with the given *bbox* argument. If
+    None, original bbox will be used.
     """
 
     # if rotated==True, the output eps file need to be rotated
-    bbox_info, rotate = get_bbox_header(bbox, rotated=rotated)
+    if bbox:
+        bbox_info, rotate = get_bbox_header(bbox, rotated=rotated)
+    else:
+        bbox_info, rotate = None, None
 
     epsfile = tmpfile + '.eps'
     epsh = file(epsfile, 'w')
@@ -1507,7 +1525,8 @@ def pstoeps(tmpfile, bbox, rotated=False):
     while line:
         if line.startswith('%!PS'):
             print >>epsh, "%!PS-Adobe-3.0 EPSF-3.0"
-            print >>epsh, bbox_info
+            if bbox:
+                print >>epsh, bbox_info
         elif line.startswith('%%EndComments'):
             epsh.write(line)
             print >>epsh, '%%BeginProlog'
@@ -1522,10 +1541,10 @@ def pstoeps(tmpfile, bbox, rotated=False):
             if rotate:
                 print >>epsh, rotate
             break
-        elif line.startswith('%%Bound') \
-            or line.startswith('%%HiResBound') \
-            or line.startswith('%%DocumentMedia') \
-            or line.startswith('%%Pages'):
+        elif bbox and (line.startswith('%%Bound') \
+                       or line.startswith('%%HiResBound') \
+                       or line.startswith('%%DocumentMedia') \
+                       or line.startswith('%%Pages')):
             pass
         else:
             epsh.write(line)
