examples/example_helper.rb @@ -3,8 +3,7 @@ # This example demonstrates the basic functionality of Prawn's bounding boxes. # Note that top level bounding boxes are positioned relative to the margin_box. # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require 'prawn/core' +require "#{File.dirname(__FILE__)}/../example_helper.rb" Prawn::Document.generate("bounding_boxes.pdf") do examples/bounding_box/bounding_boxes.rb @@ -3,8 +3,7 @@ # This example demonstrates the basic functionality of Prawn's bounding boxes. # Note that top level bounding boxes are positioned relative to the margin_box. # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require 'prawn/core' +require "#{File.dirname(__FILE__)}/../example_helper.rb" Prawn::Document.generate("indentation.pdf") do examples/bounding_box/indentation.rb @@ -4,8 +4,7 @@ # can simplify calculations. See the other files in examples/bounding_box # for more basic uses. -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require 'prawn/core' +require "#{File.dirname(__FILE__)}/../example_helper.rb" class Array def combine(arr) examples/bounding_box/russian_boxes.rb @@ -2,8 +2,7 @@ # # Text should flow between columns before wrapping to the next page, like a printed newspaper. # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" paragraphs = [] paragraphs << <<-ONE examples/column_box/column_box_example.rb @@ -4,8 +4,7 @@ # generating a new Document. Image is assumed to be pre-fit for your page # size, and will not be rescaled. # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" img = "#{Prawn::BASEDIR}/data/images/letterhead.jpg" @@ -15,10 +14,10 @@ Prawn::Document.generate("background.pdf", :background => img) do move_down font.height * 2 text "Here is my text explaning this report. " * 20, - :size => 12, :align => :left, :spacing => 2 + :size => 12, :align => :left, :leading => 2 move_down font.height text "I'm using a soft background. " * 40, - :size => 12, :align => :left, :spacing => 2 + :size => 12, :align => :left, :leading => 2 end examples/general/background.rb @@ -3,8 +3,7 @@ # Demonstrates how to enable absolute positioning in Prawn by temporarily # removing the margin_box via Document#canvas() # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" Prawn::Document.generate("canvas.pdf") do canvas do examples/general/canvas.rb @@ -5,8 +5,7 @@ # its particular implementation, though some might find that interesting as # well. # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" require "prawn/measurement_extensions" examples/general/measurement_units.rb @@ -3,8 +3,7 @@ # Demonstrates how to set metadata properties via the info option # It allows one to specify no standard properties # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" Prawn::Document.generate "metadata-info.pdf", :info => { examples/general/metadata-info.rb @@ -3,8 +3,7 @@ # This demonstrates that Prawn can modify page size, margins and layout for # each individual page, via Document#start_new_page() # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" Prawn::Document.generate("multi-layout.pdf", :page_layout => :landscape) do |pdf| pdf.text "This is on a landscaped page" examples/general/multi_page_layout.rb @@ -4,8 +4,7 @@ # documents. The style used here is a bit out of date, see # multi_page_layout.rb for a more modern example. # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" def pdf(*options) Prawn::Document.new(*options) examples/general/page_geometry.rb @@ -4,8 +4,7 @@ # For positioning images alongside flowing text, see the image_flow.rb # example. # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" Prawn::Document.generate("basic_images.pdf", :page_layout => :landscape) do stef = "#{Prawn::BASEDIR}/data/images/stef.jpg" examples/graphics/basic_images.rb @@ -2,8 +2,7 @@ # # Demonstrates Prawn's support for CMYK images and colors. # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" Prawn::Document.generate("cmyk.pdf", :page_layout => :landscape) do fill_color 50, 100, 0, 0 examples/graphics/cmyk.rb @@ -2,8 +2,7 @@ # # Demonstrates simple curve and circle usage # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" pdf = Prawn::Document.new pdf.move_to [100,100] examples/graphics/curves.rb @@ -2,8 +2,7 @@ # # Draws and fills a Hexagon using Document#polygon # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" pdf = Prawn::Document.new examples/graphics/hexagon.rb @@ -4,8 +4,7 @@ # The image will be scaled down to fit within the box, while preserving # the aspect ratio. # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" Prawn::Document.generate("image_fit.pdf", :page_layout => :landscape) do examples/graphics/image_fit.rb @@ -5,8 +5,7 @@ # useful when used in combination with flowing text, where the exact final # position of the image is not known ahead of time. # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" Prawn::Document.generate("image-flow.pdf", :page_layout => :landscape) do self.font_size = 8 examples/graphics/image_flow.rb @@ -2,8 +2,7 @@ # # Demonstrates vertical and horizontal positioning of images. # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" Prawn::Document.generate("image_position.pdf", :page_layout => :landscape) do examples/graphics/image_position.rb @@ -2,8 +2,7 @@ # # The very first Prawn example. Here for nostalgia's sake. # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" pdf = Prawn::Document.new pdf.line_width = 10 examples/graphics/line.rb @@ -3,8 +3,7 @@ # PNG files come in different flavours - 5 of them. This example embeds # one of each type as proof that they all work. # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" images = [ ["Type 0", "#{Prawn::BASEDIR}/data/images/web-links.png"], examples/graphics/png_types.rb @@ -2,8 +2,7 @@ # # Basic polygon drawing example. See also: hexagon.rb # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" pdf = Prawn::Document.new examples/graphics/polygons.rb @@ -3,8 +3,8 @@ # Demonstrates how to use open-uri and Document#image to embed remote image # files. # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" + require "open-uri" Prawn::Document.generate("remote_images.pdf") do examples/graphics/remote_images.rb @@ -3,8 +3,7 @@ # These helpers will be familiar to Ruport users, and now are supported # directly in Prawn. Run the example to see how they work. # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" # Demonstrates some features stolen from Ruport::Formatter::PDF Prawn::Document.generate("ruport.pdf") do examples/graphics/ruport_style_helpers.rb @@ -8,8 +8,7 @@ # Feature borrowed from Josh Knowle's pt at: # http://github.com/joshknowles/pt/tree/master # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require 'prawn/core' +require "#{File.dirname(__FILE__)}/../example_helper.rb" Prawn::Document.generate("stroke_bounds.pdf") do stroke_bounds examples/graphics/stroke_bounds.rb @@ -3,8 +3,7 @@ # Some text is not usefully wrapped by our naive_wrap which depends on # spaces. This example shows how to wrap by character instead. # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" start = Time.now Prawn::Document.generate("chinese_flow.pdf") do examples/m17n/chinese_text_wrapping.rb @@ -8,8 +8,7 @@ # If you need precision spacing, use a TTF file instead and the issue will # go away. # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" Prawn::Document.generate "euro.pdf" do text "A Euro! € ©", :size => 32 examples/m17n/euro.rb @@ -10,8 +10,7 @@ # font to include japanese glyphs. On 1.8.x comaptible VMs, an exception # will be raised. -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" begin ruby_19 do examples/m17n/sjis.rb @@ -3,8 +3,7 @@ # Shows that Prawn works out of the box with UTF-8 text, so long as you use # a TTF file with the necessary glyphs for your content. # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" Prawn::Document.generate("utf8.pdf") do font "#{Prawn::BASEDIR}/data/fonts/DejaVuSans.ttf" examples/m17n/utf8.rb @@ -4,8 +4,7 @@ # in fonts, along with their character widths and WinAnsi codes. Be sure # to pass these glyphs as UTF-8, and Prawn will transcode them for you. # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require 'prawn/core' +require "#{File.dirname(__FILE__)}/../example_helper.rb" FONT_SIZE = 9.5 examples/m17n/win_ansi_charset.rb @@ -3,8 +3,7 @@ # This example demonstrates usage of Document#text with the :align option. # Available options are :left, :right, and :center, with :left as default. # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" Prawn::Document.generate("alignment.pdf") do text "This text should be left aligned" examples/text/alignment.rb @@ -1,7 +1,6 @@ # encoding: utf-8 -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" DFONT_FILE = "#{Prawn::BASEDIR}/data/fonts/Action Man.dfont" puts "There are #{Prawn::Font::DFont.font_count(DFONT_FILE)} fonts in #{DFONT_FILE}:" examples/text/dfont.rb @@ -4,8 +4,7 @@ # 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. # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" Prawn::Document.generate("family_style.pdf") do ["Courier","Helvetica","Times-Roman"].each do |f| examples/text/family_based_styling.rb @@ -4,8 +4,7 @@ # meant to assist those that need to do advanced positioning calculations. # Run the example for a clearer picture of how things work # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require 'prawn/core' +require "#{File.dirname(__FILE__)}/../example_helper.rb" Prawn::Document.generate('font_calculations.pdf') do examples/text/font_calculations.rb @@ -2,8 +2,7 @@ # # This example shows the many ways of setting font sizes in Prawn # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" Prawn::Document.generate "font_size.pdf", :page_size => "A4" do examples/text/font_size.rb @@ -2,8 +2,7 @@ # # Demonstration of enabling and disabling kerning support # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" Prawn::Document.generate "kerning.pdf" do text "To kern?", :at => [200,720], :size => 24, :kerning => true examples/text/kerning.rb @@ -3,8 +3,7 @@ # An early example of basic text generation at absolute positions. # Mostly kept for nostalgia. # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" Prawn::Document.generate "simple_text.pdf" do fill_color "0000ff" examples/text/simple_text.rb @@ -2,8 +2,7 @@ # # An early example of TTF font embedding. Mostly kept for nostalgia's sake. # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" Prawn::Document.generate "simple_text_ttf.pdf" do fill_color "0000ff" examples/text/simple_text_ttf.rb @@ -3,8 +3,7 @@ # Demonstration of Document#span, which is used for generating flowing # columns of text. # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" Prawn::Document.generate("span.pdf") do examples/text/span.rb @@ -5,8 +5,7 @@ # text exceeds the boundaries, it is either truncated, replaced with some # ellipses, or set to expand beyond the bottom boundary. # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require 'prawn/core' +require "#{File.dirname(__FILE__)}/../example_helper.rb" Prawn::Document.generate("text_box.pdf") do examples/text/text_box.rb @@ -3,8 +3,7 @@ # Basic text flowing example including the use of bounding boxes. A somewhat # old example, mostly retained for nostalgia. # -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib')) -require "prawn/core" +require "#{File.dirname(__FILE__)}/../example_helper.rb" content = <<-EOS How does @@ -60,7 +59,7 @@ Prawn::Document.generate("flow.pdf") do |pdf| pdf.bounding_box([100,450], :width => 300) do pdf.stroke_line [pdf.bounds.left, pdf.bounds.top], [pdf.bounds.right, pdf.bounds.top] - pdf.text poem, :size => 10, :spacing => 5 + pdf.text poem, :size => 10, :leading => 5 end pdf.text "And this text automatically goes below the poem", :size => 18 examples/text/text_flow.rb @@ -94,7 +94,7 @@ module Prawn def process_text_options(options) Prawn.verify_options [:style, :kerning, :size, :at, :wrap, - :spacing, :align, :rotate, :final_gap ], options + :leading, :align, :rotate, :final_gap ], options if options[:style] raise "Bad font family" unless font.family @@ -145,7 +145,7 @@ module Prawn if i < last_gap_before move_text_position(font.line_gap - font.descender) - move_text_position(options[:spacing]) if options[:spacing] + move_text_position(options[:leading]) if options[:leading] end end end lib/prawn/document/text.rb 9ce5b87673e8a5bc19c6f8330b3c19c952298d6a Gregory Brown gregory.t.brown@gmail.com http://github.com/sandal/prawn/commit/3f99ef7f2e438bc1103546a7a7a6d10459bb8cc6 3f99ef7f2e438bc1103546a7a7a6d10459bb8cc6 2009-07-19T12:38:09-07:00 2009-07-19T12:37:12-07:00 Change text :spacing to :leading, and pay some tech debt w. the way example boilerplate is handled. (closes #5) 7818b19205efe170a71836a244e16fb7ded35ad6 Gregory Brown gregory.t.brown@gmail.com