0
@@ -83,21 +83,15 @@ module Prawn
0
     # Of course, if you use canvas, you will be responsible for ensuring that
0
     # you remain within the printable area of your document.
0
     #
0
-    def bounding_box(*args, &block)
0
-      parent_box = @bounding_box
0
-      
0
-      # Offset to relative positions
0
-      top_left = args[0]
0
-      top_left[0] += parent_box.absolute_left
0
-      top_left[1] += parent_box.absolute_bottom
0
+    def bounding_box(*args, &block)    
0
+      init_bounding_box(block) do |parent_box|
0
+        # Offset to relative positions
0
+        top_left = args[0]
0
+        top_left[0] += parent_box.absolute_left
0
+        top_left[1] += parent_box.absolute_bottom
0
 
0
-      @bounding_box = BoundingBox.new(self, *args)
0
-      self.y = @bounding_box.absolute_top
0
-     
0
-      block.call
0
-      
0
-      self.y = @bounding_box.absolute_bottom
0
-      @bounding_box = parent_box
0
+        @bounding_box = BoundingBox.new(self, *args)   
0
+      end
0
     end
0
 
0
     # A shortcut to produce a bounding box which is mapped to the document's
0
@@ -107,21 +101,29 @@ module Prawn
0
     #     pdf.line pdf.bounds.bottom_left, pdf.bounds.top_right
0
     #   end
0
     #
0
-    def canvas(&block)
0
-      parent_box = @bounding_box
0
-      @bounding_box = BoundingBox.new(self, [0,page_dimensions[3]], 
0
-        :width => page_dimensions[2], 
0
-        :height => page_dimensions[3] 
0
-      )
0
+    def canvas(&block)     
0
+      init_bounding_box(block) do |_|
0
+        @bounding_box = BoundingBox.new(self, [0,page_dimensions[3]], 
0
+          :width => page_dimensions[2], 
0
+          :height => page_dimensions[3] 
0
+        ) 
0
+      end
0
+    end      
0
+    
0
+    private
0
+    
0
+    def init_bounding_box(user_block, &init_block)
0
+      parent_box = @bounding_box       
0
 
0
-      self.y = @bounding_box.absolute_top
0
+      init_block.call(parent_box)     
0
 
0
-      block.call
0
+      self.y = @bounding_box.absolute_top       
0
+      user_block.call   
0
+      self.y = @bounding_box.absolute_bottom 
0
 
0
-      self.y = @bounding_box.absolute_bottom
0
-      @bounding_box = parent_box
0
+      @bounding_box = parent_box 
0
     end
0
-    
0
+       
0
     class BoundingBox
0
       
0
       def initialize(parent, point, options={}) #:nodoc: