prawn 0.11.1.pre → 0.11.1

data/examples/table/multi_page_table.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 #
-require "#{File.dirname(__FILE__)}/../example_helper.rb"
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
 
 Prawn::Document.generate("multi_page_table.pdf") do
 

data/examples/table/simple_table.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 #
-require "#{File.dirname(__FILE__)}/../example_helper.rb"
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
  
 Prawn::Document.generate("simple_table.pdf") do 
 

data/examples/table/subtable.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 #
-require "#{File.dirname(__FILE__)}/../example_helper.rb"
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
  
 Prawn::Document.generate("subtable.pdf") do |pdf|
   

data/examples/table/widths.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 #
-require "#{File.dirname(__FILE__)}/../example_helper.rb"
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
  
 Prawn::Document.generate("widths.pdf") do 
 

data/examples/text/alignment.rb

@@ -3,7 +3,8 @@
 # This example demonstrates usage of Document#text with the :align option.
 # Available options are :left, :right, and :center, with :left as default.
 #
-require "#{File.dirname(__FILE__)}/../example_helper.rb"
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
 
 Prawn::Document.generate("alignment.pdf") do
   text "This text should be left aligned"

data/examples/text/character_spacing.rb

@@ -3,7 +3,8 @@
 # Example of character spacing
 #
 #
-require "#{File.dirname(__FILE__)}/../example_helper.rb"
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
 
 Prawn::Document.generate "character_spacing.pdf" do |pdf|
   string = "hello world " * 50

data/examples/text/dfont.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
-require "#{File.dirname(__FILE__)}/../example_helper.rb"
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
 
 DFONT_FILE = "#{Prawn::BASEDIR}/data/fonts/Action Man.dfont"
 puts "There are #{Prawn::Font::DFont.font_count(DFONT_FILE)} fonts in #{DFONT_FILE}:"

data/examples/text/family_based_styling.rb

@@ -4,7 +4,8 @@
 # If you are working with TTF fonts, you'll want to check out the 
 # documentation for Document#font_families and register your fonts with it.
 #
-require "#{File.dirname(__FILE__)}/../example_helper.rb"
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
 
 Prawn::Document.generate("family_style.pdf") do
   ["Courier","Helvetica","Times-Roman"].each do |f|
@@ -21,4 +22,4 @@ Prawn::Document.generate("family_style.pdf") do
   text "Bold Italic", :style => :bold_italic
   text "Italic",      :style => :italic
   text "Normal"
-end
+end

data/examples/text/font_calculations.rb

@@ -4,7 +4,8 @@
 # meant to assist those that need to do advanced positioning calculations.
 # Run the example for a clearer picture of how things work
 #
-require "#{File.dirname(__FILE__)}/../example_helper.rb"
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
 
 Prawn::Document.generate('font_calculations.pdf') do
   

data/examples/text/font_size.rb

@@ -2,7 +2,8 @@
 #
 # This example shows the many ways of setting font sizes in Prawn
 #
-require "#{File.dirname(__FILE__)}/../example_helper.rb"
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
 
 Prawn::Document.generate "font_size.pdf", :page_size => "A4" do
 

data/examples/text/hyphenation.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
 #
 
-require 'examples/example_helper'
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
 
 Prawn::Document.generate("hyphenation.pdf") do
   def get_string(i)
