hotcocoa 0.5.1 → 0.6.0pre

data/lib/hotcocoa/graphics/canvas.rb

@@ -1,17 +1,17 @@
-# Ruby Cocoa Graphics is a graphics library providing a simple object-oriented 
-# interface into the power of Mac OS X's Core Graphics and Core Image drawing libraries.  
-# With a few lines of easy-to-read code, you can write scripts to draw simple or complex 
-# shapes, lines, and patterns, process and filter images, create abstract art or visualize 
+# Ruby Cocoa Graphics is a graphics library providing a simple object-oriented
+# interface into the power of Mac OS X's Core Graphics and Core Image drawing libraries.
+# With a few lines of easy-to-read code, you can write scripts to draw simple or complex
+# shapes, lines, and patterns, process and filter images, create abstract art or visualize
 # scientific data, and much more.
-# 
-# Inspiration for this project was derived from Processing and NodeBox.  These excellent 
-# graphics programming environments are more full-featured than RCG, but they are implemented 
-# in Java and Python, respectively.  RCG was created to offer similar functionality using 
+#
+# Inspiration for this project was derived from Processing and NodeBox.  These excellent
+# graphics programming environments are more full-featured than RCG, but they are implemented
+# in Java and Python, respectively.  RCG was created to offer similar functionality using
 # the Ruby programming language.
 #
 # Author::    James Reynolds  (mailto:drtoast@drtoast.com)
 # Copyright:: Copyright (c) 2008 James Reynolds
-# License::   Distributes under the same terms as Ruby 
+# License::   Distributes under the same terms as Ruby
 
 # In Quartz 2D, the canvas is often referred as the "page".
 # Overview of the underlying page concept available at:
@@ -22,7 +22,7 @@ module HotCocoa::Graphics
 
   # drawing destination for writing a PDF, PNG, GIF, JPG, or TIF file
   class Canvas
-    
+
     BlendModes = {
       :normal => KCGBlendModeNormal,
       :darken => KCGBlendModeDarken,
@@ -43,44 +43,44 @@ module HotCocoa::Graphics
       :luminosity => KCGBlendModeLuminosity,
     }
     BlendModes.default(KCGBlendModeNormal)
-    
+
     DefaultOptions = {:quality => 0.8, :width => 400, :height => 400}
-  
-    attr_accessor :width, :height  
-    
+
+    attr_accessor :width, :height
+
     # We make the context available so developers can directly use underlying CG methods
     # on objects created by this wrapper
     attr_reader :ctx
-    
+
     class << self
       def for_rendering(options={}, &block)
         options[:type] = :render
         Canvas.new(options, &block)
       end
-      
+
       def for_pdf(options={}, &block)
         options[:type] = :pdf
         Canvas.new(options, &block)
       end
-      
+
       def for_image(options={}, &block)
         options[:type] = :image
         Canvas.new(options, &block)
       end
-      
+
       def for_context(options={}, &block)
         options[:type] = :context
         Canvas.new(options, &block)
       end
-      
+
       def for_current_context(options={}, &block)
         options[:type] = :context
         options[:context] = NSGraphicsContext.currentContext.graphicsPort
         Canvas.new(options, &block)
       end
-      
+
     end
-  
+
     # create a new canvas with the given width, height, and output filename (pdf, png, jpg, gif, or tif)
     def initialize(options={}, &block)
       if options[:size]
@@ -88,14 +88,14 @@ module HotCocoa::Graphics
         options[:height] = options[:size][1]
       end
       options = DefaultOptions.merge(options)
-    
+
       @width = options[:width]
       @height = options[:height]
       @output = options[:filename] || 'test'
       @stacksize = 0
       @colorspace = CGColorSpaceCreateDeviceRGB() # => CGColorSpaceRef
       @autoclosepath = false
-    
+
       case options[:type]
       when :pdf
         @filetype = :pdf
@@ -155,22 +155,22 @@ module HotCocoa::Graphics
     def verbose(tf=true)
       @verbose = tf
     end
