text.rb in prawn-0.13.0

- old
+ new

@@ -1,6 +1,6 @@
-# encoding: utf-8   
+# encoding: utf-8
 
 # text.rb: Text table cells.
 #
 # Copyright December 2009, Gregory Brown and Brad Ediger. All Rights Reserved.
 #
@@ -45,73 +45,85 @@
 
         # Returns the width of this text with no wrapping. This will be far off
         # from the final width if the text is long.
         #
         def natural_content_width
-          [styled_width_of(@content), @pdf.bounds.width].min
+          @natural_content_width ||= [styled_width_of(@content), @pdf.bounds.width].min
         end
 
         # Returns the natural height of this block of text, wrapped to the
         # preset width.
         #
         def natural_content_height
           with_font do
-            b = text_box(:width => content_width + FPTolerance)
+            b = text_box(:width => spanned_content_width + FPTolerance)
             b.render(:dry_run => true)
             b.height + b.line_gap
           end
         end
 
         # Draws the text content into its bounding box.
         #
         def draw_content
-          with_font do 
+          with_font do
             @pdf.move_down((@pdf.font.line_gap + @pdf.font.descender)/2)
             with_text_color do
-              text_box(:width => content_width + FPTolerance, 
-                       :height => content_height + FPTolerance,
+              text_box(:width => spanned_content_width + FPTolerance,
+                       :height => spanned_content_height + FPTolerance,
                        :at => [0, @pdf.cursor]).render
             end
           end
         end
 
         def set_width_constraints
           # Sets a reasonable minimum width. If the cell has any content, make
           # sure we have enough width to be at least one character wide. This is
           # a bit of a hack, but it should work well enough.
-          min_content_width = [natural_content_width, styled_width_of("M")].min
-          @min_width ||= padding_left + padding_right + min_content_width
-          super
+          unless defined?(@min_width) && @min_width
+            min_content_width = [natural_content_width, styled_width_of_single_character].min
+            @min_width = padding_left + padding_right + min_content_width
+            super
+          end
         end
 
         protected
 
         def with_font
           @pdf.save_font do
             options = {}
             options[:style] = @text_options[:style] if @text_options[:style]
+            options[:style] ||= @pdf.font.options[:style] if @pdf.font.options[:style]
 
-            @pdf.font(@font || @pdf.font.name, options)
+            @pdf.font(defined?(@font) && @font || @pdf.font.family, options)
 
             yield
           end
         end
 
         def with_text_color
-          old_color = @pdf.fill_color || '000000'
-          @pdf.fill_color(@text_color) if @text_color
-          yield
-        ensure
-          @pdf.fill_color(old_color)
+          if defined?(@text_color) && @text_color
+            begin
+              old_color = @pdf.fill_color || '000000'
+              @pdf.fill_color(@text_color)
+              yield
+            ensure
+              @pdf.fill_color(old_color)
+            end
+          else
+            yield
+          end
         end
-        
+
         def text_box(extra_options={})
-          if @text_options[:inline_format]
+          if p = @text_options[:inline_format]
+            p = [] unless p.is_a?(Array)
             options = @text_options.dup
             options.delete(:inline_format)
+            options.merge!(extra_options)
+            options[:document] = @pdf
 
-            array = ::Prawn::Text::Formatted::Parser.to_array(@content)
+            array = @pdf.text_formatter.format(@content, *p)
             ::Prawn::Text::Formatted::Box.new(array,
               options.merge(extra_options).merge(:document => @pdf))
           else
             ::Prawn::Text::Box.new(@content, @text_options.merge(extra_options).
                merge(:document => @pdf))
@@ -119,17 +131,23 @@
         end
 
         # Returns the width of +text+ under the given text options.
         #
         def styled_width_of(text)
-          with_font do
-            options = {}
-            options[:size] = @text_options[:size] if @text_options[:size]
-
-            @pdf.font.compute_width_of(text, options)
-          end
+          @pdf.width_of(text, @text_options)
         end
 
+        private
+
+        # Returns the greatest possible width of any single character
+        #   under the given text options.
+        # (We use this to determine the minimum width of a table cell)
+        # (Although we currently determine this by measuring "M", it should really
+        #   use whichever character is widest under the current font)
+        #
+        def styled_width_of_single_character
+          styled_width_of("M")
+        end
       end
     end
   end
 end