@@ -18,7 +19,6 @@ Prawn::Document.generate("hyphenation.pdf") do
   options = {
     :width    => bounds.width * 0.3,
     :height   => bounds.width * 0.3,
-    :overflow => :ellipses,
     :at       => [0, 0],
     :align    => :left,
     :document => self

data/examples/text/indent_paragraphs.rb

@@ -3,20 +3,22 @@
 # Example of two ways of indenting paragraphs
 #
 #
-require "#{File.dirname(__FILE__)}/../example_helper.rb"
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
 
 Prawn::Document.generate "indent_paragraphs.pdf" do |pdf|
   hello = "hello " * 50
   world = "world " * 50
-  pdf.text(hello + "\n" + world, :indent_paragraphs => 60)
+  string = hello + "©\n" + world + "©"
+  pdf.text(string, :indent_paragraphs => 60, :align => :justify)
 
   pdf.move_cursor_to(pdf.font.height)
-  pdf.text(hello + "\n" + world, :indent_paragraphs => 60)
+  pdf.text(string, :indent_paragraphs => 60, :align => :justify)
 
   pdf.move_cursor_to(pdf.font.height * 3)
-  pdf.text(hello + "\n" + world, :indent_paragraphs => 60)
+  pdf.text(string, :indent_paragraphs => 60, :align => :justify)
 
   # can also indent using a non-breaking space
   nbsp = Prawn::Text::NBSP
-  pdf.text("\n" * 10 + hello + "\n#{nbsp * 10}" + world)
+  pdf.text("\n\n\n\n#{nbsp * 10}" + hello + "\n#{nbsp * 10}" + world, :align => :justify)
 end

data/examples/text/inline_format.rb

@@ -2,7 +2,8 @@
 #
 # This example shows how to use inline formatting
 #
-require "#{File.dirname(__FILE__)}/../example_helper.rb"
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
 
 Prawn::Document.generate("inline_format.pdf") do |pdf|
   
@@ -13,7 +14,7 @@ Prawn::Document.generate("inline_format.pdf") do |pdf|
   pdf.text("right: " + "hello <b>world how <i>are</i></b> you? " * 2,
        :inline_format => true,
        :align => :right)
-  pdf.text("center: " + "hello <b>world how <i>are</i></b> you? " * 2,
+  pdf.text("center: " + "hello <b>world <font size='48'>ho<sub>w</sub> <i>are</i></font></b> you? " * 2,
        :inline_format => true,
        :align => :center)
   pdf.text("\njustify: " + "hello <b>world <i>goodbye</i></b> " * 12 + "the end ",
@@ -78,10 +79,10 @@ Prawn::Document.generate("inline_format.pdf") do |pdf|
         @document.stroke_polygon(fragment.top_left, fragment.top_right,
                                  fragment.bottom_right, fragment.bottom_left)
       end
-      @document.stroke_circle_at(fragment.top_left, :radius => @radius)
-      @document.stroke_circle_at(fragment.top_right, :radius => @radius)
-      @document.stroke_circle_at(fragment.bottom_right, :radius => @radius)
-      @document.stroke_circle_at(fragment.bottom_left, :radius => @radius)
+      @document.stroke_circle(fragment.top_left, @radius)
+      @document.stroke_circle(fragment.top_right, @radius)
+      @document.stroke_circle(fragment.bottom_right, @radius)
+      @document.stroke_circle(fragment.bottom_left, @radius)
     end
   end
 

data/examples/text/kerning.rb

@@ -2,7 +2,8 @@
 #
 # Demonstration of enabling and disabling kerning support
 #
-require "#{File.dirname(__FILE__)}/../example_helper.rb"
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
 
 Prawn::Document.generate "kerning.pdf" do
   draw_text "To kern?", :at => [200,720], :size => 24, :kerning => true

data/examples/text/rendering_mode.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+#
+# Example of character spacing
+#
+#
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
+
+Prawn::Document.generate "rendering_mode.pdf" do |pdf|
+  pdf.fill_color "00ff00"
+  pdf.stroke_color "0000ff"
+
+  # inline rendering mode
+  pdf.text("Inline mode", :mode => :stroke, :size => 40)
+
+  # block rendering mode
+  pdf.text_rendering_mode(:stroke) do
+    pdf.text("Block", :size => 30)
+    pdf.text("Mode", :size => 30)
+  end
+end

data/examples/text/rotated.rb

@@ -2,7 +2,8 @@
 #
 # Demonstrates transformations
 #
-require "#{File.dirname(__FILE__)}/../example_helper.rb"
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
 
 Prawn::Document.generate "rotated_text.pdf" do |pdf|
   pdf.line_width = 1

data/examples/text/shaped_text_box.rb

@@ -2,7 +2,8 @@
 #
 # Demonstrates extending Text::Box
 #
-require "#{File.dirname(__FILE__)}/../example_helper.rb"
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
 
 Prawn::Document.generate "shaped_text_box.pdf" do |pdf|
   module ShapedBox

data/examples/text/simple_text.rb

@@ -3,7 +3,8 @@
 # An early example of basic text generation at absolute positions.
 # Mostly kept for nostalgia.
 #
-require "#{File.dirname(__FILE__)}/../example_helper.rb"
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
 
 Prawn::Document.generate "simple_text.pdf" do       
   fill_color "0000ff"

data/examples/text/simple_text_ttf.rb

@@ -2,7 +2,8 @@
 #
 # An early example of TTF font embedding.  Mostly kept for nostalgia's sake.
 #
-require "#{File.dirname(__FILE__)}/../example_helper.rb"
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
 
 Prawn::Document.generate "simple_text_ttf.pdf" do       
   fill_color "0000ff"

data/examples/text/span.rb

@@ -3,7 +3,8 @@
 # Demonstration of Document#span, which is used for generating flowing
 # columns of text.
 #
-require "#{File.dirname(__FILE__)}/../example_helper.rb"
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
 
 Prawn::Document.generate("span.pdf") do
   
@@ -26,4 +27,4 @@ Prawn::Document.generate("span.pdf") do
       text "The rain in spain falls mainly on the plains. " * 300
     end
   end
-end
+end

data/examples/text/text_box.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
 #
 
-require 'examples/example_helper'
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
 
 Prawn::Document.generate("text_box.pdf") do
   def get_string(i, j)      
@@ -31,7 +32,6 @@ Prawn::Document.generate("text_box.pdf") do
     options = {
       :width    => bounds.width * 0.3,
       :height   => bounds.width * 0.3,
-      :overflow => :ellipses,
       :at       => [0, 0],
       :align    => :left,
       :document => self
@@ -66,21 +66,23 @@ Prawn::Document.generate("text_box.pdf") do
       options[:at][1] = bounds.top - (bounds.height - options[:height]) * 0.33 * j
       box = Prawn::Text::Box.new(get_string(i, j), options)
 
-      fill_color("ffeeee")
-      if i == 1
+      if j >= 2
         # bound with a box of a particular size, regardless of how
         # much text it contains
+        fill_color("ffeeee")
         fill_and_stroke_rectangle(options[:at],
                                   options[:width],
                                   options[:height])
       else
         # bound with a box that exactly fits the printed text using
         # dry_run look-ahead
+        fill_color("eeeeff")
         box.render(:dry_run => true)
-        fill_and_stroke_rectangle(options[:at],
+        fill_and_stroke_rectangle(box.at,
                                   options[:width],
                                   box.height)
       end
+
       fill_color("000000")
       box.render
     end

data/examples/text/text_box_returning_excess.rb

@@ -2,10 +2,11 @@
 #
 # A text box is positioned by a top-left corner, width, and height and is
 # essentially an invisible rectangle that the text will flow within.  If the
-# text exceeds the boundaries, it is either truncated, replaced with some
-# ellipses, or set to expand beyond the bottom boundary.
+# text exceeds the boundaries, it is either truncated, shrunk-to-fit, or set
+# to expand beyond the bottom boundary.
 #
-require "#{File.dirname(__FILE__)}/../example_helper.rb"
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
 
 Prawn::Document.generate("text_box_returning_excess.pdf") do
 

data/examples/text/text_flow.rb

@@ -3,7 +3,8 @@
 # Basic text flowing example including the use of bounding boxes.  A somewhat
 # old example, mostly retained for nostalgia.
 #
-require "#{File.dirname(__FILE__)}/../example_helper.rb"
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
 
 content = <<-EOS
 How does

data/lib/prawn.rb

@@ -5,7 +5,7 @@
 # into the lib/prawn/core/* source tree.
 #
 module Prawn #:nodoc:
-  VERSION = "0.11.1.pre"
+  VERSION = "0.11.1"
 end
 
 require "prawn/core"

data/lib/prawn/core/object_store.rb

@@ -129,6 +129,37 @@ module Prawn
         flat_page_ids[k]
       end
 
+      # imports all objects required to render a page from another PDF. The
+      # objects are added to the current object store, but NOT linked
+      # anywhere.
+      #
+      # The object ID of the root Page object is returned, it's up to the
+      # calling code to link that into the document structure somewhere. If
+      # this isn't done the imported objects will just be removed when the
+      # store is compacted.
+      #
+      # Imports nothing and returns nil if the requested page number doesn't
+      # exist. page_num is 1 indexed, so 1 indicates the first page.
+      #
+      def import_page(filename, page_num)
+        @loaded_objects = {}
+        unless File.file?(filename)
+          raise ArgumentError, "#{filename} does not exist"
+        end
+
+        hash = PDF::Reader::ObjectHash.new(filename)
+        ref  = hash.page_references[page_num - 1]
+
+        ref.nil? ? nil : load_object_graph(hash, ref).identifier
+
+      rescue PDF::Reader::MalformedPDFError, PDF::Reader::InvalidObjectError
+        msg = "Error reading template file. If you are sure it's a valid PDF, it may be a bug."
+        raise Prawn::Errors::TemplateError, msg
+      rescue PDF::Reader::UnsupportedFeatureError
+        msg = "Template file contains unsupported PDF features"
+        raise Prawn::Errors::TemplateError, msg
+      end
+
       private
 
       # returns a nested array of object IDs for all pages in this object store.
@@ -143,19 +174,16 @@ module Prawn
 
       # takes a source PDF and uses it as a template for this document.
       #
-      def load_file(filename)
-        unless File.file?(filename)
-          raise ArgumentError, "#{filename} does not exist"
-        end
-
-        unless PDF.const_defined?("Hash")
-          raise "PDF::Hash not found. Is PDF::Reader > 0.8?"
+      def load_file(template)
+        unless (template.respond_to?(:seek) && template.respond_to?(:read)) ||
+               File.file?(template)
+          raise ArgumentError, "#{template} does not exist"
         end
 
-        hash = PDF::Hash.new(filename)
+        hash = PDF::Reader::ObjectHash.new(template)
         src_info = hash.trailer[:Info]
         src_root = hash.trailer[:Root]
-        @min_version = hash.version.to_f
+        @min_version = hash.pdf_version.to_f
 
         if hash.trailer[:Encrypt]
           msg = "Template file is an encrypted PDF, it can't be used as a template"
@@ -177,16 +205,16 @@ module Prawn
         raise Prawn::Errors::TemplateError, msg
       end
 
-      # recurse down an object graph from a source PDF, importing all the indirect
-      # objects we find.
+      # recurse down an object graph from a source PDF, importing all the
+      # indirect objects we find.
       #
-      # hash is the PDF::Hash to extract objects from, object is the object to
-      # extract.
+      # hash is the PDF::Reader::ObjectHash to extract objects from, object is
+      # the object to extract.
       #
       def load_object_graph(hash, object)
         @loaded_objects ||= {}
         case object
-        when Hash then
+        when ::Hash then
           object.each { |key,value| object[key] = load_object_graph(hash, value) }
           object
         when Array then