-  
+
     # set whether or not drawn paths should be antialiased (true/false)
     def antialias(tf=true)
       CGContextSetShouldAntialias(@ctx, tf)
     end
-  
+
     # set the alpha value for subsequently drawn objects
     def alpha(val=1.0)
       CGContextSetAlpha(@ctx, val)
     end
-  
+
     # set compression (0.0 = max, 1.0 = none)
     def quality(factor=0.8)
       @quality = factor
     end
-  
+
     # set the current fill (given a Color object, or RGBA values)
     def fill(r=0, g=0, b=0, a=1)
       case r
@@ -183,15 +183,15 @@ module HotCocoa::Graphics
       CGContextSetRGBFillColor(@ctx, r, g, b, a) # RGBA
       @fill = true
     end
-  
+
     # remove current fill
     def nofill
       CGContextSetRGBFillColor(@ctx, 0.0, 0.0, 0.0, 0.0) # RGBA
       @fill = nil
     end
-  
+
     # SET CANVAS STROKE PARAMETERS
-  
+
     # set stroke color (given a Color object, or RGBA values)
     def stroke(r=0, g=0, b=0, a=1.0)
       case r
@@ -204,18 +204,18 @@ module HotCocoa::Graphics
       CGContextSetRGBStrokeColor(@ctx, r, g, b, a) # RGBA
       @stroke = true
     end
-  
+
     # set stroke width
     def strokewidth(width=1)
       CGContextSetLineWidth(@ctx, width.to_f)
     end
-  
+
     # don't use a stroke for subsequent drawing operations
     def nostroke
       CGContextSetRGBStrokeColor(@ctx, 0, 0, 0, 0) # RGBA
       @stroke = false
     end
-  
+
     # set cap style to round, square, or butt
     def linecap(style=:butt)
       case style
@@ -230,7 +230,7 @@ module HotCocoa::Graphics
       end
       CGContextSetLineCap(@ctx,cap)
     end
-  
+
     # set line join style to round, miter, or bevel
     def linejoin(style=:miter)
       case style
@@ -245,21 +245,21 @@ module HotCocoa::Graphics
       end
       CGContextSetLineJoin(@ctx,join)
     end
-  
+
     # set lengths of dashes and spaces, and distance before starting dashes
     def linedash(lengths=[10,2], phase=0.0)
       count=lengths.size
       CGContextSetLineDash(@ctx, phase, lengths, count)
     end
-  
+
     # revert to solid lines
     def nodash
       CGContextSetLineDash(@ctx, 0.0, nil, 0)
     end
-  
-  
+
+
     # DRAWING SHAPES ON CANVAS
-    
+
     # draw a rectangle starting at x,y and having dimensions w,h
     def rect(x=0, y=0, w=20, h=20, reg=@registration)
       # center the rectangle
@@ -270,7 +270,7 @@ module HotCocoa::Graphics
       CGContextAddRect(@ctx, NSMakeRect(x, y, w, h))
       CGContextDrawPath(@ctx, KCGPathFillStroke)
     end
-  
+
     # inscribe an oval starting at x,y inside a rectangle having dimensions w,h
     def oval(x=0, y=0, w=20, h=20, reg=@registration)
       # center the oval
@@ -281,7 +281,7 @@ module HotCocoa::Graphics
       CGContextAddEllipseInRect(@ctx, NSMakeRect(x, y, w, h))
       CGContextDrawPath(@ctx, KCGPathFillStroke) # apply fill and stroke
     end
-  
+
     # draw a background color (given a Color object, or RGBA values)
     def background(r=1, g=1, b=1, a=1.0)
       case r
@@ -296,7 +296,7 @@ module HotCocoa::Graphics
       rect(0,0,@width,@height)
       pop
     end
-  
+
     # draw a radial gradiant starting at sx,sy with radius er
     # optional: specify ending at ex,ey and starting radius sr
     def radial(gradient, sx=@width/2, sy=@height/2, er=@width/2, ex=sx, ey=sy, sr=0.0)
