pdf-wrapper 0.0.5 → 0.0.6

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.0.6 (28th April 2008)w
+- Fix a nasty bug in text layout code
+
 v0.0.5 (27th April 2008)
 - Fix crash when inserting multiple images
 - added PDF::Wrapper#pad
@@ -16,7 +19,7 @@ v0.0.4 (12th March 2008)
 
 v0.0.3 (17th January 2008)
 - added support for repeating elements (like page numbers) via repeating_element
-- Ensured consistent behaviour WRT functions moving the internal cursor 
+- Ensured consistent behaviour WRT functions moving the internal cursor
   - functions that require positioning info (cell, shapes, etc) will not move
     the cursor at all
   - functions where positioning info in optional (text, image, etc), the cursor
@@ -28,7 +31,7 @@ v0.0.3 (17th January 2008)
 
 v0.0.2 (11th January 2008)
 - Added support for a range of extra image formats (jpg, pdf, gif, etc)
-- Various documentation improvements 
+- Various documentation improvements
 - improved the text functions a little, but still lots more to go
 
 v0.0.1 (9th January 2008)

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/testtask'
 require "rake/gempackagetask"
 require 'spec/rake/spectask'
 
-PKG_VERSION = "0.0.5"
+PKG_VERSION = "0.0.6"
 PKG_NAME = "pdf-wrapper"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 

data/lib/pdf/wrapper.rb

@@ -282,7 +282,7 @@ module PDF
       # TODO: add an option to draw a border with rounded corners
 
       options = default_text_options
-      options.merge!({:border => "tblr", :border_width => @default_line_width, :border_color => :black, :fill_color => nil, :padding => 3})
+      options.merge!({:border => "tblr", :border_width => @default_line_width, :border_color => :black,  :fill_color => nil, :padding => 3})
       options.merge!(opts)
       options.assert_valid_keys(default_text_options.keys + [:width, :border, :border_width, :border_color, :fill_color, :padding])
 
@@ -300,7 +300,6 @@ module PDF
 
       # TODO: raise an exception if the box coords or dimensions will place it off the canvas
       rectangle(x,y,w,h, :color => options[:fill_color], :fill_color => options[:fill_color]) if options[:fill_color]
-
       layout = build_pango_layout(str.to_s, textw, options)
 
       set_color(options[:color])
@@ -1037,47 +1036,19 @@ module PDF
       options = {:auto_new_page => true }
       options.merge!(opts)
 
-      # store the starting x and y co-ords. If we start a new page, we'll continue
-      # adding text at the same co-ords
-      orig_x = x
-      orig_y = y
-      # for each line in the layout
-#      layout.alignment = Pango::Layout::ALIGN_RIGHT
-#      layout.lines.each do |line|
-#        #calculate where the next line starts
-#        ink_rect, logical_rect = line.extents
-#        y = y + (logical_rect.height / Pango::SCALE * (3.0/4.0)) + 1
-#        if y >= (orig_y + h)
-#          # our text is using the maximum amount of vertical space we want it to
-#          if options[:auto_new_page]
-#            # create a new page and we can continue adding text
-#            start_new_page
-#            x = orig_x
-#            y = orig_y
-#          else
-#            # the user doesn't want us to continue on the next page, so
-#            # stop adding lines to the canvas
-#            break
-#          end
-#        end
-#
-#        # move to the start of the next line
-#        move_to(x, y)
-#        # draw the line on the canvas
-#        @context.show_pango_layout_line(line)
-#      end
+      offset = 0
+      baseline = 0
+      
       iter = layout.iter
       loop do 
         line = iter.line
         ink_rect, logical_rect = iter.line_extents
-        y = y + (logical_rect.height / Pango::SCALE * (3.0/4.0)) + 1
-        if y >= (orig_y + h)
+        if y + (baseline - offset) >= (y + h)
           # our text is using the maximum amount of vertical space we want it to
           if options[:auto_new_page]
             # create a new page and we can continue adding text
