prawn 0.15.0 → 1.0.0.rc1

data/lib/prawn/font/afm.rb

@@ -6,13 +6,10 @@
 #
 # This is free software. Please see the LICENSE and COPYING files for details.
 
-require_relative '../../prawn/encoding'
+require 'prawn/encoding'
 
 module Prawn
   class Font
-
-    # @private
-
     class AFM < Font
       BUILT_INS = %w[ Courier Helvetica Times-Roman Symbol ZapfDingbats
                       Courier-Bold Courier-Oblique Courier-BoldOblique
@@ -30,8 +27,8 @@ module Prawn
           @metrics_path ||= [
             ".", "/usr/lib/afm",
             "/usr/local/lib/afm",
-            "/usr/openwin/lib/fonts/afm",
-             Prawn::DATADIR+'/fonts']
+            "/usr/openwin/lib/fonts/afm/",
+             Prawn::BASEDIR+'/data/fonts/']
         end
       end
 
@@ -44,20 +41,16 @@ module Prawn
 
         super
 
-        @@winansi   ||= Prawn::Encoding::WinAnsi.new # parse data/encodings/win_ansi.txt once only
-        @@font_data ||= SynchronizedCache.new        # parse each ATM font file once only
+        @attributes     = {}
+        @glyph_widths   = {}
+        @bounding_boxes = {}
+        @kern_pairs     = {}
 
         file_name = @name.dup
         file_name << ".afm" unless file_name =~ /\.afm$/
         file_name = file_name[0] == ?/ ? file_name : find_font(file_name)
 
-        font_data = @@font_data[file_name] ||= parse_afm(file_name)
-        @glyph_widths    = font_data[:glyph_widths]
-        @glyph_table     = font_data[:glyph_table]
-        @bounding_boxes  = font_data[:bounding_boxes]
-        @kern_pairs      = font_data[:kern_pairs]
-        @kern_pair_table = font_data[:kern_pair_table]
-        @attributes      = font_data[:attributes]
+        parse_afm(file_name)
 
         @ascender  = @attributes["ascender"].to_i
         @descender = @attributes["descender"].to_i
@@ -94,7 +87,7 @@ module Prawn
       # is replaced with a string in WinAnsi encoding.
       #
       def normalize_encoding(text)
-        enc = @@winansi
+        enc = Prawn::Encoding::WinAnsi.new
         text.unpack("U*").collect { |i| enc[i] }.pack("C*")
       rescue ArgumentError
         raise Prawn::Errors::IncompatibleStringEncoding,
@@ -157,7 +150,6 @@ module Prawn
       end
 
       def parse_afm(file_name)
-        data    = {:glyph_widths => {}, :bounding_boxes => {}, :kern_pairs => {}, :attributes => {}}         
         section = []
 
         File.foreach(file_name) do |line|
@@ -174,41 +166,27 @@ module Prawn
           when ["FontMetrics", "CharMetrics"]
             next unless line =~ /^CH?\s/
 
-            name                        = line[/\bN\s+(\.?\w+)\s*;/, 1]
-            data[:glyph_widths][name]   = line[/\bWX\s+(\d+)\s*;/, 1].to_i
-            data[:bounding_boxes][name] = line[/\bB\s+([^;]+);/, 1].to_s.rstrip
+            name                  = line[/\bN\s+(\.?\w+)\s*;/, 1]
+            @glyph_widths[name]   = line[/\bWX\s+(\d+)\s*;/, 1].to_i
+            @bounding_boxes[name] = line[/\bB\s+([^;]+);/, 1].to_s.rstrip
           when ["FontMetrics", "KernData", "KernPairs"]
             next unless line =~ /^KPX\s+(\.?\w+)\s+(\.?\w+)\s+(-?\d+)/
-            data[:kern_pairs][[$1, $2]] = $3.to_i
+            @kern_pairs[[$1, $2]] = $3.to_i
           when ["FontMetrics", "KernData", "TrackKern"],
             ["FontMetrics", "Composites"]
             next
           else
