From 8dae35d46bfb71721e4633ca4966008093b622c1 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 24 Feb 2009 17:29:46 +0000 Subject: [PATCH] fix pin-curve, etc. to better match pin-line svn: r13819 --- collects/scribblings/slideshow/picts.scrbl | 12 ++++++------ collects/slideshow/pict.ss | 9 +++------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/collects/scribblings/slideshow/picts.scrbl b/collects/scribblings/slideshow/picts.scrbl index 49290ba55e..144560068e 100644 --- a/collects/scribblings/slideshow/picts.scrbl +++ b/collects/scribblings/slideshow/picts.scrbl @@ -319,7 +319,8 @@ the existing @scheme[pict] drawing, instead of on top. If @scheme[solid?] is false, then the arrowheads are hollow instead of filled.} -@defproc*[([(pin-curve [pict pict?] +@defproc*[([(pin-curve [arrow-size real? 12] + [pict pict?] [src pict-path?] [find-src (pict? pict-path? . -> . (values real? real?))] [dest pict-path?] @@ -328,12 +329,12 @@ filled.} [#:end-angle end-angle (or/c real? #f) #f] [#:start-pull start-pull (or/c real? #f) #f] [#:end-pull end-pull (or/c real? #f) #f] - [#:arrow-size arrow-size real? 12] [#:line-width line-width (or/c #f real?) #f] [#:color color (or/c #f string? (is-a/c? color%)) #f] [#:under? under? any/c #f]) pict?] - [(pin-arrow-curve [pict pict?] + [(pin-arrow-curve [arrow-size real? 12] + [pict pict?] [src pict-path?] [find-src (pict? pict-path? . -> . (values real? real?))] [dest pict-path?] @@ -342,13 +343,13 @@ filled.} [#:end-angle end-angle (or/c real? #f) #f] [#:start-pull start-pull (or/c real? #f) #f] [#:end-pull end-pull (or/c real? #f) #f] - [#:arrow-size arrow-size real? 12] [#:line-width line-width (or/c #f real?) #f] [#:color color (or/c #f string? (is-a/c? color%)) #f] [#:under? under? any/c #f] [#:solid? solid? any/c #t]) pict?] - [(pin-arrows-curve [pict pict?] + [(pin-arrows-curve [arrow-size real? 12] + [pict pict?] [src pict-path?] [find-src (pict? pict-path? . -> . (values real? real?))] [dest pict-path?] @@ -357,7 +358,6 @@ filled.} [#:end-angle end-angle (or/c real? #f) #f] [#:start-pull start-pull (or/c real? #f) #f] [#:end-pull end-pull (or/c real? #f) #f] - [#:arrow-size arrow-size real? 12] [#:line-width line-width (or/c #f real?) #f] [#:color color (or/c #f string? (is-a/c? color%)) #f] [#:under? under? any/c #f] diff --git a/collects/slideshow/pict.ss b/collects/slideshow/pict.ss index df56955529..81281cdd2e 100644 --- a/collects/slideshow/pict.ss +++ b/collects/slideshow/pict.ss @@ -73,12 +73,11 @@ #f #f #f solid?)) p lw col under?)) - (define (pin-curve p + (define (pin-curve sz p src src-find dest dest-find #:start-angle [sa #f] #:end-angle [ea #f] #:start-pull [sp #f] #:end-pull [ep #f] - #:arrow-size [sz 12] #:color [col #f] #:line-width [lw #f] #:under? [under? #f] @@ -86,12 +85,11 @@ (pin-curve* #f #f p src src-find dest dest-find sa ea sp ep sz col lw under? #t)) - (define (pin-arrow-curve p + (define (pin-arrow-curve sz p src src-find dest dest-find #:start-angle [sa #f] #:end-angle [ea #f] #:start-pull [sp #f] #:end-pull [ep #f] - #:arrow-size [sz 12] #:color [col #f] #:line-width [lw #f] #:under? [under? #f] @@ -99,12 +97,11 @@ (pin-curve* #f #t p src src-find dest dest-find sa ea sp ep sz col lw under? solid?)) - (define (pin-arrows-curve p + (define (pin-arrows-curve sz p src src-find dest dest-find #:start-angle [sa #f] #:end-angle [ea #f] #:start-pull [sp #f] #:end-pull [ep #f] - #:arrow-size [sz 12] #:color [col #f] #:line-width [lw #f] #:under? [under? #f]