Rename make-colour-rgb to rgb, similar for cmy

2 files changed, 25 insertions, 25 deletions

diff --git a/guile/starlet/colours.scm b/guile/starlet/colours.scm
index 37c19dc..cf71567 100644
--- a/guile/starlet/colours.scm
+++ b/guile/starlet/colours.scm
@@ -23,8 +23,8 @@
   #:use-module (ice-9 exceptions)
   #:export (<colour>
              colour?
-             make-colour-cmy
-             make-colour-rgb
+             cmy
+             rgb
              colour-as-cmy
              colour-as-rgb
              colour-as-rgbw
@@ -80,26 +80,26 @@
 
 (define-method (write (col <colour>) port)
   (let ((cmy (colour-as-cmy col)))
-    (format port "(make-colour-cmy ~a ~a ~a)"
+    (format port "(cmy ~a ~a ~a)"
             (three-sf (cyan cmy))
             (three-sf (magenta cmy))
             (three-sf (yellow cmy)))))
 
 
-(define (make-colour-cmy c m y)
+(define (cmy c m y)
   (make <colour>
         #:type 'cmy
         #:value (list c m y)))
 
 
-(define (make-colour-rgb r g b)
+(define (rgb r g b)
   (make <colour>
         #:type 'rgb
         #:value (list r g b)))
 
 
 (define white
-  (make-colour-cmy 0 0 0))
+  (cmy 0 0 0))
 
 
 (define (colour-as-rgb col)
@@ -150,7 +150,7 @@
 (define (interpolate-cmy a b frac)
   (let ((cmy1 (colour-as-cmy a))
         (cmy2 (colour-as-cmy b)))
-    (make-colour-cmy
+    (cmy
       (+ (cyan cmy1) (* frac (- (cyan cmy2) (cyan cmy1))))
       (+ (magenta cmy1) (* frac (- (magenta cmy2) (magenta cmy1))))
       (+ (yellow cmy1) (* frac (- (yellow cmy2) (yellow cmy1)))))))
diff --git a/guile/starlet/state.scm b/guile/starlet/state.scm
index d4c42d0..1ac67b5 100644
--- a/guile/starlet/state.scm
+++ b/guile/starlet/state.scm
@@ -119,49 +119,49 @@
       ((eq? colour-component 'cyan)
        (let ((orig-colour (colour-as-cmy current-colour)))
          (set-in-state! state fix 'colour
-                        (make-colour-cmy new-val
-                                         (magenta orig-colour)
-                                         (yellow orig-colour))
+                        (cmy new-val
+                             (magenta orig-colour)
+                             (yellow orig-colour))
                         source)))
 
       ((eq? colour-component 'magenta)
        (let ((orig-colour (colour-as-cmy current-colour)))
          (set-in-state! state fix 'colour
-                        (make-colour-cmy (cyan orig-colour)
-                                         new-val
-                                         (yellow orig-colour))
+                        (cmy (cyan orig-colour)
+                             new-val
+                             (yellow orig-colour))
                         source)))
 
       ((eq? colour-component 'yellow)
        (let ((orig-colour (colour-as-cmy current-colour)))
          (set-in-state! state fix 'colour
-                        (make-colour-cmy (cyan orig-colour)
-                                         (magenta orig-colour)
-                                         new-val)
+                        (cmy (cyan orig-colour)
+                             (magenta orig-colour)
+                             new-val)
                         source)))
 
       ((eq? colour-component 'red)
        (let ((orig-colour (colour-as-rgb current-colour)))
          (set-in-state! state fix 'colour
-                        (make-colour-rgb new-val
-                                         (green orig-colour)
-                                         (blue orig-colour))
+                        (rgb new-val
+                             (green orig-colour)
+                             (blue orig-colour))
                         source)))
 
       ((eq? colour-component 'green)
        (let ((orig-colour (colour-as-rgb current-colour)))
          (set-in-state! state fix 'colour
-                        (make-colour-rgb (red orig-colour)
-                                         new-val
-                                         (blue orig-colour))
+                        (rgb (red orig-colour)
+                             new-val
+                             (blue orig-colour))
                         source)))
 
       ((eq? colour-component 'blue)
        (let ((orig-colour (colour-as-rgb current-colour)))
          (set-in-state! state fix 'colour
-                        (make-colour-rgb (red orig-colour)
-                                         (green orig-colour)
-                                         new-val)
+                        (rgb (red orig-colour)
+                             (green orig-colour)
+                             new-val)
                         source))))))