summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Court`es2006-10-23 08:33:00 +0000
committerLudovic Court`es2006-10-23 08:33:00 +0000
commit41d2f26a602bc3bc71756b6fab7d53e7d875df55 (patch)
tree9ee2b6c53d9f50139e9f373ee4f7095fd2ba2922
parent7639d83aaa159c6b34d8b3c4a06d0634679ab9f1 (diff)
parentadb2f652cd8d6075f0718a19f4942f6b5b573d07 (diff)
downloadskribilo-41d2f26a602bc3bc71756b6fab7d53e7d875df55.tar.gz
skribilo-41d2f26a602bc3bc71756b6fab7d53e7d875df55.tar.lz
skribilo-41d2f26a602bc3bc71756b6fab7d53e7d875df55.zip
Merge from skribilo@sv.gnu.org--2006
Patches applied: * lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2 (patch 79) - color.scm: Added support for `lightred'. :-) * skribilo@sv.gnu.org--2006/skribilo--devo--1.2 (base, patch 1-6) - tag of lcourtes@laas.fr--2005-libre/skribilo--devo--1.2--patch-59 - slide: Propagate the `outline?' parameter in `slide-(sub)?topic'. - Lout engine: Honor `date-line' for slides. - prog: Fixed line number output (`&prog-line'). - doc: Fixed the Fibonacci example in ``Computer Programs''. - Lout engine: Honor `inline-definitions-proc'. - color.scm: Added support for `lightred'. :-) git-archimport-id: lcourtes@laas.fr--2005-libre/skribilo--devo--1.2--patch-65
-rw-r--r--ChangeLog13
-rw-r--r--src/guile/skribilo/color.scm3
2 files changed, 15 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c805653..9b5753b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,19 @@
# arch-tag: automatic-ChangeLog--lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2
#
+2006-10-16 21:09:47 GMT Ludovic Courtes <ludovic.courtes@laas.fr> patch-79
+
+ Summary:
+ color.scm: Added support for `lightred'. :-)
+ Revision:
+ skribilo--devel--1.2--patch-79
+
+ * src/guile/skribilo/color.scm (*skribe-rgb-alist*): Added `lightred'.
+
+ modified files:
+ ChangeLog src/guile/skribilo/color.scm
+
+
2006-09-04 09:15:58 GMT Ludovic Courtes <ludovic.courtes@laas.fr> patch-74
Summary:
diff --git a/src/guile/skribilo/color.scm b/src/guile/skribilo/color.scm
index 8b6205f..6b3aa7b 100644
--- a/src/guile/skribilo/color.scm
+++ b/src/guile/skribilo/color.scm
@@ -571,7 +571,8 @@
("darkcyan" . "0 139 139")
("darkmagenta" . "139 0 139")
("darkred" . "139 0 0")
- ("lightgreen" . "144 238 144")))
+ ("lightgreen" . "144 238 144")
+ ("lightred" . "255 127 127")))
(define (%convert-color str)