diff options
author | Ludovic Courtès | 2007-11-29 18:02:09 +0100 |
---|---|---|
committer | Ludovic Courtès | 2007-11-29 18:02:09 +0100 |
commit | 26be10e348d19ac5b373cc63c8e0c4bc9b39786a (patch) | |
tree | 045686c5203408d82fa67fbeb8759119d60a7bd9 /src/guile/skribilo/package/slide.scm | |
parent | 57e103394f1500eb7ad21c350638e6481a4fb9d6 (diff) | |
download | skribilo-26be10e348d19ac5b373cc63c8e0c4bc9b39786a.tar.gz skribilo-26be10e348d19ac5b373cc63c8e0c4bc9b39786a.tar.lz skribilo-26be10e348d19ac5b373cc63c8e0c4bc9b39786a.zip |
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.
Diffstat (limited to 'src/guile/skribilo/package/slide.scm')
-rw-r--r-- | src/guile/skribilo/package/slide.scm | 9 |
1 files changed, 4 insertions, 5 deletions
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)))) |