-            parse_generic_afm_attribute(line, data)
+            parse_generic_afm_attribute(line)
           end
         end
-        
-        # process data parsed from AFM file to build tables which
-        #   will be used when measuring and kerning text
-        data[:glyph_table] = (0..255).map do |i|
-          data[:glyph_widths][Encoding::WinAnsi::CHARACTERS[i]].to_i
-        end
-
-        character_hash = Hash[Encoding::WinAnsi::CHARACTERS.zip((0..Encoding::WinAnsi::CHARACTERS.size).to_a)]
-        data[:kern_pair_table] = data[:kern_pairs].inject({}) do |h,p|
-          h[p[0].map { |n| character_hash[n] }] = p[1]
-          h
-        end
-
-        data.each_value { |hash| hash.freeze }
-        data.freeze
       end
 
-      def parse_generic_afm_attribute(line, hash)
+      def parse_generic_afm_attribute(line)
         line =~ /(^\w+)\s+(.*)/
         key, value = $1.to_s.downcase, $2
 
-        hash[:attributes][key] = hash[:attributes][key] ? Array(hash[:attributes][key]) << value : value
+        @attributes[key] =  @attributes[key] ?
+        Array(@attributes[key]) << value : value
       end
 
       # converts a string into an array with spacing offsets
@@ -220,26 +198,46 @@ module Prawn
         kerned = [[]]
         last_byte = nil
 
-        string.each_byte do |byte|
-          if k = last_byte && @kern_pair_table[[last_byte, byte]]
+        kern_pairs = latin_kern_pairs_table
+
+        string.unpack("C*").each do |byte|
+          if k = last_byte && kern_pairs[[last_byte, byte]]
             kerned << -k << [byte]
           else
             kerned.last << byte
-          end
+          end         
           last_byte = byte
         end
 
