prawn 1.0.0.rc1 → 1.0.0.rc2

data/lib/prawn/text/formatted/fragment.rb

@@ -15,34 +15,20 @@ module Prawn
       #
       class Fragment
 
-        attr_reader :format_state
+        attr_reader :format_state, :text
         attr_writer :width
         attr_accessor :line_height, :descender, :ascender
         attr_accessor :word_spacing, :left, :baseline
 
         def initialize(text, format_state, document)
-          @text = text
           @format_state = format_state
           @document = document
           @word_spacing = 0
-        end
 
-        def text
-          string = strip_zero_width_spaces(@text)
-          if exclude_trailing_white_space?
-            string = string.rstrip
-            string = process_soft_hyphens(string)
-          end
-          case direction
-          when :rtl
-            if ruby_18 { true }
-              string.scan(/./mu).reverse.join
-            else
-              string.reverse
-            end
-          else
-            string
-          end
+          # keep the original value of "text", so we can reinitialize @text if formatting parameters
+          #   like text direction are changed
+          @original_text = text
+          @text = process_text(@original_text)
         end
 
         def width
@@ -127,16 +113,19 @@ module Prawn
         end
 
         def default_direction=(direction)
-          @format_state[:direction] = direction unless @format_state[:direction]
+          unless @format_state[:direction]
+            @format_state[:direction] = direction
+            @text = process_text(@original_text)
+          end
         end
 
         def include_trailing_white_space!
           @format_state.delete(:exclude_trailing_white_space)
+          @text = process_text(@original_text)
         end
 
         def space_count
-          string = exclude_trailing_white_space? ? @text.rstrip : @text
-          string.count(" ")
+          @text.count(" ")
         end
 
         def callback_objects
@@ -212,6 +201,23 @@ module Prawn
 
         private
 
+        def process_text(text)
+          string = strip_zero_width_spaces(text)
+          if exclude_trailing_white_space?
+            string = process_soft_hyphens(string.rstrip)
+          end
+          case direction
+          when :rtl
+            if ruby_18 { true }
+              string.scan(/./mu).reverse.join
+            else
+              string.reverse
+            end
+          else
+            string
+          end
+        end
+
         def exclude_trailing_white_space?
           @format_state[:exclude_trailing_white_space]
         end
@@ -222,6 +228,11 @@ module Prawn
 
         def process_soft_hyphens(string)
           if string.length > 0 && normalized_soft_hyphen
+            ruby_19 {
+              if string.encoding != normalized_soft_hyphen.encoding
+                string.force_encoding(normalized_soft_hyphen.encoding)
+              end
+            }
             string[0..-2].gsub(normalized_soft_hyphen, "") + string[-1..-1]
           else
             string

data/lib/prawn/text/formatted/parser.rb

@@ -14,7 +14,7 @@ module Prawn
 
       class Parser
 
-        def self.to_array(string)
+        PARSER_REGEX = begin
           regex_string = "\n|" +
                          "<b>|</b>|" +
                          "<i>|</i>|" +
@@ -30,7 +30,10 @@ module Prawn
                          "<a[^>]*>|</a>|" +
                          "[^<\n]+"
           regex = Regexp.new(regex_string, Regexp::MULTILINE)
-          tokens = string.gsub(/<br\s*\/?>/, "\n").scan(regex)
+        end
+
+        def self.to_array(string)
+          tokens = string.gsub(/<br\s*\/?>/, "\n").scan(PARSER_REGEX)
           self.array_from_tokens(tokens)
         end
 

data/lib/prawn/utilities.rb

@@ -0,0 +1,44 @@
+# encoding: utf-8
+
+# utilities.rb : General-purpose utility classes which don't fit anywhere else
+#
+# Copyright August 2012, Alex Dowad. All Rights Reserved.
+#
+# This is free software. Please see the LICENSE and COPYING files for details.
+
+require 'thread'
+
+module Prawn
+
+  # Throughout the Prawn codebase, repeated calculations which can benefit from caching are made
+  # In some cases, caching and reusing results can not only save CPU cycles but also greatly
+  #   reduce memory requirements
+  # But at the same time, we don't want to throw away thread safety
+  # We have two interchangeable thread-safe cache implementations:
+
+  class SynchronizedCache
+    # As an optimization, this could access the hash directly on VMs with a global interpreter lock (like MRI)
+    def initialize
+      @cache = {}
+      @mutex = Mutex.new
+    end
+    def [](key)
+      @mutex.synchronize { @cache[key] }
+    end
+    def []=(key,value)
+      @mutex.synchronize { @cache[key] = value }
+    end
+  end
+
+  class ThreadLocalCache
+    def initialize
+      @cache_id = "cache_#{self.object_id}".to_sym
+    end
+    def [](key)
+      (Thread.current[@cache_id] ||= {})[key]
+    end
+    def []=(key,value)
+      (Thread.current[@cache_id] ||= {})[key] = value
+    end
+  end
+end

