From b4ef1b29e9b61055bdd138bd745d294792b5fb4c Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Fri, 5 Oct 2007 23:12:20 +0000
Subject: [PATCH] finish up and doc new bit of animation support in Slideshow

svn: r7435
---
 collects/slideshow/core.ss  | 12 ++++++++----
 collects/slideshow/doc.txt  |  8 ++++++++
 collects/slideshow/sig.ss   |  2 ++
 collects/slideshow/slide.ss |  2 ++
 collects/texpict/doc.txt    |  7 +++++++
 5 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/collects/slideshow/core.ss b/collects/slideshow/core.ss
index 9a3437673c..827add3211 100644
--- a/collects/slideshow/core.ss
+++ b/collects/slideshow/core.ss
@@ -361,17 +361,20 @@
       (define (slide/name/tall/inset s inset . x)
 	(apply slide/title/tall/inset (make-name-only s) inset x))
 
-      (define (slide/title/tall/gap v-sep s . x)
-	(apply do-slide/title/tall/inset do-add-slide! #t #t values v-sep s zero-inset #f x))
+      (define (slide/title/tall/gap v-sep s timeout . x)
+	(apply do-slide/title/tall/inset do-add-slide! #t #t values v-sep s zero-inset timeout x))
 
       (define (slide/title/tall s . x)
-	(apply slide/title/tall/gap gap-size s x))
+	(apply slide/title/tall/gap gap-size s #f x))
 
       (define (slide/name/tall s . x)
 	(apply slide/title/tall (make-name-only s) x))
 
       (define (slide/title s . x)
-	(apply slide/title/tall/gap (* 2 gap-size) s x))
+	(apply slide/title/tall/gap (* 2 gap-size) s #f x))
+
+      (define (slide/title/timeout s timeout . x)
+	(apply slide/title/tall/gap (* 2 gap-size) s timeout x))
 
       (define (slide/name s . x)
 	(apply slide/title (make-name-only s) x))
@@ -427,6 +430,7 @@
 	(apply slide/title/center (make-name-only s) x))
 
       (define (slide . x) (apply slide/title #f x))
+      (define (slide/timeout timeout . x) (apply slide/title/timeout #f timeout x))
       (define (slide/inset inset . x) (apply slide/title/inset #f inset x))
 
       (define (slide/center . x) (apply slide/title/center #f x))
diff --git a/collects/slideshow/doc.txt b/collects/slideshow/doc.txt
index bea1c321fc..af74d1373d 100644
--- a/collects/slideshow/doc.txt
+++ b/collects/slideshow/doc.txt
@@ -348,6 +348,14 @@ Procedure Reference
   the top of the slide. The content area is therefore the same size as
   `client-page'.
 
+> (slide/timeout secs element ...)
+> (slide/center/timeout secs element ...)
+> (slide/title/timeout title-string secs element ...)
+> (slide/title/center/timeout title-string secs element ...)
+  Like the versions without `/timeout', but if the slide is not
+  advanced before `secs' seconds, it advances automatically.
+  Also, manual advances (forward or backward) skip the slide.
+
 > (make-slide-inset left-inset top-inset right-inset bottom-inset) -
   Creates a slide inset, which describes a number of pixels to inset
   a slide on each side. Each inset must be an exact, non-negative
diff --git a/collects/slideshow/sig.ss b/collects/slideshow/sig.ss
index 1bfe832e98..0d716d14ff 100644
--- a/collects/slideshow/sig.ss
+++ b/collects/slideshow/sig.ss
@@ -49,6 +49,8 @@
      slide/name/inset
      slide/name/tall/inset
      slide/name/center/inset
+     slide/timeout
+     slide/title/timeout
      slide/center/timeout
      slide/title/center/timeout
      
diff --git a/collects/slideshow/slide.ss b/collects/slideshow/slide.ss
index c54a3f383f..eaf5a0864b 100644
--- a/collects/slideshow/slide.ss
+++ b/collects/slideshow/slide.ss
@@ -101,6 +101,8 @@
 	   title-h get-title-h set-title-h! current-slide-assembler
 	   current-page-number-font current-page-number-color 
 	   set-page-numbers-visible! done-making-slides
+           slide/timeout
+           slide/title/timeout
            slide/center/timeout
            slide/title/center/timeout)
   (provide/contract [clickback 
diff --git a/collects/texpict/doc.txt b/collects/texpict/doc.txt
index 402d987d73..5e8643e3fe 100644
--- a/collects/texpict/doc.txt
+++ b/collects/texpict/doc.txt
@@ -489,6 +489,13 @@ Drawing Adjusters:
    red, green, and blue components of the color.
       [MrEd only]
 
+>  (cellophane pict opacity) -> pict
+
+   Makes the given pict semi-transparent, where an opacity of 0.0 is
+   fully transparent, and an opacity of 1.0 is fully opaque.  See
+   `set-alpha' of dc<%> for information about the contexts and cases
+   when semi-transparent drawing works.
+
 >  (clip pict)
 
    Clips a pict to its bounding box.