0
@@ -196,19 +196,25 @@ module Prawn
0
     # 
0
     #   pdf.fill_color "f0ffc1"
0
     #
0
-    def fill_color(color)
0
+    def fill_color(color=nil)
0
+      return @fill_color unless color
0
       @fill_color = color
0
       set_fill_color     
0
-    end                                                                      
0
+    end 
0
+    
0
+    alias_method :fill_color=, :fill_color                                                                     
0
     
0
     # Sets the line stroking color.  6 digit HTML color codes are used.
0
     #
0
     #   pdf.stroke_color "cc2fde"
0
     #
0
-    def stroke_color(color) 
0
+    def stroke_color(color=nil) 
0
+      return @stroke_color unless color
0
       @stroke_color = color
0
       set_stroke_color
0
-    end
0
+    end   
0
+    
0
+    alias_method :stroke_color=, :stroke_color
0
     
0
     # Strokes and closes the current path.
0
     #
0
@@ -265,9 +271,11 @@ module Prawn
0
       add_content "%.3f %.3f %.3f RG" %  [r / 255.0, g / 255.0, b / 255.0]       
0
     end                                       
0
     
0
-    def update_colors                                         
0
-      set_fill_color   if @fill_color
0
-      set_stroke_color if @stroke_color
0
+    def update_colors 
0
+      @fill_color   ||= "000000"
0
+      @stroke_color ||= "000000"                                       
0
+      set_fill_color
0
+      set_stroke_color
0
     end
0
 
0
   end

0
@@ -177,29 +177,28 @@ module Prawn
0
 
0
         # TODO: This is a bit of a hack and can be cleaned up
0
         if @background_color
0
-          old_fill_color, old_stroke_color = 
0
-           @document.instance_eval { [@fill_color, @stroke_color] }
0
-          @document.fill_color @background_color
0
-          @document.stroke_color @background_color
0
-
0
-          @document.canvas do
0
-            case border_style
0
-            when :all
0
-              point = [x,y-border]
0
-              h = height - border
0
-            when :no_top
0
-              point = [x,y-border/2.0]  
0
-              h     = height - border / 2.0
0
-            else
0
-              point = [x,y-border/2.0]
0
-              h     = height
0
-           end
0
+
0
+          @document.mask(:fill_color, :stroke_color) do
0
+            @document.fill_color = @background_color
0
+            @document.stroke_color = @background_color
0
+
0
+            @document.canvas do
0
+              case border_style
0
+              when :all
0
+                point = [x,y-border]
0
+                h = height - border
0
+              when :no_top
0
+                point = [x,y-border/2.0]  
0
+                h     = height - border / 2.0
0
+              else
0
+                point = [x,y-border/2.0]
0
+                h     = height
0
+             end
0
                     
0
-            @document.fill_and_stroke_rectangle point, width, h
0
-          end
0
+              @document.fill_and_stroke_rectangle point, width, h
0
+            end
0
+          end   
0
 
0
-          @document.fill_color old_fill_color || "000000"
0
-          @document.stroke_color old_stroke_color || "000000"
0
         end
0
 
0
         @cells.each do |e|