From 3e51bc71995e7a830d7d68ef6b16dd53e64049ee Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Sun, 8 Nov 2009 23:29:19 +0000 Subject: [PATCH] fixed up text svn: r16625 --- collects/2htdp/private/image-more.ss | 4 ++-- .../teachpack/2htdp/scribblings/image-toc.ss | 6 ++++-- .../teachpack/2htdp/scribblings/image-util.ss | 3 ++- .../teachpack/2htdp/scribblings/image.scrbl | 12 +++++++++--- .../teachpack/2htdp/scribblings/img/20.png | Bin 2037 -> 2161 bytes .../teachpack/2htdp/scribblings/img/30.png | Bin 990 -> 1007 bytes collects/tests/2htdp/test-image.ss | 11 +++++++++++ 7 files changed, 28 insertions(+), 8 deletions(-) diff --git a/collects/2htdp/private/image-more.ss b/collects/2htdp/private/image-more.ss index a183c8d033..0488d78b63 100644 --- a/collects/2htdp/private/image-more.ss +++ b/collects/2htdp/private/image-more.ss @@ -680,9 +680,9 @@ (define (mk-single-text letter font-size color face family style weight underline) (let ([text (make-text letter 0 1 color font-size face family style weight underline)]) - (let-values ([(w h a d) (send text-sizing-bm get-text-extent letter (text->font text))]) + (let-values ([(w h d a) (send text-sizing-bm get-text-extent letter (text->font text))]) (make-image text - (make-bb w h d) + (make-bb w h (- h d)) #f)))) (define/chk (triangle side-length mode color) diff --git a/collects/teachpack/2htdp/scribblings/image-toc.ss b/collects/teachpack/2htdp/scribblings/image-toc.ss index 83cb660056..adb30f486f 100644 --- a/collects/teachpack/2htdp/scribblings/image-toc.ss +++ b/collects/teachpack/2htdp/scribblings/image-toc.ss @@ -92,9 +92,11 @@ (list '(overlay (ellipse 10 10 "solid" "red") - (ellipse 30 30 "solid" "black") + (ellipse 20 20 "solid" "black") + (ellipse 30 30 "solid" "red") + (ellipse 40 40 "solid" "black") (ellipse 50 50 "solid" "red") - (ellipse 70 70 "solid" "black")) + (ellipse 60 60 "solid" "black")) "20.png") (list '(overlay diff --git a/collects/teachpack/2htdp/scribblings/image-util.ss b/collects/teachpack/2htdp/scribblings/image-util.ss index cc2b8c088b..53a3e8d9c0 100644 --- a/collects/teachpack/2htdp/scribblings/image-util.ss +++ b/collects/teachpack/2htdp/scribblings/image-util.ss @@ -46,5 +46,6 @@ [fn (cadr fn)] [else - (fprintf (current-error-port) "exp->filename: unknown exp ~s\n" exp) + (unless (getenv "PLTSHOWIMAGES") + (fprintf (current-error-port) "exp->filename: unknown exp ~s\n" exp)) "unk.png"]))) diff --git a/collects/teachpack/2htdp/scribblings/image.scrbl b/collects/teachpack/2htdp/scribblings/image.scrbl index 2ed3b7e91e..b66ba7e7fe 100644 --- a/collects/teachpack/2htdp/scribblings/image.scrbl +++ b/collects/teachpack/2htdp/scribblings/image.scrbl @@ -129,7 +129,7 @@ Existing images can be rotated, scaled, and overlaid on top of each other. based on the @scheme[family] is chosen. The @scheme[style] controls if the face is italic or not (under Windows and Mac OS X, @scheme['slant] and @scheme['italic] are the same), the @scheme[weight] controls if it is boldface (or light), and @scheme[underline?] - determines if the face is underlined. For more details on these arguments, see @scheme[face%], + determines if the face is underlined. For more details on these arguments, see @scheme[font%], which ultimately is what this code uses to draw the font. @image-examples[(text/font "Hello" 24 "olive" @@ -151,9 +151,11 @@ Existing images can be rotated, scaled, and overlaid on top of each other. @image-examples[(overlay (ellipse 60 30 "solid" "purple") (rectangle 30 60 "solid" "orange")) (overlay (ellipse 10 10 "solid" "red") - (ellipse 30 30 "solid" "black") + (ellipse 20 20 "solid" "black") + (ellipse 30 30 "solid" "red") + (ellipse 40 40 "solid" "black") (ellipse 50 50 "solid" "red") - (ellipse 70 70 "solid" "black"))] + (ellipse 60 60 "solid" "black"))] } @@ -325,6 +327,10 @@ This section lists predicates for the basic structures provided by the image lib @scheme['center], @scheme["baseline"], or @scheme['baseline]. + +The baseline of an image is the place where the bottoms any letters line up, not counting descenders, e.g. the tail on ``y'' or ``g'' or ``j''. + + } @defproc[(x-place? [x any/c]) boolean?]{ diff --git a/collects/teachpack/2htdp/scribblings/img/20.png b/collects/teachpack/2htdp/scribblings/img/20.png index 782032484f2bbd31959fc32e35161ce2b1974e06..c7a53e79ba366bf6b7f245a6cbb91a57434a17c9 100644 GIT binary patch literal 2161 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