From 1547638f3b9346040246a88bd5acaa02bbbb9160 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 16 Mar 2009 13:13:34 +0000 Subject: [PATCH] allow pict-pat on pin-arrow-line, etc. (PR 9934): should merge to 4.1.5 svn: r14126 --- collects/texpict/utils.ss | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/collects/texpict/utils.ss b/collects/texpict/utils.ss index 71ef173391..d353a200a6 100644 --- a/collects/texpict/utils.ss +++ b/collects/texpict/utils.ss @@ -56,19 +56,25 @@ clip hyperlinkize) + + (define (pict-path? p) + (or (pict? p) + (and (pair? p) + (list? p) + (andmap pict? p)))) (provide/contract [pin-line (->* (pict? - pict? (-> pict? pict? (values number? number?)) - pict? (-> pict? pict? (values number? number?))) + pict-path? (-> pict? pict-path? (values number? number?)) + pict-path? (-> pict? pict-path? (values number? number?))) ((or/c false/c number?) (or/c false/c string?) boolean?) pict?)] [pin-arrow-line (->* (number? pict? - pict? (-> pict? pict? (values number? number?)) - pict? (-> pict? pict? (values number? number?))) + pict-path? (-> pict? pict-path? (values number? number?)) + pict-path? (-> pict? pict-path? (values number? number?))) ((or/c false/c number?) (or/c false/c string?) boolean? @@ -76,8 +82,8 @@ #:hide-arrowhead? any/c) pict?)] [pin-arrows-line (->* (number? pict? - pict? (-> pict? pict? (values number? number?)) - pict? (-> pict? pict? (values number? number?))) + pict-path? (-> pict? pict-path? (values number? number?)) + pict-path? (-> pict? pict-path? (values number? number?))) ((or/c false/c number?) (or/c false/c string?) boolean?