@@ -304,7 +304,7 @@ module HotCocoa::Graphics
       #options = KCGGradientDrawsAfterEndLocation
       CGContextDrawRadialGradient(@ctx, gradient.gradient, NSMakePoint(sx, sy), sr, NSMakePoint(ex, ey), er, gradient.pre + gradient.post)
     end
-  
+
     # draw an axial(linear) gradient starting at sx,sy and ending at ex,ey
     def gradient(gradient=Gradient.new, start_x=@width/2, start_y=0, end_x=@width/2, end_y=@height)
       #options = KCGGradientDrawsBeforeStartLocation
@@ -341,25 +341,25 @@ module HotCocoa::Graphics
         # restore previous state
       end
     end
-  
-  
+
+
     # DRAWING COMPLETE PATHS TO CANVAS
-  
+
     # draw a line starting at x1,y1 and ending at x2,y2
     def line(x1, y1, x2, y2)
       CGContextAddLines(@ctx, [NSPoint.new(x1, y1), NSPoint.new(x2, y2)], 2)
       CGContextDrawPath(@ctx, KCGPathStroke) # apply stroke
       endpath
-      
+
     end
-  
+
     # draw a series of lines connecting the given array of points
     def lines(points)
       CGContextAddLines(@ctx, points, points.size)
       CGContextDrawPath(@ctx, KCGPathStroke) # apply stroke
       endpath
     end
-  
+
     # draw the arc of a circle with center point x,y, radius, start angle (0 deg = 12 o'clock) and end angle
     def arc(x, y, radius, start_angle, end_angle)
       start_angle = radians(90-start_angle)
@@ -368,21 +368,21 @@ module HotCocoa::Graphics
       CGContextAddArc(@ctx, x, y, radius, start_angle, end_angle, clockwise)
       CGContextDrawPath(@ctx, KCGPathStroke)
     end
-  
+
     # draw a bezier curve from the current point, given the coordinates of two handle control points and an end point
     def curve(cp1x, cp1y, cp2x, cp2y, x1, y1, x2, y2)
       beginpath(x1, y1)
       CGContextAddCurveToPoint(@ctx, cp1x, cp1y, cp2x, cp2y, x2, y2)
       endpath
     end
-  
+
     # draw a quadratic bezier curve from x1,y1 to x2,y2, given the coordinates of one control point
     def qcurve(cpx, cpy, x1, y1, x2, y2)
       beginpath(x1, y1)
       CGContextAddQuadCurveToPoint(@ctx, cpx, cpy, x2, y2)
       endpath
     end
-  
+
     # draw the given Path object
     def draw(object, *args)
       case object
@@ -401,13 +401,13 @@ module HotCocoa::Graphics
     def autoclosepath(tf=false)
       @autoclosepath = tf
     end
-    
+
     def new_path(x, y, &block)
       beginpath(x, y)
       block.call
       endpath
     end
-    
+
     # begin drawing a path at x,y
     def beginpath(x, y)
       CGContextBeginPath(@ctx)
@@ -421,7 +421,7 @@ module HotCocoa::Graphics
       mode = KCGPathFillStroke
       CGContextDrawPath(@ctx, mode) # apply fill and stroke
     end
-  
+
     # move the "pen" to x,y
     def moveto(x, y)
       CGContextMoveToPoint(@ctx, x, y)
@@ -431,7 +431,7 @@ module HotCocoa::Graphics
     def lineto(x, y)
       CGContextAddLineToPoint(@ctx ,x, y)
     end
-  
+
     # draw a bezier curve from the current point, given the coordinates of two handle control points and an end point
     def curveto(cp1x, cp1y, cp2x, cp2y, x, y)
       CGContextAddCurveToPoint(@ctx, cp1x, cp1y, cp2x, cp2y, x, y)
@@ -441,12 +441,12 @@ module HotCocoa::Graphics
     def qcurveto(cpx, cpy, x, y)
       CGContextAddQuadCurveToPoint(@ctx, cpx, cpy, x, y)
     end
