Merge branch 'development'

Conflicts:
	colors.lisp

colors.lisp

@@ -152,10 +152,8 @@ combination is in the positive or negative direction on the color wheel."
 ;;; macros used by the autogenerated files
 
 (defmacro define-rgb-color (name red green blue)
-  "Macro for defining and automatically exporting color constants.  Used by
-the automatically generated color file."
+  "Macro for defining color constants.  Used by the automatically generated color file."
   (let ((constant-name (symbolicate #\+ name #\+)))
     `(progn
-       (defparameter ,constant-name (rgb ,red ,green ,blue)
-         ,(format nil "X11 color ~A." name))
-       (export ',constant-name))))
+       (define-constant ,constant-name (rgb ,red ,green ,blue)
+         :test #'equalp :documentation ,(format nil "X11 color ~A." name)))))

package-template.lisp

@@ -0,0 +1,17 @@
+;;; -*- Mode:Lisp; Syntax:ANSI-Common-Lisp; -*-
+
+(in-package #:common-lisp-user)
+
+(defpackage #:cl-colors
+  (:use #:alexandria
+        #:common-lisp
+        #:let-plus)
+  (:export
+   #:rgb #:rgb-red #:rgb-green #:rgb-blue #:gray #:&rgb
+   #:hsv #:hsv-hue #:hsv-saturation #:hsv-value #:&hsv
+   #:rgb-to-hsv #:hsv-to-rgb #:hex-to-rgb #:as-hsv #:as-rgb
+   #:rgb-combination #:hsv-combination
+   #:parse-hex-rgb #:print-hex-rgb
+
+   ;; predefined color names
+~A))