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/engine | |
| 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/engine')
| -rw-r--r-- | src/guile/skribilo/engine/context.scm | 7 | ||||
| -rw-r--r-- | src/guile/skribilo/engine/latex.scm | 5 | ||||
| -rw-r--r-- | src/guile/skribilo/engine/lout.scm | 4 |
3 files changed, 7 insertions, 9 deletions
diff --git a/src/guile/skribilo/engine/context.scm b/src/guile/skribilo/engine/context.scm index 4a47b3a..c56c9cf 100644 --- a/src/guile/skribilo/engine/context.scm +++ b/src/guile/skribilo/engine/context.scm @@ -31,9 +31,8 @@ :autoload (skribilo utils images) (convert-image) :autoload (skribilo evaluator) (evaluate-document) :autoload (skribilo output) (output *document-being-output*) - :autoload (skribilo color) (skribe-color->rgb - document-used-colors - skribe-use-color!) + :autoload (skribilo color) (color->rgb + document-used-colors) :autoload (skribilo config) (skribilo-release) :use-module (ice-9 optargs) :use-module (ice-9 receive) @@ -356,7 +355,7 @@ ;;; ====================================================================== (define (skribe-color->context-color spec) (receive (r g b) - (skribe-color->rgb spec) + (color->rgb spec) (let ((ff (exact->inexact #xff))) (format #f "r=~a,g=~a,b=~a" (number->string (/ r ff)) diff --git a/src/guile/skribilo/engine/latex.scm b/src/guile/skribilo/engine/latex.scm index 727f127..bb7e15e 100644 --- a/src/guile/skribilo/engine/latex.scm +++ b/src/guile/skribilo/engine/latex.scm @@ -32,8 +32,7 @@ :autoload (skribilo evaluator) (evaluate-document) :autoload (skribilo output) (output) :autoload (skribilo debug) (*debug*) - :autoload (skribilo color) (skribe-color->rgb - skribe-use-color!) + :autoload (skribilo color) (color->rgb) :use-module (srfi srfi-13) :use-module (ice-9 optargs) :use-module (ice-9 receive) @@ -457,7 +456,7 @@ ;*---------------------------------------------------------------------*/ (define (skribe-color->latex-rgb spec) (receive (r g b) - (skribe-color->rgb spec) + (color->rgb spec) (cond ((and (= r 0) (= g 0) (= b 0)) "0.,0.,0.") diff --git a/src/guile/skribilo/engine/lout.scm b/src/guile/skribilo/engine/lout.scm index d0819bf..6be8546 100644 --- a/src/guile/skribilo/engine/lout.scm +++ b/src/guile/skribilo/engine/lout.scm @@ -32,7 +32,7 @@ :autoload (skribilo utils images) (convert-image) :autoload (skribilo evaluator) (evaluate-document) :autoload (skribilo output) (output) - :autoload (skribilo color) (skribe-color->rgb) + :autoload (skribilo color) (color->rgb) :use-module (srfi srfi-1) :use-module (srfi srfi-2) :use-module (srfi srfi-11) @@ -997,7 +997,7 @@ 16) skribe-color))) (let-values (((r g b) - (skribe-color->rgb actual-color))) + (color->rgb actual-color))) (apply format #f (cons "rgb ~a ~a ~a" (map (if b&w? |