diff --git a/collects/slideshow/core.ss b/collects/slideshow/core.ss index 288085dfc7..ca718f4456 100644 --- a/collects/slideshow/core.ss +++ b/collects/slideshow/core.ss @@ -53,6 +53,8 @@ 'swiss)) (define current-main-font (make-parameter main-font)) + (define current-line-sep (make-parameter line-sep)) + (when (not (and (= use-screen-w screen-w) (= use-screen-h screen-h) (= pixel-scale 1))) @@ -100,7 +102,7 @@ (parameterize ([current-main-font f]) (k))) - (define (tt* . l) (apply vl-append line-sep (map tt l))) + (define (tt* . l) (apply vl-append (current-line-sep) (map tt l))) (define bullet (if (send (dc-for-text-size) glyph-exists? #\u2022) (t "\u2022") @@ -544,12 +546,12 @@ (if (null? rest) p (v-append - line-sep + (current-line-sep) p (loop #f rest null)))] [else (v-append - line-sep + (current-line-sep) pre (loop p rest null))]))]))) diff --git a/collects/slideshow/doc.txt b/collects/slideshow/doc.txt index 362b6b35f5..15ad1b557c 100644 --- a/collects/slideshow/doc.txt +++ b/collects/slideshow/doc.txt @@ -470,12 +470,14 @@ Procedure Reference > current-font-size - Parameter for the font size used by `t', etc., initialized to `font-size'. -> line-sep - Amount of separating between paragraph lines. +> current-line-sep - Parameter for the amount of separation between + paragraph lines. +> line-sep - Default for `current-line-sep'. > title-size - Font size used for slide titles, derived from `font-size'. -> main-font - Font specification used for `t' by default > current-main-font - Parameter for the font specification used for `t'. Its argument must be a text-style (see texpict for details). +> main-font - Defaultfor `current-main-font' > current-title-color - Parameter for the color used by titles/`titlet' > (with-font f thunk) - Calls `thunk' with diff --git a/collects/slideshow/sig.ss b/collects/slideshow/sig.ss index 2a63f335a5..f832391ddd 100644 --- a/collects/slideshow/sig.ss +++ b/collects/slideshow/sig.ss @@ -58,7 +58,7 @@ itemize itemize* page-itemize page-itemize* para para* page-para page-para* para/c para/r para*/c para*/r page-para/c page-para/r page-para*/c page-para*/r - font-size gap-size current-font-size line-sep title-size + font-size gap-size current-font-size current-line-sep line-sep title-size main-font current-main-font with-font current-title-color red green blue purple orange size-in-pixels t it bt bit tt titlet tt* rt diff --git a/collects/slideshow/slide.ss b/collects/slideshow/slide.ss index 0b5b4c2009..c56943e9df 100644 --- a/collects/slideshow/slide.ss +++ b/collects/slideshow/slide.ss @@ -85,7 +85,7 @@ itemize itemize* page-itemize page-itemize* para para* page-para page-para* para/c para/r para*/c para*/r page-para/c page-para/r page-para*/c page-para*/r - font-size gap-size current-font-size line-sep title-size + font-size gap-size current-font-size current-line-sep line-sep title-size main-font current-main-font with-font current-title-color red green blue purple orange size-in-pixels t it bt bit tt titlet tt* rt