-  
+
     # draw an arc given the endpoints of two tangent lines and a radius
     def arcto(x1, y1, x2, y2, radius)
       CGContextAddArcToPoint(@ctx, x1, y1, x2, y2, radius)
     end
-    
+
     # draw the path in a grid with rows, columns
     def grid(path, rows=10, cols=10)
       push
@@ -462,58 +462,58 @@ module HotCocoa::Graphics
       end
       pop
     end
-  
+
 
     # TRANSFORMATIONS
-  
+
     # set registration mode to :center or :corner
     def registration(mode=:center)
       @registration = mode
     end
-  
+
     # rotate by the specified degrees
     def rotate(deg=0)
       CGContextRotateCTM(@ctx, radians(-deg));
     end
-  
+
     # translate drawing context by x,y
     def translate(x, y)
       CGContextTranslateCTM(@ctx, x, y);
     end
-  
+
     # scale drawing context by x,y
     def scale(x, y=x)
       CGContextScaleCTM(@ctx, x, y)
     end
-  
+
     def skew(x=0, y=0)
       x = Math::PI * x / 180.0
       y = Math::PI * y / 180.0
       transform = CGAffineTransformMake(1.0, Math::tan(y), Math::tan(x), 1.0, 0.0, 0.0)
       CGContextConcatCTM(@ctx, transform)
     end
-  
-  
+
+
     # STATE
-    
+
     def new_state(&block)
       push
       block.call
       pop
     end
-  
+
     # push the current drawing context onto the stack
     def push
       CGContextSaveGState(@ctx)
       @stacksize = @stacksize + 1
     end
-  
+
     # pop the previous drawing context off the stack
     def pop
       CGContextRestoreGState(@ctx)
       @stacksize = @stacksize - 1
     end
-  
+
     # restore the initial context
     def reset
       until (@stacksize <= 1)
@@ -521,35 +521,35 @@ module HotCocoa::Graphics
       end
       push  # push the retrieved pristine default state back onto the stack
     end
-  
-  
+
+
     # EFFECTS
-  
+
     # apply a drop shadow with offset dx,dy, alpha, and blur
     def shadow(dx=0.0, dy=0.0, a=2.0/3.0, blur=5)
       color = CGColorCreate(@colorspace, [0.0, 0.0, 0.0, a])
       CGContextSetShadowWithColor(@ctx, [dx, dy], blur, color)
     end
-  
+
     # apply a glow with offset dx,dy, alpha, and blur
     def glow(dx=0.0, dy=0.0, a=2.0/3.0, blur=5)
       color = CGColorCreate(@colorspace, [1.0, 1.0, 0.0, a])
       CGContextSetShadowWithColor(@ctx, [dx, dy], blur, color)
     end
-  
+
     # stop using a shadow
     def noshadow
       CGContextSetShadowWithColor(@ctx, [0,0], 1, nil)
     end
-  
+
     # set the canvas blend mode (:normal, :darken, :multiply, :screen, etc)
     def blend(mode)
       CGContextSetBlendMode(@ctx, BlendModes[mode])
     end
-  
-  
+
+
     # CLIPPING MASKS
-    
+
     # clip subsequent drawing operations within the given path
     def beginclip(p, &block)
       push
@@ -560,17 +560,17 @@ module HotCocoa::Graphics
         endclip
       end
     end
-  
+
     # stop clipping drawing operations
     def endclip
       pop
     end
-  
+
     # DRAW TEXT TO CANVAS
-  
+
     # NOTE: may want to switch to ATSUI for text handling
     # http://developer.apple.com/documentation/Carbon/Reference/ATSUI_Reference/Reference/reference.html
-  
+
     # write the text at x,y using the current fill
     def text(txt="A", x=0, y=0)
       txt = txt.to_s unless txt.kind_of?(String)
@@ -581,7 +581,7 @@ module HotCocoa::Graphics
       end
       CGContextShowTextAtPoint(@ctx, x, y, txt, txt.length)
     end