data/manual/basic_concepts/adding_pages.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+#
+# A PDF document is a collection of pages. When we create a new document be it
+# with <code>Document.new</code> or on a <code>Document.generate</code> block
+# one initial page is created for us.
+#
+# Some methods might create new pages automatically like <code>text</code> which
+# will create a new page whenever the text string cannot fit on the current
+# page.
+#
+# But what if you want to go to the next page by yourself? That is easy.
+#
+# Just use the <code>start_new_page</code> method and a shiny new page will be
+# created for you just like in the following snippet.
+#
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
+
+filename = File.basename(__FILE__).gsub('.rb', '.pdf')
+Prawn::Example.generate(filename) do
+  text "We are still on the initial page for this example. Now I'll ask " +
+       "Prawn to gently start a new page. Please follow me to the next page."
+  
+  start_new_page
+  
+  text "See. We've left the previous page behind."
+end

data/manual/basic_concepts/basic_concepts.rb

@@ -0,0 +1,34 @@
+# encoding: utf-8
+#
+# Examples for Prawn basic concepts.
+#
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
+
+Prawn::Example.generate("basic_concepts.pdf", :page_size => "FOLIO") do
+  
+  package "basic_concepts" do |p|
+    
+    p.example "creation", :eval_source => false, :full_source => true
+    p.example "origin"
+    p.example "cursor"
+    p.example "other_cursor_helpers"
+    p.example "adding_pages"
+    p.example "measurement"
+    
+    p.intro do
+      prose("This chapter covers the minimum amount of functionality you'll need to start using Prawn.
+
+      If you are new to Prawn this is the first chapter to read. Once you are comfortable with the concepts shown here you might want to check the Basics section of the Graphics, Bounding Box and Text sections.
+
+      The examples show:")
+
+      list( "How to create new pdf documents in every possible way",
+            "Where the origin for the document coordinates is. What are Bounding Boxes and how they interact with the origin",
+            "How the cursor behaves",
+            "How to start new pages",
+            "What the base unit for measurement and coordinates is and how to use other convenient measures"
+          )
+    end
+  end
+end

data/manual/basic_concepts/creation.rb

@@ -0,0 +1,39 @@
+# encoding: utf-8
+#
+# There are three ways to create a PDF Document in Prawn: creating a new
+# <code>Prawn::Document</code> instance, or using the
+# <code>Prawn::Document.generate</code> method with and without block arguments.
+#
+# The following snippet showcase each way by creating a simple document with
+# some text drawn.
+#
+# When we instantiate the <code>Prawn::Document</code> object the actual pdf
+# document will only be created after we call <code>render_file</code>.
+#
+# The generate method will render the actual pdf object after exiting the block.
+# When we use it without a block argument the provided block is evaluated in the
+# context of a newly created <code>Prawn::Document</code> instance. When we use
+# it with a block argument a <code>Prawn::Document</code> instance is created
+# and passed to the block.
+#
+# The generate method without block arguments requires
+# less typing and defines and renders the pdf document in one shot.
+# Almost all of the examples are coded this way.
+#
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
+
+# Assignment
+pdf = Prawn::Document.new
+pdf.text "Hello World"
+pdf.render_file "assignment.pdf"
+
+# Implicit Block
+Prawn::Document.generate("implicit.pdf") do
+  text "Hello World"
+end
+
+# Explicit Block
+Prawn::Document.generate("explicit.pdf") do |pdf|
+  pdf.text "Hello World"
+end

data/manual/basic_concepts/cursor.rb

@@ -0,0 +1,33 @@
+# encoding: utf-8
+#
+# We normally write our documents from top to bottom and it is no different with
+# Prawn. Even if the origin is on the bottom left corner we still fill the page
+# from the top to the bottom. In other words the cursor for inserting content
+# starts on the top of the page.
+#
+# Most of the functions that insert content on the page will start at the
+# current cursor position and proceed to the bottom of the page.
+#
+# The following snippet shows how the cursor behaves when we add some text to
+# the page and demonstrates some of the helpers to manage the cursor position.
+# The <code>cursor</code> method returns the current cursor position.
+#
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
+
+filename = File.basename(__FILE__).gsub('.rb', '.pdf')
+Prawn::Example.generate(filename) do
+  stroke_axis
+  
+  text "the cursor is here: #{cursor}"
+  text "now it is here: #{cursor}"
+  
+  move_down 200
+  text "on the first move the cursor went down to: #{cursor}"
+  
+  move_up 100
+  text "on the second move the cursor went up to: #{cursor}"
+  
+  move_cursor_to 50
+  text "on the last move the cursor went directly to: #{cursor}"
+end

data/manual/basic_concepts/measurement.rb

@@ -0,0 +1,25 @@
+# encoding: utf-8
+#
+# The base unit in Prawn is the PDF Point. One PDF Point is equal to 1/72 of
+# an inch.
+#
+# There is no need to waste time converting this measures. Prawn provides
+# helpers for converting from other measurements
+# to PDF Points.
+#
+# Just <code>require "prawn/measurement_extensions"</code> and it will mix some
+# helpers onto <code>Numeric</code> for converting common measurement units to
+# PDF Points.
+#
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
+
+filename = File.basename(__FILE__).gsub('.rb', '.pdf')
+Prawn::Example.generate(filename) do
+  require "prawn/measurement_extensions"
+  
+  [:mm, :cm, :dm, :m, :in, :yd, :ft].each do |measurement|
+    text "1 #{measurement} in PDF Points: #{1.send(measurement)} pt"
+    move_down 5.mm
+  end
+end

data/manual/basic_concepts/origin.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+#
+# This is the most important concept you need to learn about Prawn:
+#
+# PDF documents have the origin <code>[0,0]</code> at the bottom-left corner of
+# the page.
+#
+# A bounding box is a structure which provides boundaries for inserting content.
+# A bounding box also has the property of relocating the origin to its relative
+# bottom-left corner. However, be aware that the location specified when
+# creating a bounding box is its top-left corner, not bottom-left (hence the
+# <code>[100, 300]</code> coordinates below).
+#
+# Even if you never create a bounding box explictly, each document already comes
+# with one called the margin box. This initial bounding box is the one
+# responsible for the document margins.
+#
+# So practically speaking the origin of a page on a default generated document
+# isn't the absolute bottom left corner but the bottom left corner of the margin
+# box.
+#
+# The following snippet strokes a circle on the margin box origin. Then strokes
+# the boundaries of a bounding box and a circle on its origin.
+#
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
+
+filename = File.basename(__FILE__).gsub('.rb', '.pdf')
+Prawn::Example.generate(filename) do
+  stroke_axis
+  
+  stroke_circle [0, 0], 10
+  
+  bounding_box([100, 300], :width => 300, :height => 200) do
+    stroke_bounds
+    stroke_circle [0, 0], 10
+  end
+end

data/manual/basic_concepts/other_cursor_helpers.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+#
+# Another group of helpers for changing the cursor position are the pad methods.
+# They accept a numeric value and a block. <code>pad</code> will use the numeric
+# value to move the cursor down both before and after the block content.
+# <code>pad_top</code> will only move the cursor before the block while
+# <code>pad_bottom</code> will only move after.
+#
+# <code>float</code> is a method for not changing the cursor. Pass it a block
+# and the cursor will remain on the same place when the block returns.
+#
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
+
+filename = File.basename(__FILE__).gsub('.rb', '.pdf')
+Prawn::Example.generate(filename) do
+  stroke_horizontal_rule
+  pad(20) { text "Text padded both before and after." }
+  
+  stroke_horizontal_rule
+  pad_top(20) { text "Text padded on the top." }
+  
+  stroke_horizontal_rule
+  pad_bottom(20) { text "Text padded on the bottom." }
+  
+  stroke_horizontal_rule
+  move_down 30
+  
+  text "Text written before the float block."
+  
+  float do
+    move_down 30
+    bounding_box([0, cursor], :width => 200) do
+      text "Text written inside the float block."
+      stroke_bounds
+    end
+  end
+
+  text "Text written after the float block."
+end

data/manual/bounding_box/bounding_box.rb

@@ -0,0 +1,39 @@
+# encoding: utf-8
+#
+# Examples for bounding boxes.
+#
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
+
+Prawn::Example.generate("bounding_box.pdf", :page_size => "FOLIO") do
+  
+  package "bounding_box" do |p|
+    
+    p.section "Basics" do |s|
+      s.example "creation"
+      s.example "bounds"
+    end
+    
+    p.section "Advanced" do |s|
+      s.example "stretchy"
+      s.example "nesting"
+      s.example "indentation"
+      s.example "canvas"
+      s.example "russian_boxes"
+    end
+    
+    p.intro do
+      prose("Bounding boxes are the basic containers for structuring the content flow. Even being low level building blocks sometimes their simplicity is very welcome.
+
+      The examples show:")
+
+      list( "How to create bounding boxes with specific dimensions",
+            "How to inspect the current bounding box for its coordinates",
+            "Stretchy bounding boxes",
+            "Nested bounding boxes",
+            "Indent blocks"
+          )
+    end
+    
+  end
+end