-        kerned.map { |e|
+        kerned.map { |e| 
           e = (Array === e ? e.pack("C*") : e)
-          e.respond_to?(:force_encoding) ? e.force_encoding(::Encoding::Windows_1252) : e
+          e.respond_to?(:force_encoding) ? e.force_encoding("Windows-1252") : e  
         }
       end
+
+      def latin_kern_pairs_table
+        return @kern_pairs_table if defined?(@kern_pairs_table)
+        
+        character_hash = Hash[Encoding::WinAnsi::CHARACTERS.zip((0..Encoding::WinAnsi::CHARACTERS.size).to_a)]
+        @kern_pairs_table = @kern_pairs.inject({}) do |h,p|
+          h[p[0].map { |n| character_hash[n] }] = p[1]
+          h
+        end
+      end
+
+      def latin_glyphs_table
+        @glyphs_table ||= (0..255).map do |i|
+          @glyph_widths[Encoding::WinAnsi::CHARACTERS[i]].to_i
+        end
+      end
       
       private
       
       def unscaled_width_of(string)
-        string.bytes.inject(0) do |s,r|
-          s + @glyph_table[r]
+        glyph_table = latin_glyphs_table
+        
+        string.unpack("C*").inject(0) do |s,r|
+          s + glyph_table[r]
         end
       end
     end

data/lib/prawn/font/dfont.rb

@@ -6,13 +6,12 @@
 #
 # This is free software. Please see the LICENSE and COPYING files for details.
 #
-require_relative 'ttf'
+require 'prawn/font/ttf'
 
 module Prawn
   class Font
-    # @private
     class DFont < TTF
-
+      
       # Returns a list of the names of all named fonts in the given dfont file.
       # Note that fonts are not required to be named in a dfont file, so the
       # list may be empty even if the file does contain fonts. Also, note that
@@ -33,7 +32,7 @@ module Prawn
         end
       end
 
-      private
+      private 
 
       def read_ttf_file
         TTFunk::File.from_dfont(@name, @options[:font] || 0)

data/lib/prawn/font/ttf.rb

@@ -2,7 +2,7 @@
 
 # prawn/font/ttf.rb : Implements AFM font support for Prawn
 #
-# Copyright May 2008, Gregory Brown / James Healy / Jamis Buck
+# Copyright May 2008, Gregory Brown / James Healy / Jamis Buck  
 # All Rights Reserved.
 #
 # This is free software. Please see the LICENSE and COPYING files for details.
@@ -12,15 +12,13 @@ require 'ttfunk/subset_collection'
 
 module Prawn
   class Font
-
-    # @private
     class TTF < Font
       attr_reader :ttf, :subsets
 
       def unicode?
         true
       end
-
+      
       def initialize(document, name, options={})
         super
 
@@ -28,8 +26,8 @@ module Prawn
         @subsets          = TTFunk::SubsetCollection.new(@ttf)
 
         @attributes       = {}
-        @bounding_boxes   = {}
-        @char_widths      = {}
+        @bounding_boxes   = {} 
+        @char_widths      = {}   
         @has_kerning_data = @ttf.kerning.exists? && @ttf.kerning.tables.any?
 
         @ascender         = Integer(@ttf.ascent * scale_factor)
@@ -44,26 +42,26 @@ module Prawn
           kern(string).inject(0) do |s,r|
             if r.is_a?(Numeric)
               s - r
-            else
+            else 
               r.inject(s) { |s2, u| s2 + character_width_by_code(u) }
             end
           end * scale
         else
-          string.codepoints.inject(0) do |s,r|
+          string.unpack("U*").inject(0) do |s,r|
             s + character_width_by_code(r)
           end * scale
         end
-      end
-
+      end   
+     
       # The font bbox, as an array of integers
-      #
+      # 
       def bbox
         @bbox ||= @ttf.bbox.map { |i| Integer(i * scale_factor) }
       end
 
       # Returns true if the font has kerning data, false otherwise
       def has_kerning_data?
-        @has_kerning_data
+        @has_kerning_data 
       end
 
       # Perform any changes to the string that need to happen
@@ -79,7 +77,7 @@ module Prawn
 
         if options[:kerning]
           last_subset = nil
-          kern(text).inject([]) do |result, element|
+          kern(text).inject([]) do |result, element| 
             if element.is_a?(Numeric)
               result.last[1] = [result.last[1]] unless result.last[1].is_a?(Array)
               result.last[1] << element
@@ -104,7 +102,7 @@ module Prawn
           @subsets.encode(text.unpack("U*"))
         end
       end
-
+      
       def basename
         @basename ||= @ttf.name.postscript_name
       end
@@ -162,26 +160,44 @@ module Prawn
       end
 
       def normalize_encoding(text)
-        begin
-          text.encode(::Encoding::UTF_8)
-        rescue => e
-          puts e
-          raise Prawn::Errors::IncompatibleStringEncoding, "Encoding " +
+        if text.respond_to?(:encode)
+          # if we're running under a M17n aware VM, ensure the string provided is
+          # UTF-8 (by converting it if necessary)
+          begin
+            text.encode("UTF-8")
+          rescue
+            raise Prawn::Errors::IncompatibleStringEncoding, "Encoding " +
             "#{text.encoding} can not be transparently converted to UTF-8. " +
             "Please ensure the encoding of the string you are attempting " +
             "to use is set correctly"
+          end
+        else
+          # on a non M17N aware VM, use unpack as a hackish way to verify the
+          # string is valid utf-8. I thought it was better than loading iconv
+          # though.
+          begin
+            text.unpack("U*")
+            return text.dup
+          rescue
+            raise Prawn::Errors::IncompatibleStringEncoding, "The string you " +
+              "are attempting to render is not encoded in valid UTF-8."
+          end
         end
       end
 
       def glyph_present?(char)
-        code = char.codepoints.first
+        code = char.unpack("U*").first
         cmap[code] > 0
       end
 
       # Returns the number of characters in +str+ (a UTF-8-encoded string).
       #
       def character_count(str)
-        str.length
+        if str.respond_to?(:encode)
+          str.length
+        else
+          str.unpack("U*").length
+        end
       end
 
       private
@@ -189,7 +205,7 @@ module Prawn
       def cmap
         @cmap ||= @ttf.cmap.unicode.first or raise("no unicode cmap for font")
       end
-
+      
       # +string+ must be UTF8-encoded.
       #
       # Returns an array. If an element is a numeric, it represents the
@@ -198,7 +214,7 @@ module Prawn
       def kern(string)
         a = []
 
-        string.each_codepoint do |r|
+        string.unpack("U*").each do |r|
           if a.empty?
             a << [r]
           elsif (kern = kern_pairs_table[[cmap[a.last.last], cmap[r]]])
@@ -225,7 +241,7 @@ module Prawn
         @hmtx ||= @ttf.horizontal_metrics
       end
 
-      def character_width_by_code(code)
+      def character_width_by_code(code)    
         return 0 unless cmap[code]
 
         # Some TTF fonts have nonzero widths for \n (UTF-8 / ASCII code: 10).
@@ -233,7 +249,7 @@ module Prawn
         return 0.0 if code == 10
 
         @char_widths[code] ||= Integer(hmtx.widths[cmap[code]] * scale_factor)
-      end
+      end                   
 
       def scale_factor
         @scale ||= 1000.0 / @ttf.header.units_per_em
@@ -243,7 +259,7 @@ module Prawn
         temp_name = @ttf.name.postscript_name.gsub("\0","").to_sym
         ref = @document.ref!(:Type => :Font, :BaseFont => temp_name)
 
-        # Embed the font metrics in the document after everything has been
+        # Embed the font metrics in the document after everything has been 
         # drawn, just before the document is emitted.
         @document.before_render { |doc| embed(ref, subset) }
 
@@ -264,9 +280,12 @@ module Prawn
 
         raise "Can't detect a postscript name for #{file}" if basename.nil?
 
-        fontfile = @document.ref!(:Length1 => font_content.size)
-        fontfile.stream << font_content
-        fontfile.stream.compress!
+        compressed_font = Zlib::Deflate.deflate(font_content)
+
+        fontfile = @document.ref!(:Length => compressed_font.size,
+                                 :Length1 => font_content.size,
+                                 :Filter => :FlateDecode )
+        fontfile << compressed_font
 
         descriptor = @document.ref!(:Type        => :FontDescriptor,
                                    :FontName    => basename.to_sym,
@@ -297,7 +316,7 @@ module Prawn
         map = @subsets[subset].to_unicode_map
 
         ranges = [[]]
-        map.keys.sort.inject("") do |s, code|
+        lines = map.keys.sort.inject("") do |s, code|
           ranges << [] if ranges.last.length >= 100
           unicode = map[code]
           ranges.last << "<%02x><%04x>" % [code, unicode]
@@ -311,7 +330,7 @@ module Prawn
 
         cmap = @document.ref!({})
         cmap << to_unicode_cmap
-        cmap.stream.compress!
+        cmap.compress_stream
 
         reference.data.update(:Subtype => :TrueType,
                               :BaseFont => basename.to_sym,

data/lib/prawn/graphics.rb

@@ -6,14 +6,13 @@
 #
 # This is free software. Please see the LICENSE and COPYING files for details.
 
-
-require_relative "graphics/color"
-require_relative "graphics/dash"
-require_relative "graphics/cap_style"
-require_relative "graphics/join_style"
-require_relative "graphics/transparency"
-require_relative "graphics/transformation"
-require_relative "graphics/patterns"
+require "prawn/graphics/color"
+require "prawn/graphics/dash"
+require "prawn/graphics/cap_style"
+require "prawn/graphics/join_style"
+require "prawn/graphics/transparency"
+require "prawn/graphics/transformation"
+require "prawn/graphics/gradient"
 
 module Prawn
 
@@ -31,9 +30,7 @@ module Prawn
     include JoinStyle
     include Transparency
     include Transformation
-    include Patterns
-
-    # @group Stable API
+    include Gradient
 
     #######################################################################
     # Low level drawing operations must map the point to absolute coords! #
@@ -85,9 +82,9 @@ module Prawn
       x,y = map_to_absolute(point)
       add_content("%.3f %.3f %.3f %.3f re" % [ x, y - height, width, height ])
     end
-
+    
     # Draws a rounded rectangle given <tt>point</tt>, <tt>width</tt> and
-    # <tt>height</tt> and <tt>radius</tt> for the rounded corner. The rectangle
+    # <tt>height</tt> and <tt>radius</tt> for the rounded corner. The rectangle 
     # is bounded by its upper-left corner.
     #
     #    pdf.rounded_rectangle [300,300], 100, 200, 10
@@ -96,7 +93,7 @@ module Prawn
       x, y = point
       rounded_polygon(radius, point, [x + width, y], [x + width, y - height], [x, y - height])
     end
-
+    
 
     ###########################################################
     #  Higher level functions: May use relative coords        #
@@ -141,7 +138,7 @@ module Prawn
     # current <tt>y</tt> position, or the position specified by the :at option.
     #
     #  # draw a line from [25, 75] to [100, 75]
-    #  horizontal_line 25, 100, :at => 75
+    #  horizontal_line 25, 100, :at => 75  
     #
     def horizontal_line(x1,x2,options={})
       if options[:at]
@@ -149,7 +146,7 @@ module Prawn
       else
         y1 = y - bounds.absolute_bottom
       end
-
+      
       line(x1,y1,x2,y1)
     end
 
@@ -184,6 +181,13 @@ module Prawn
     #
     KAPPA = 4.0 * ((Math.sqrt(2) - 1.0) / 3.0)
 
+    # <b>DEPRECATED:</b> Please use <tt>circle</tt> instead.
+    def circle_at(point, options)
+      warn "[DEPRECATION] 'circle_at' is deprecated in favor of 'circle'. " +
+           "'circle_at' will be removed in release 1.1"
+      circle(point, options[:radius])
+    end
+
     # Draws a circle of radius <tt>radius</tt> with the centre-point at <tt>point</tt>
     # as a complete subpath. The drawing point will be moved to the
     # centre-point upon completion of the drawing the circle.
@@ -194,6 +198,13 @@ module Prawn
       ellipse(center, radius, radius)
     end
 
+    # <b>DEPRECATED:</b> Please use <tt>ellipse</tt> instead.
+    def ellipse_at(point, r1, r2=r1)
+      warn "[DEPRECATION] 'ellipse_at' is deprecated in favor of 'ellipse'. " +
+           "'ellipse_at' will be removed in release 1.1"
+      ellipse(point, r1, r2)
+    end
+
     # Draws an ellipse of +x+ radius <tt>r1</tt> and +y+ radius <tt>r2</tt>
     # with the centre-point at <tt>point</tt> as a complete subpath. The
     # drawing point will be moved to the centre-point upon completion of the
@@ -211,19 +222,19 @@ module Prawn
 
       # Upper right hand corner
       curve_to [x,  y + r2],
-        :bounds => [[x + r1, y + l2], [x + l1, y + r2]]
+        :bounds => [[x + r1, y + l1], [x + l2, y + r2]]
 
       # Upper left hand corner
       curve_to [x - r1, y],
-        :bounds => [[x - l1, y + r2], [x - r1, y + l2]]
+        :bounds => [[x - l2, y + r2], [x - r1, y + l1]]
 
       # Lower left hand corner
       curve_to [x, y - r2],
-        :bounds => [[x - r1, y - l2], [x - l1, y - r2]]
+        :bounds => [[x - r1, y - l1], [x - l2, y - r2]]
 
       # Lower right hand corner
       curve_to [x + r1, y],
-        :bounds => [[x + l1, y - r2], [x + r1, y - l2]]
+        :bounds => [[x + l2, y - r2], [x + r1, y - l1]]
 
       move_to(x, y)
     end
@@ -241,7 +252,7 @@ module Prawn
       # close the path
       add_content "h"
     end
-
+    
     # Draws a rounded polygon from specified points using the radius to define bezier curves
     #
     #  # draws a rounded filled in polygon
@@ -257,19 +268,20 @@ module Prawn
       # close the path
       add_content "h"
     end
-
-
+    
+    
     # Creates a rounded vertex for a line segment used for building a rounded polygon
     # requires a radius to define bezier curve and three points. The first two points define
     # the line segment and the third point helps define the curve for the vertex.
     def rounded_vertex(radius, *points)
+      x0,y0,x1,y1,x2,y2 = points.flatten
       radial_point_1 = point_on_line(radius, points[0], points[1])
       bezier_point_1 = point_on_line((radius - radius*KAPPA), points[0], points[1] )
       radial_point_2 = point_on_line(radius, points[2], points[1])
       bezier_point_2 = point_on_line((radius - radius*KAPPA), points[2], points[1])
       line_to(radial_point_1)
       curve_to(radial_point_2, :bounds => [bezier_point_1, bezier_point_2])
-    end
+    end      
 
     # Strokes the current path. If a block is provided, yields to the block
     # before closing the path. See Graphics::Color for color details.
@@ -286,75 +298,13 @@ module Prawn
       yield if block_given?
       add_content "s"
     end
-
+    
     # Draws and strokes a rectangle represented by the current bounding box
     #
     def stroke_bounds
       stroke_rectangle bounds.top_left, bounds.width, bounds.height
     end
 
-    # Draws and strokes X and Y axes rulers beginning at the current bounding
-    # box origin (or at a custom location).
-    #
-    # == Options
-    #
-    # +:at+::
-    #   Origin of the X and Y axes (default: [0, 0] = origin of the bounding
-    #   box)
-    #
-    # +:width+::
-    #   Length of the X axis (default: width of the bounding box)
-    #
-    # +:height+::
-    #   Length of the Y axis (default: height of the bounding box)
-    #
-    # +:step_length+::
-    #   Length of the step between markers (default: 100)
-    #
-    # +:negative_axes_length+::
-    #   Length of the negative parts of the axes (default: 20)
-    #
-    # +:color+:
-    #   The color of the axes and the text.
-    #
-    def stroke_axis(options = {})
-      options = {
-        :at => [0,0],
-        :height => bounds.height.to_i - (options[:at] || [0,0])[1],
-        :width => bounds.width.to_i - (options[:at] || [0,0])[0],
-        :step_length => 100,
-        :negative_axes_length => 20,
-        :color => "000000",
-      }.merge(options)
-
-      Prawn.verify_options([:at, :width, :height, :step_length,
-                            :negative_axes_length, :color], options)
-
-      save_graphics_state do
-        fill_color(options[:color])
-        stroke_color(options[:color])
-
-        dash(1, :space => 4)
-        stroke_horizontal_line(options[:at][0] - options[:negative_axes_length],
-                               options[:at][0] + options[:width], :at => options[:at][1])
-        stroke_vertical_line(options[:at][1] - options[:negative_axes_length],
-                             options[:at][1] + options[:height], :at => options[:at][0])
-        undash
-
-        fill_circle(options[:at], 1)
-
-        (options[:step_length]..options[:width]).step(options[:step_length]) do |point|
-          fill_circle([options[:at][0] + point, options[:at][1]], 1)
-          draw_text(point, :at => [options[:at][0] + point - 5, options[:at][1] - 10], :size => 7)
-        end
-
-        (options[:step_length]..options[:height]).step(options[:step_length]) do |point|
-          fill_circle([options[:at][0], options[:at][1] + point], 1)
-          draw_text(point, :at => [options[:at][0] - 17, options[:at][1] + point - 2], :size => 7)
-        end
-      end
-    end
-
     # Closes and fills the current path. See Graphics::Color for color details.
     #
     # If the option :fill_rule => :even_odd is specified, Prawn will use the
@@ -387,230 +337,35 @@ module Prawn
       add_content "h"
     end
 
-    ##
-    # :method: stroke_rectangle
-    #
-    # Draws and strokes a rectangle given +point+, +width+ and +height+. The
-    # rectangle is bounded by its upper-left corner.
-    #
-    # :call-seq:
-    #   stroke_rectangle(point,width,height)
-
-    ##
-    # :method: fill_rectangle
-    #
-    # Draws and fills ills a rectangle given +point+, +width+ and +height+. The
-    # rectangle is bounded by its upper-left corner.
-    #
-    # :call-seq:
-    #   fill_rectangle(point,width,height)
-
-    ##
-    # :method: fill_and_stroke_rectangle
-    #
-    # Draws, fills, and strokes a rectangle given +point+, +width+ and +height+.
-    # The rectangle is bounded by its upper-left corner.
-    #
-    # :call-seq:
-    #   fill_and_stroke_rectangle(point,width,height)
-
-    ##
-    # :method: stroke_rounded_rectangle
-    #
-    # Draws and strokes a rounded rectangle given +point+, +width+ and +height+
-    # and +radius+ for the rounded corner. The rectangle is bounded by its
-    # upper-left corner.
-    #
-    # :call-seq:
-    #   stroke_rounded_rectangle(point,width,height,radius)
-
-    ##
-    # :method: fill_rounded_rectangle
-    #
-    # Draws and fills a rounded rectangle given +point+, +width+ and +height+
-    # and +radius+ for the rounded corner. The rectangle is bounded by its
-    # upper-left corner.
-    #
-    # :call-seq:
-    #   fill_rounded_rectangle(point,width,height,radius)
-
-    ##
-    # :method: stroke_and_fill_rounded_rectangle
-    #
-    # Draws, fills, and strokes a rounded rectangle given +point+, +width+ and
-    # +height+ and +radius+ for the rounded corner. The rectangle is bounded by
-    # its upper-left corner.
-    #
-    # :call-seq:
-    #   stroke_and_fill_rounded_rectangle(point,width,height,radius)
-
-    ##
-    # :method: stroke_line
-    #
-    # Strokes a line from one point to another. Points may be specified as
-    # tuples or flattened argument list.
-    #
-    # :call-seq:
-    #   stroke_line(*points)
-
-    ##
-    # :method: stroke_horizontal_line
-    #
-    # Strokes a horizontal line from +x1+ to +x2+ at the current y position, or
-    # the position specified by the :at option.
-    #
-    # :call-seq:
-    #   stroke_horizontal_line(x1,x2,options={})
-
-    ##
-    # :method: stroke_horizontal_rule
-    #
-    # Strokes a horizontal line from the left border to the right border of the
-    # bounding box at the current y position.
-    #
-    # :call-seq:
-    #   stroke_horizontal_rule
-
-    ##
-    # :method: stroke_vertical_line
-    #
-    # Strokes a vertical line at the x coordinate given by :at from y1 to y2.
-    #
-    # :call-seq:
-    #   stroke_vertical_line(y1,y2,params)
-
-    ##
-    # :method: stroke_curve
-    #
-    # Strokes a Bezier curve between two points, bounded by two additional
-    # points.
-    #
-    # :call-seq:
-    #   stroke_curve(origin,dest,options={})
-
-    ##
-    # :method: stroke_circle
-    #
-    # Draws and strokes a circle of radius +radius+ with the centre-point at
-    # +point+.
-    #
-    # :call-seq:
-    #   stroke_circle(center,radius)
-
-    ##
-    # :method: fill_circle
+    # Provides the following shortcuts:
     #
-    # Draws and fills a circle of radius +radius+ with the centre-point at
-    # +point+.
+    #    stroke_some_method(*args) #=> some_method(*args); stroke
+    #    fill_some_method(*args) #=> some_method(*args); fill
+    #    fill_and_stroke_some_method(*args) #=> some_method(*args); fill_and_stroke
     #
-    # :call-seq:
-    #   fill_circle(center,radius)
-
-    ##
-    # :method: fill_and_stroke_circle
-    #
-    # Draws, strokes, and fills a circle of radius +radius+ with the
-    # centre-point at +point+.
-    #
-    # :call-seq:
-    #   fill_and_stroke_circle(center,radius)
-
-    ##
-    # :method: stroke_ellipse
-    #
-    # Draws and strokes an ellipse of x radius +r1+ and y radius +r2+ with the
-    # centre-point at +point+.
-    #
-    # :call-seq:
-    #   stroke_ellipse(point, r1, r2 = r1)
-
-    ##
-    # :method: fill_ellipse
-    #
-    # Draws and fills an ellipse of x radius +r1+ and y radius +r2+ with the
-    # centre-point at +point+.
-    #
-    # :call-seq:
-    #   fill_ellipse(point, r1, r2 = r1)
-
-    ##
-    # :method: fill_and_stroke_ellipse
-    #
-    # Draws, strokes, and fills an ellipse of x radius +r1+ and y radius +r2+
-    # with the centre-point at +point+.
-    #
-    # :call-seq:
-    #   fill_and_stroke_ellipse(point, r1, r2 = r1)
-
-    ##
-    # :method: stroke_polygon
-    #
-    # Draws and strokes a polygon from the specified points.
-    #
-    # :call-seq:
-    #   stroke_polygon(*points)
-
-    ##
-    # :method: fill_polygon
-    #
-    # Draws and fills a polygon from the specified points.
-    #
-    # :call-seq:
-    #   fill_polygon(*points)
-
-    ##
-    # :method: fill_and_stroke_polygon
-    #
-    # Draws, strokes, and fills a polygon from the specified points.
-    #
-    # :call-seq:
-    #   fill_and_stroke_polygon(*points)
-
-    ##
-    # :method: stroke_rounded_polygon
-    #
-    # Draws and strokes a rounded polygon from specified points, using +radius+
-    # to define Bezier curves.
-    #
-    # :call-seq:
-    #   stroke_rounded_polygon(radius, *points)
-
-    ##
-    # :method: fill_rounded_polygon
-    #
-    # Draws and fills a rounded polygon from specified points, using +radius+ to
-    # define Bezier curves.
-    #
-    # :call-seq:
-    #   fill_rounded_polygon(radius, *points)
-
-    ##
-    # :method: fill_and_stroke_rounded_polygon
-    #
-    # Draws, strokes, and fills a rounded polygon from specified points, using
-    # +radius+ to define Bezier curves.
-    #
-    # :call-seq:
-    #   fill_and_stroke_rounded_polygon(radius, *points)
-
-    ops    = %w{fill stroke fill_and_stroke}
-    shapes = %w{line_to curve_to rectangle rounded_rectangle line horizontal_line horizontal_rule vertical_line
-                curve circle_at circle ellipse_at ellipse polygon rounded_polygon rounded_vertex}
-
-    ops.product(shapes).each do |operation,shape|
-      class_eval "def #{operation}_#{shape}(*args); #{shape}(*args); #{operation}; end"
+    def method_missing(id,*args,&block)
+      case(id.to_s)
+      when /^fill_and_stroke_(.*)/
+        send($1,*args,&block); fill_and_stroke
+      when /^stroke_(.*)/
+        send($1,*args,&block); stroke
+      when /^fill_(.*)/
+        send($1,*args,&block); fill
+      else
+        super
+      end
     end
 
     private
-
+    
     def current_line_width
       graphic_state.line_width
     end
-
+    
     def current_line_width=(width)
       graphic_state.line_width = width
     end
-
+    
     def write_line_width
       add_content("#{current_line_width} w")
     end
@@ -627,7 +382,7 @@ module Prawn
     def degree_to_rad(angle)
        angle * Math::PI / 180
     end
-
+    
     # Returns the coordinates for a point on a line that is a given distance away from the second
     # point defining the line segement
     def point_on_line(distance_from_end, *points)
@@ -638,6 +393,6 @@ module Prawn
       yr = y0 + p*(y1 - y0)
       [xr, yr]
     end
-
+    
   end
 end