@@ -99,12 +99,12 @@
 ;;    inst
 ;;    (vg:drawing-apply-scale drawing lstxy)))
 
 ;; make a rectangle obj
 ;;
-(define (vg:make-rect x1 y1 x2 y2 #!key (line-color #f)(fill-color #f))
-  (make-vg:obj type: 'r pts: (list x1 y1 x2 y2) text: #f line-color: line-color fill-color: fill-color))
+(define (vg:make-rect x1 y1 x2 y2 #!key (line-color #f)(fill-color #f)(text #f)(font #f))
+  (make-vg:obj type: 'r pts: (list x1 y1 x2 y2) text: text font: font line-color: line-color fill-color: fill-color))
 
 ;; make a text obj
 ;;
 (define (vg:make-text x1 y1 text #!key (line-color #f)(fill-color #f)
 		      (angle #f)(scale-with-zoom #f)(font #f)
@@ -228,11 +228,11 @@
     (else #f)))
 
 ;; given a drawing and a inst map a rectangle to it screen coordinates
 ;;
 (define (vg:map-rect drawing inst obj)
-  (let ((res (make-vg:obj type:       'r
+  (let ((res (make-vg:obj type:       'r ;; is there a defstruct copy?
 			  fill-color: (vg:obj-fill-color obj)
 			  text:       (vg:obj-text       obj)
 			  line-color: (vg:obj-line-color obj)
 			  font:       (vg:obj-font       obj)))
 	(pts (vg:obj-pts obj)))
@@ -311,16 +311,18 @@
 (define (vg:draw-rect drawing obj #!key (draw #t))
   (let* ((cnv (vg:drawing-cnv drawing))
 	 (pts (vg:drawing-apply-scale drawing (vg:obj-pts obj)))
 	 (fill-color (vg:obj-fill-color obj))
 	 (line-color (vg:obj-line-color obj))
-	 (llx (car pts))
-	 (lly (cadr pts))
-	 (ulx (caddr pts))
-	 (uly (cadddr pts))
-	 (w   (- ulx llx))
-	 (h   (- uly lly)))
+	 (text       (vg:obj-text obj))
+	 (font       (vg:obj-font obj))
+	 (llx        (car pts))
+	 (lly        (cadr pts))
+	 (ulx        (caddr pts))
+	 (uly        (cadddr pts))
+	 (w          (- ulx llx))
+	 (h          (- uly lly)))
     (if draw 
 	(let ((prev-background-color (canvas-background cnv))
 	      (prev-foreground-color (canvas-foreground cnv)))
 	  (if fill-color
 	      (begin
@@ -329,11 +331,17 @@
 	  (if line-color
 	      (canvas-foreground-set! cnv line-color)
 	      (if fill-color
 		  (canvas-foreground-set! cnv prev-foreground-color)))
 	  (canvas-rectangle! cnv llx ulx lly uly)
-	  (canvas-foreground-set! cnv prev-foreground-color)))
+	  (canvas-foreground-set! cnv prev-foreground-color)
+	  (if text 
+	      (let* ((prev-font    (canvas-font cnv))
+		     (font-changed (and font (not (equal? font prev-font)))))
+		(if font-changed (canvas-font-set! cnv font))
+		(canvas-text! cnv (+ 2 llx)(+ 2 lly) text)
+		(if font-changed (canvas-font-set! cnv prev-font))))))
     pts)) ;; return extents 
 
 ;; given a rect obj draw it on the canvas applying first the drawing
 ;; scale and offset
 ;;