prawn 0.11.1 → 0.15.0

data/lib/prawn/document/internals.rb

@@ -7,26 +7,26 @@
 # This is free software. Please see the LICENSE and COPYING files for details.
 
 module Prawn
-  class Document     
-    
+  class Document
+
     # This module exposes a few low-level PDF features for those who want
     # to extend Prawn's core functionality.  If you are not comfortable with
     # low level PDF functionality as defined by Adobe's specification, chances
-    # are you won't need anything you find here.  
+    # are you won't need anything you find here.
     #
-    module Internals    
-      
+    # @private
+    module Internals 
       # Creates a new Prawn::Reference and adds it to the Document's object
-      # list.  The +data+ argument is anything that Prawn::PdfObject() can convert. 
+      # list.  The +data+ argument is anything that Prawn::PdfObject() can convert.
+      #
+      # Returns the identifier which points to the reference in the ObjectStore
       #
-      # Returns the identifier which points to the reference in the ObjectStore   
-      # 
       def ref(data)
         ref!(data).identifier
-      end                                               
+      end
 
       # Like ref, but returns the actual reference instead of its identifier.
-      # 
+      #
       # While you can use this to build up nested references within the object
       # tree, it is recommended to persist only identifiers, and them provide
       # helper methods to look up the actual references in the ObjectStore
@@ -42,21 +42,21 @@ module Prawn
       # of if it's hidden behind a Prawn::Reference, wrap it in deref().
       #
       def deref(obj)
-        obj.is_a?(Prawn::Core::Reference) ? obj.data : obj
+        obj.is_a?(PDF::Core::Reference) ? obj.data : obj
       end
 
       # Appends a raw string to the current page content.
-      #                               
-      #  # Raw line drawing example:           
+      #
+      #  # Raw line drawing example:
       #  x1,y1,x2,y2 = 100,500,300,550
-      #  pdf.add_content("%.3f %.3f m" % [ x1, y1 ])  # move 
+      #  pdf.add_content("%.3f %.3f m" % [ x1, y1 ])  # move
       #  pdf.add_content("%.3f %.3f l" % [ x2, y2 ])  # draw path
-      #  pdf.add_content("S") # stroke                    
+      #  pdf.add_content("S") # stroke
       #
       def add_content(str)
         save_graphics_state if graphic_state.nil?
         state.page.content << str << "\n"
-      end  
+      end
 
       # The Name dictionary (PDF spec 3.6.3) for this document. It is
       # lazily initialized, so that documents that do not need a name
@@ -67,7 +67,7 @@ module Prawn
       end
 
       # Returns true if the Names dictionary is in use for this document.
-      # 
+      #
       def names?
         state.store.root.data[:Names]
       end
@@ -87,8 +87,8 @@ module Prawn
             state.on_page_create_callback = nil
          end
       end
-      
-      private      
+
+      private
 
       # adds a new, empty content stream to each page. Used in templating so
       # that imported content streams can be left pristine
@@ -98,7 +98,9 @@ module Prawn
           go_to_page i
           state.page.new_content_stream
           apply_margin_options(options)
+          generate_margin_box
           use_graphic_settings(options[:template])
+          forget_text_rendering_mode!
         end
       end
 
@@ -155,18 +157,18 @@ module Prawn
       # Write out the PDF Trailer, as per spec 3.4.4
       #
       def render_trailer(output)