-  
+
     # determine the width of the given text without drawing it
     def textwidth(txt, width=nil)
       push
@@ -592,15 +592,15 @@ module HotCocoa::Graphics
       pop
       final.x - start.x
     end
-  
+
     # def textheight(txt)
     #   # need to use ATSUI
     # end
-    # 
+    #
     # def textmetrics(txt)
     #   # need to use ATSUI
     # end
-  
+
     # set font by name and optional size
     def font(name="Helvetica", size=nil)
       fontsize(size) if size
@@ -608,7 +608,7 @@ module HotCocoa::Graphics
       fontsize unless @fsize
       CGContextSelectFont(@ctx, @fname, @fsize, KCGEncodingMacRoman)
     end
-  
+
     # set font size in points
     def fontsize(points=20)
       @fsize = points
@@ -616,22 +616,22 @@ module HotCocoa::Graphics
       #CGContextSetFontSize(@ctx,points)
       CGContextSelectFont(@ctx, @fname, @fsize, KCGEncodingMacRoman)
     end
-  
-  
+
+
     # SAVING/EXPORTING
-    
+
     def nsimage
       image = NSImage.alloc.init
       image.addRepresentation(NSBitmapImageRep.alloc.initWithCGImage(cgimage))
       image
     end
-    
+
     # return a CGImage of the canvas for reprocessing (only works if using a bitmap context)
     def cgimage
       CGBitmapContextCreateImage(@ctx)  # => CGImageRef (works with bitmap context only)
       #cgimageref = CGImageCreate(@width, @height, @bits_per_component, nil,nil,@colorspace, nil, @provider,nil,true,KCGRenderingIntentDefault)
     end
-  
+
     # return a CIImage of the canvas for reprocessing (only works if using a bitmap context)
     def ciimage
       cgimageref = self.cgimage
@@ -648,10 +648,10 @@ module HotCocoa::Graphics
         puts "WARNING: newpage only valid when using PDF output"
       end
     end
-  
+
     # save the image to a file
     def save
-    
+
       properties = {}
   #    exif = {}
       # KCGImagePropertyExifDictionary
@@ -687,150 +687,147 @@ module HotCocoa::Graphics
     def open
       system "open #{@output}"
     end
-    
+
     # def save(dest)
     ## http://developer.apple.com/documentation/GraphicsImaging/Conceptual/drawingwithquartz2d/dq_data_mgr/chapter_11_section_3.html
     #   properties = {
-    #     
+    #
     #   }
     #   cgimageref = CGBitmapContextCreateImage(@ctx)                   # => CGImageRef
     #   destination = CGImageDestinationCreateWithURL(NSURL.fileURLWithPath(dest)) # => CGImageDestinationRef
     #   CGImageDestinationSetProperties(destination,properties)
     #   CGImageDestinationAddImage(cgimageref)
     # end
-    
+
     private
-    
-      # DRAWING PATHS ON A CANVAS
-
-      def draw_path(p, tx=0, ty=0, iterations=1)
-        new_state do
-          iterations.times do |i|
-            if (i > 0)
-              # INCREMENT TRANSFORM:
-              # translate x, y
-              translate(choose(p.inc[:x]), choose(p.inc[:y]))
-              # choose a rotation factor from the range
-              rotate(choose(p.inc[:rotation]))
-              # choose a scaling factor from the range
-              sc = choose(p.inc[:scale])
-              sx = choose(p.inc[:scalex]) * sc
-              sy = p.inc[:scaley] ? choose(p.inc[:scaley]) * sc : sx * sc
-              scale(sx, sy)
-            end
 
