From 26be10e348d19ac5b373cc63c8e0c4bc9b39786a Mon Sep 17 00:00:00 2001
From: Ludovic Courtès
Date: Thu, 29 Nov 2007 18:02:09 +0100
Subject: Clean up `color' module.

* src/guile/skribilo/color.scm (*used-colors*): Remove.
  (*skribe-rgb-alist*): Rename to...
  (%rgb-alist): New.
  (skribe-color->rgb): Rename to...
  (color->rgb): New.
  (skribe-get-used-colors, skribe-use-color!): Remove.
  Update users.

* src/guile/skribilo/utils/compat.scm (skribe-color->rgb,
  skribe-use-color!, skribe-get-used-colors): New.
---
 src/guile/skribilo/package/slide.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/guile/skribilo/package/slide.scm')

diff --git a/src/guile/skribilo/package/slide.scm b/src/guile/skribilo/package/slide.scm
index b00efa2..5a62a20 100644
--- a/src/guile/skribilo/package/slide.scm
+++ b/src/guile/skribilo/package/slide.scm
@@ -28,7 +28,6 @@
   :use-module (skribilo engine)
   :use-module (skribilo evaluator) ;; `*load-options*'
 
-  :autoload   (skribilo color)          (skribe-use-color!)
   :autoload   (skribilo utils keywords) (the-options the-body)
 
   :use-module (srfi srfi-1)
@@ -213,7 +212,7 @@
 	  (ident ident)
 	  (class class)
           (loc   &invocation-location)
-	  (options `((:color ,(if color (skribe-use-color! color) #f))
+	  (options `((:color ,color)
 		     ,@(the-options opt :color)))
 	  (body (the-body opt)))))
 
@@ -226,15 +225,15 @@
       (for-each (lambda (lbl)
 		   (match lbl
 		      ((id col)
-		       (skribe-use-color! col))))
+		       col)))
 		body)
       (new markup
 	 (markup 'slide-play*)
 	 (ident ident)
 	 (class class)
          (loc   &invocation-location)
-	 (options `((:color ,(if color (skribe-use-color! color) #f))
-		    (:scolor ,(if color (skribe-use-color! scolor) #f))
+	 (options `((:color ,color)
+		    (:scolor ,scolor)
 		    ,@(the-options opt :color :scolor)))
 	 (body body))))
 
-- 
cgit v1.2.3