-        trailer_hash = {:Size => state.store.size + 1, 
+        trailer_hash = {:Size => state.store.size + 1,
                         :Root => state.store.root,
                         :Info => state.store.info}
         trailer_hash.merge!(state.trailer) if state.trailer
 
         output << "trailer\n"
-        output << Prawn::Core::PdfObject(trailer_hash) << "\n"
-        output << "startxref\n" 
+        output << PDF::Core::PdfObject(trailer_hash) << "\n"
+        output << "startxref\n"
         output << @xref_offset << "\n"
         output << "%%EOF" << "\n"
       end
-                 
+
     end
   end
 end

data/lib/prawn/document/snapshot.rb

@@ -10,8 +10,9 @@ require 'delegate'
 
 module Prawn
   class Document
+    # @private
+    
     module Snapshot
-
       RollbackTransaction = Class.new(StandardError)
 
       # Call this within a +transaction+ block to roll back the transaction and
@@ -27,7 +28,7 @@ module Prawn
       # +rollback+ is called or a RollbackTransaction exception is raised
       # inside the block, all actions taken inside the block will be rolled
       # back (with the exception of y-position, which you must restore
-      # yourself). 
+      # yourself).
       #
       # Returns true on success, or false if the transaction was rolled back.
       #
@@ -41,7 +42,7 @@ module Prawn
       end
 
       private
-      
+
       # Takes a current snapshot of the document's state, sufficient to
       # reconstruct it after it was amended.
       #
@@ -50,11 +51,11 @@ module Prawn
         # monotonically as data is added to the document, so we share that
         # between the old and new copies.
         {:page_content    => state.page.content.deep_copy,
-         :current_page    => state.page.dictionary.deep_copy(share=[:Parent]),
+         :current_page    => state.page.dictionary.deep_copy([:Parent]),
+         :bounds          => bounds.deep_copy,
          :page_number     => page_number,
-         :page_kids       => state.store.pages.data[:Kids].map{|kid| kid.identifier},
-         :dests           => names? && 
-                             Marshal.load(Marshal.dump(names.data[:Dests]))}
+         :page_kids       => state.store.pages.data[:Kids].compact.map{|kid| kid.identifier},
+         :dests           => names? && names.data[:Dests].deep_copy}
       end
 
       # Rolls the page state back to the state of the given snapshot.
@@ -77,8 +78,10 @@ module Prawn
         state.store.pages.data[:Kids] = shot[:page_kids].map{|id| state.store[id]}
         state.store.pages.data[:Count] = shot[:page_kids].size
 
+        self.bounds = BoundingBox.restore_deep_copy(shot[:bounds], self)
+
         if shot[:dests]
-          names.data[:Dests] = shot[:dests] 
+          names.data[:Dests] = shot[:dests]
         end
       end
 

data/lib/prawn/document/span.rb

@@ -8,8 +8,10 @@
 
 module Prawn
   class Document
-    # A span is a special purpose bounding box that allows a column of 
-    # elements to be positioned relative to the margin_box.  
+    # @group Stable API
+
+    # A span is a special purpose bounding box that allows a column of
+    # elements to be positioned relative to the margin_box.
     #
     # Arguments:
     # +width+:: The width of the column in PDF points
@@ -17,23 +19,23 @@ module Prawn
     # Options:
     # <tt>:position</tt>:: One of :left, :center, :right or an x offset
     #
-    # This method is typically used for flowing a column of text from one 
+    # This method is typically used for flowing a column of text from one
     # page to the next.
     #
     #  span(350, :position => :center) do
     #    text "Here's some centered text in a 350 point column. " * 100
     #  end
-    #  
+    #
     def span(width, options={})
       Prawn.verify_options [:position], options
-      original_position = self.y      
-     
+      original_position = self.y
+
       # FIXME: Any way to move this upstream?
       left_boundary = case(options[:position] || :left)
       when :left
         margin_box.absolute_left
       when :center
-        margin_box.absolute_left + margin_box.width / 2.0 - width /2.0
+        margin_box.absolute_left + margin_box.width / 2.0 - width / 2.0
       when :right
         margin_box.absolute_right - width
       when Numeric
@@ -41,15 +43,15 @@ module Prawn
       else
         raise ArgumentError, "Invalid option for :position"
       end
-      
+
       # we need to bust out of whatever nested bounding boxes we're in.
       canvas do
-        bounding_box([left_boundary, 
+        bounding_box([left_boundary,
                       margin_box.absolute_top], :width => width) do
           self.y = original_position
           yield
         end
-      end          
+      end
     end
   end
 end