@@ -4,7 +4,13 @@ # require "#{File.dirname(__FILE__)}/../example_helper.rb" -LOREM = "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. " * 20 +LOREM = ("Lorem ipsum dolor sit amet, consectetur adipisicing elit, "+ +"sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. "+ +"Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris "+ +"nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in "+ +"reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla "+ +"pariatur. Excepteur sint occaecat cupidatat non proident, sunt in " + +"culpa qui officia deserunt mollit anim id est laborum. ") * 20 Prawn::Document.generate("margin.pdf", :margin => 100) do |pdf| examples/general/margin.rb @@ -171,7 +171,7 @@ module Prawn @text_options = options[:text_options] || {} - apply_margin_option(options) # :margin + apply_margin_option(options) if options[:margin] default_margin = 36 # 0.5 inch @margins = { :left => options[:left_margin] || default_margin, @@ -469,27 +469,11 @@ module Prawn def apply_margin_option(options) # Treat :margin as CSS shorthand with 1-4 values. margin = Array(options[:margin]) - case margin.length - when 4 # top right bottom left - options[:top_margin] ||= margin[0] - options[:right_margin] ||= margin[1] - options[:bottom_margin] ||= margin[2] - options[:left_margin] ||= margin[3] - when 3 # top left+right bottom - options[:top_margin] ||= margin[0] - options[:left_margin] ||= margin[1] - options[:right_margin] ||= margin[1] - options[:bottom_margin] ||= margin[2] - when 2 # top+bottom left+right - options[:top_margin] ||= margin[0] - options[:bottom_margin] ||= margin[0] - options[:left_margin] ||= margin[1] - options[:right_margin] ||= margin[1] - when 1 # top+right+bottom+left - options[:top_margin] ||= margin[0] - options[:right_margin] ||= margin[0] - options[:bottom_margin] ||= margin[0] - options[:left_margin] ||= margin[0] + positions = { 4 => [0,1,2,3], 3 => [0,1,2,1], + 2 => [0,1,0,1], 1 => [0,0,0,0] }[margin.length] + + [:top, :right, :bottom, :left].zip(positions).each do |p,i| + options[:"#{p}_margin"] ||= margin[i] end end lib/prawn/document.rb 2bab3fc76ecdadfae1e858d422530aa10f955f4c Gregory Brown gregory.t.brown@gmail.com http://github.com/sandal/prawn/commit/0b5cd91cbc73f177d11017321f8202dfb705aa53 0b5cd91cbc73f177d11017321f8202dfb705aa53 2009-11-03T10:07:22-08:00 2009-11-03T10:07:22-08:00 Minor cleanup 0ed35e6c99c5dcb996c230eb401ebbabd0d71e17 Gregory Brown gregory.t.brown@gmail.com