-            new_state do
-              # PICK AND ADJUST FILL/STROKE COLORS:
-              [:fill,:stroke].each do |kind|
-                # PICK A COLOR
-                if (p.inc[kind]) then
-                  # increment color from array
-                  colorindex = i % p.inc[kind].size
-                  c = p.inc[kind][colorindex].copy
-                else
-                  c = p.rand[kind]
-                  case c
-                  when Array
-                    c = choose(c).copy
-                  when Color
-                    c = c.copy
-                  else
-                    next
-                  end
-                end
+    # DRAWING PATHS ON A CANVAS
+
+    def draw_path(p, tx=0, ty=0, iterations=1)
+      new_state do
+        iterations.times do |i|
+          if (i > 0)
+            # INCREMENT TRANSFORM:
+            # translate x, y
+            translate(choose(p.inc[:x]), choose(p.inc[:y]))
+            # choose a rotation factor from the range
+            rotate(choose(p.inc[:rotation]))
+            # choose a scaling factor from the range
+            sc = choose(p.inc[:scale])
+            sx = choose(p.inc[:scalex]) * sc
+            sy = p.inc[:scaley] ? choose(p.inc[:scaley]) * sc : sx * sc
+            scale(sx, sy)
+          end
 
-                if (p.inc[:hue] or p.inc[:saturation] or p.inc[:brightness])
-                  # ITERATE COLOR
-                  if (p.inc[:hue])
-                    newhue = (c.hue + choose(p.inc[:hue])) % 1
-                    c.hue(newhue)
-                  end
-                  if (p.inc[:saturation])
-                    newsat = (c.saturation + choose(p.inc[:saturation]))
-                    c.saturation(newsat)
-                  end
-                  if (p.inc[:brightness])
-                    newbright = (c.brightness + choose(p.inc[:brightness]))
-                    c.brightness(newbright)
-                  end
-                  if (p.inc[:alpha])
-                    newalpha = (c.a + choose(p.inc[:alpha]))
-                    c.a(newalpha)
-                  end
-                  p.rand[kind] = c
+          new_state do
+            # PICK AND ADJUST FILL/STROKE COLORS:
+            [:fill,:stroke].each do |kind|
+              # PICK A COLOR
+              if (p.inc[kind]) then
+                # increment color from array
+                colorindex = i % p.inc[kind].size
+                c = p.inc[kind][colorindex].copy
+              else
+                c = p.rand[kind]
+                case c
+                when Array
+                  c = choose(c).copy
+                when Color
+                  c = c.copy
                 else
-                  # RANDOMIZE COLOR
-                  c.hue(choose(p.rand[:hue])) if p.rand[:hue]
-                  c.saturation(choose(p.rand[:saturation])) if p.rand[:saturation]
-                  c.brightness(choose(p.rand[:brightness])) if p.rand[:brightness]
+                  next
                 end
-
-                # APPLY COLOR
-                fill(c) if kind == :fill
-                stroke(c) if kind == :stroke
               end
-              # choose a stroke width from the range
-              strokewidth(choose(p.rand[:strokewidth])) if p.rand[:strokewidth]
-              # choose an alpha level from the range
-              alpha(choose(p.rand[:alpha])) if p.rand[:alpha]
-
-              # RANDOMIZE TRANSFORM:
-              # translate x, y
-              translate(choose(p.rand[:x]), choose(p.rand[:y]))
-              # choose a rotation factor from the range
-              rotate(choose(p.rand[:rotation]))
-              # choose a scaling factor from the range
-              sc = choose(p.rand[:scale])
-              sx = choose(p.rand[:scalex]) * sc
-              sy = p.rand[:scaley] ? choose(p.rand[:scaley]) * sc : sx * sc
-              scale(sx,sy)
-
-              # DRAW
-              if (tx > 0 || ty > 0)
-                translate(tx, ty)
+
+              if (p.inc[:hue] or p.inc[:saturation] or p.inc[:brightness])
+                # ITERATE COLOR
+                if (p.inc[:hue])
+                  newhue = (c.hue + choose(p.inc[:hue])) % 1
+                  c.hue(newhue)
+                end
+                if (p.inc[:saturation])
+                  newsat = (c.saturation + choose(p.inc[:saturation]))
+                  c.saturation(newsat)
+                end
+                if (p.inc[:brightness])
+                  newbright = (c.brightness + choose(p.inc[:brightness]))
+                  c.brightness(newbright)
+                end
+                if (p.inc[:alpha])
+                  newalpha = (c.a + choose(p.inc[:alpha]))
+                  c.a(newalpha)
+                end
+                p.rand[kind] = c
+              else
+                # RANDOMIZE COLOR
+                c.hue(choose(p.rand[:hue])) if p.rand[:hue]
+                c.saturation(choose(p.rand[:saturation])) if p.rand[:saturation]
+                c.brightness(choose(p.rand[:brightness])) if p.rand[:brightness]
               end
 