+            offset += baseline
             start_new_page
-            x = orig_x
-            y = orig_y
           else
             # the user doesn't want us to continue on the next page, so
             # stop adding lines to the canvas
@@ -1088,7 +1059,7 @@ module PDF
         # move to the start of the next line
         #move_to(x, y)
         baseline = iter.baseline / Pango::SCALE
-        @context.move_to(x + logical_rect.x / Pango::SCALE, y + baseline)
+        @context.move_to(x + logical_rect.x / Pango::SCALE, y + baseline - offset)
 
         # draw the line on the canvas
         @context.show_pango_layout_line(line)
@@ -1097,7 +1068,7 @@ module PDF
       end 
 
       # return the y co-ord we finished on
-      return y
+      return y + baseline - offset
     end
 
     def translate_color(c)

data/specs/text_spec.rb

@@ -27,6 +27,19 @@ context "The PDF::Wrapper class" do
     receiver.content.first.should eql(msg)
   end
 
+  specify "should be able to add unicode text that spans multiple pages to the canvas" do
+    msg = "James\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nHealy"
+    pdf = PDF::Wrapper.new
+    pdf.text msg
+
+    receiver = PageTextReceiver.new
+    reader = PDF::Reader.string(pdf.render, receiver)
+
+    receiver.content.size.should eql(2)
+    receiver.content[0].should eql("James")
+    receiver.content[1].should eql("Healy")
+  end
+
   specify "should be align text on the left when using the text method" do
     msg = "Chunky Bacon"
     pdf = PDF::Wrapper.new
@@ -35,14 +48,25 @@ context "The PDF::Wrapper class" do
     receiver = PDF::Reader::RegisterReceiver.new
     reader = PDF::Reader.string(pdf.render, receiver)
 
-    # set_text_matrix_and_text_line_matrix - [10.666992, 0.0, 0.0, 10.666992, 265.0, 788.89]
+    # ensure the text is placed in the right location
+    params = receiver.first_occurance_of(:set_text_matrix_and_text_line_matrix)[:args]
+    params[4].should eql(pdf.margin_left.to_f)
+  end
+
+  specify "should be able to align text on the left when using the text method" do
+    msg = "Chunky Bacon"
+    pdf = PDF::Wrapper.new
+    pdf.text msg, :alignment => :left
+
+    receiver = PDF::Reader::RegisterReceiver.new
+    reader = PDF::Reader.string(pdf.render, receiver)
 
     # ensure the text is placed in the right location
     params = receiver.first_occurance_of(:set_text_matrix_and_text_line_matrix)[:args]
     params[4].should eql(pdf.margin_left.to_f)
   end
 
-  specify "should be align text in the centre when using the text method" do
+  specify "should be able to align text in the centre when using the text method" do
     msg = "Chunky Bacon"
     pdf = PDF::Wrapper.new
     pdf.text msg, :alignment => :center
@@ -57,7 +81,7 @@ context "The PDF::Wrapper class" do
     (params[4] > pdf.absolute_x_middle - 100).should be_true
   end
 
-  specify "should be align text on the right when using the text method" do
+  specify "should be able to align text on the right when using the text method" do
     msg = "Chunky Bacon"
     pdf = PDF::Wrapper.new
     pdf.text msg, :alignment => :right

data/specs/wrapper_spec.rb

@@ -329,7 +329,7 @@ context "The PDF::Wrapper class" do
     pdf.text("Page #{pdf.page}!", :left => pdf.margin_left, :top => pdf.margin_top, :font_size => 18)
     x, y = pdf.current_point
     x.should eql(origx)
-    y.should eql(origy + 26.25)
+    y.should eql(origy + 27)
 
     # image() - palms it's works out to helper functions, so we have to check them individually
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pdf-wrapper
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - James Healy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-27 00:00:00 +10:00
+date: 2008-04-28 00:00:00 +10:00
 default_executable: 
 dependencies: []