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/base.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/base.scm')
| -rw-r--r-- | src/guile/skribilo/package/base.scm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/guile/skribilo/package/base.scm b/src/guile/skribilo/package/base.scm index 66f1df1..a4443dc 100644 --- a/src/guile/skribilo/package/base.scm +++ b/src/guile/skribilo/package/base.scm @@ -1,7 +1,7 @@ ;;; base.scm -- The base markup package of Skribe/Skribilo. ;;; +;;; Copyright 2005, 2006, 2007 Ludovic Courtès <ludo@gnu.org> ;;; Copyright 2003, 2004 Manuel Serrano -;;; Copyright 2005, 2006, 2007 Ludovic Courtès <ludovic.courtes@laas.fr> ;;; ;;; ;;; This program is free software; you can redistribute it and/or modify @@ -35,7 +35,6 @@ ;; optional ``sub-packages'' :autoload (skribilo biblio) (*bib-table* resolve-bib bib-load! bib-add! bib-sort-refs/number) - :autoload (skribilo color) (skribe-use-color!) :autoload (skribilo source) (language? source-read-lines source-fontify) :autoload (skribilo prog) (make-prog-body resolve-line) :autoload (skribilo index) (make-index-table default-index) @@ -394,8 +393,8 @@ (class class) (loc &invocation-location) (required-options '(:bg :fg :width)) - (options `((:bg ,(if bg (skribe-use-color! bg) bg)) - (:fg ,(if fg (skribe-use-color! fg) fg)) + (options `((:bg ,bg) + (:fg ,fg) ,@(the-options opts :ident :class :bg :fg))) (body (the-body opts)))) @@ -754,7 +753,7 @@ (class class) (loc &invocation-location) (required-options '()) - (options `(,@(if bg `((:bg ,(if bg (skribe-use-color! bg) bg))) '()) + (options `(,@(if bg `((:bg ,bg)) '()) ,@(the-options opts :ident :class :bg))) (body (parse-list-of 'tr 'tc (the-body opts))))) @@ -801,7 +800,7 @@ (:valign ,valign) (:colspan ,colspan) ,@(if bg - `((:bg ,(if bg (skribe-use-color! bg) bg))) + `((:bg ,bg)) '()) ,@(the-options opts :ident :class :bg :align :valign))) (body (the-body opts))))))) |