disk, circle: Use size instead of radius.

1 files changed, 18 insertions, 17 deletions

diff --git a/pict.scm b/pict.scm
index bc33314..be95ef0 100644
--- a/pict.scm
+++ b/pict.scm
@@ -479,28 +479,29 @@ strings that are built from the list of attributes LST."
 (define* (filled-octagon size #:key (color "black"))
   (remove-outline (fill (octagon size) color)))
 
-(define* (circle radius
+(define* (circle size
                  #:key
                  (border-color "black")
                  (border-width 1))
-  (make-pict
-   `(svg (@ (width ,(* 2 radius))
-            (height ,(* 2 radius))
-            (x 0)
-            (y 0))
-         (circle (@ (style ,(style-list->string
-                             `(("fill" "none")
-                               ("stroke" ,border-color)
-                               ("stroke-width"
-                                ,(number->string border-width)))))
-                    (cx ,radius)
-                    (cy ,radius)
-                    (r  ,radius))))))
-
-(define* (disk radius
+  (let ((radius (- (/ size 2) border-width)))
+    (make-pict
+     `(svg (@ (width ,size)
+              (height ,size)
+              (x 0)
+              (y 0))
+           (circle (@ (style ,(style-list->string
+                               `(("fill" "none")
+                                 ("stroke" ,border-color)
+                                 ("stroke-width"
+                                  ,(number->string border-width)))))
+                      (cx ,(+ radius border-width))
+                      (cy ,(+ radius border-width))
+                      (r  ,radius)))))))
+
+(define* (disk size
                #:key
                (color "black"))
-  (remove-outline (fill (circle radius) color)))
+  (fill (circle size #:border-width 0 #:border-color "none") color))
 
 (define* (ellipse w h
                   #:key