-              CGContextAddPath(@ctx, p.path) if p.class == Path
-              CGContextDrawPath(@ctx, KCGPathFillStroke) # apply fill and stroke
+              # APPLY COLOR
+              fill(c) if kind == :fill
+              stroke(c) if kind == :stroke
+            end
+            # choose a stroke width from the range
+            strokewidth(choose(p.rand[:strokewidth])) if p.rand[:strokewidth]
+            # choose an alpha level from the range
+            alpha(choose(p.rand[:alpha])) if p.rand[:alpha]
 
-              # if there's an image, draw it clipped by the path
-              if (p.image)
-                beginclip(p)
-                image(p.image)
-                endclip
-              end
+            # RANDOMIZE TRANSFORM:
+            # translate x, y
+            translate(choose(p.rand[:x]), choose(p.rand[:y]))
+            # choose a rotation factor from the range
+            rotate(choose(p.rand[:rotation]))
+            # choose a scaling factor from the range
+            sc = choose(p.rand[:scale])
+            sx = choose(p.rand[:scalex]) * sc
+            sy = p.rand[:scaley] ? choose(p.rand[:scaley]) * sc : sx * sc
+            scale(sx,sy)
 
+            # DRAW
+            if (tx > 0 || ty > 0)
+              translate(tx, ty)
             end
+
+            CGContextAddPath(@ctx, p.path) if p.class == Path
+            CGContextDrawPath(@ctx, KCGPathFillStroke) # apply fill and stroke
+
+            # if there's an image, draw it clipped by the path
+            if (p.image)
+              beginclip(p)
+              image(p.image)
+              endclip
+            end
+
           end
         end
       end
-      
-      # DRAWING IMAGES ON CANVAS
-
-      # draw the specified image at x,y with dimensions w,h.
-      # "img" may be a path to an image, or an Image instance
-      def draw_image(img, x=0, y=0, w=nil, h=nil, pagenum=1)
-        new_state do
-          if (img.kind_of?(Pdf))
-            w ||= img.width(pagenum)
-            h ||= img.height(pagenum)
-            if(@registration == :center)
-              x = x - w / 2
-              y = y - h / 2
-            end
-            img.draw(@ctx, x, y, w, h, pagenum)
-          elsif(img.kind_of?(String) || img.kind_of?(Image))
-            img = Image.new(img) if img.kind_of?(String)
-            w ||= img.width
-            h ||= img.height
-            img.draw(@ctx, x, y, w, h)
-          else
-            raise ArgumentError.new("canvas.image: not a recognized image type: #{img.class}")
+    end
+
+    # DRAWING IMAGES ON CANVAS
+
+    # draw the specified image at x,y with dimensions w,h.
+    # "img" may be a path to an image, or an Image instance
+    def draw_image(img, x=0, y=0, w=nil, h=nil, pagenum=1)
+      new_state do
+        if (img.kind_of?(Pdf))
+          w ||= img.width(pagenum)
+          h ||= img.height(pagenum)
+          if(@registration == :center)
+            x = x - w / 2
+            y = y - h / 2
           end
+          img.draw(@ctx, x, y, w, h, pagenum)
+        elsif(img.kind_of?(String) || img.kind_of?(Image))
+          img = Image.new(img) if img.kind_of?(String)
+          w ||= img.width
+          h ||= img.height
+          img.draw(@ctx, x, y, w, h)
+        else
+          raise ArgumentError.new("canvas.image: not a recognized image type: #{img.class}")
         end
       end
-      
-  
+    end
   end
-
 end