diff --git a/collects/2htdp/image.ss b/collects/2htdp/image.ss index c697d9e380..25c2426037 100644 --- a/collects/2htdp/image.ss +++ b/collects/2htdp/image.ss @@ -56,8 +56,8 @@ and they all have good sample contracts. (It is amazing what we can do with kids beside beside/places - ;above - ;above/places + above + above/places rotate frame diff --git a/collects/2htdp/private/image-more.ss b/collects/2htdp/private/image-more.ss index 86d9f5b9d0..a5c7a2d729 100644 --- a/collects/2htdp/private/image-more.ss +++ b/collects/2htdp/private/image-more.ss @@ -386,8 +386,33 @@ (cdr rst)))]))) ;; above : image image image ... -> image -;; above/places : string I I I ... -> I -;; like beside, but vertically +;; places images in a single vertical row, left aligned +(define/chk (above image1 image2 . image3) + (above/internal 'left image1 (cons image2 image3))) + +;; beside/places : string image image image ... -> image +;; places images in a horizontal row where the vertical alignment is +;; covered by the string argument +(define/chk (above/places x-place image1 image2 . image3) + (above/internal x-place image1 (cons image2 image3))) + +(define (above/internal x-place fst rst) + (let loop ([fst fst] + [rst rst]) + (cond + [(null? rst) fst] + [else + (let* ([snd (car rst)] + [fst-x-spot (find-x-spot x-place fst)] + [snd-x-spot (find-x-spot x-place (car rst))] + [dx (- fst-x-spot snd-x-spot)]) + (loop (overlay/δ fst + (if (< dx 0) (- dx) 0) + 0 + (car rst) + (if (< dx 0) 0 dx) + (image-bottom fst)) + (cdr rst)))]))) ; @@ -842,9 +867,10 @@ (provide overlay overlay/places overlay/xy - beside beside/places + above + above/places rotate diff --git a/collects/teachpack/2htdp/scribblings/image-toc.ss b/collects/teachpack/2htdp/scribblings/image-toc.ss index 7c4e3a8f3b..50cec9712f 100644 --- a/collects/teachpack/2htdp/scribblings/image-toc.ss +++ b/collects/teachpack/2htdp/scribblings/image-toc.ss @@ -28,21 +28,47 @@ (ellipse 20 30 "solid" "slateblue") (ellipse 20 10 "solid" "navy")) 'image - "33aaed94.png") - (list '(frame (ellipse 20 20 "outline" "black")) 'image "b3e371c.png") - (list '(ellipse 60 60 "solid" "blue") 'image "80c7ec4.png") - (list '(scale/xy 3 2 (ellipse 20 30 "solid" "blue")) 'image "1bebb5af.png") - (list '(ellipse 40 60 "solid" "blue") 'image "3f9b7651.png") - (list '(scale 2 (ellipse 20 30 "solid" "blue")) 'image "1a14c856.png") - (list '(rotate 5 (rectangle 50 50 "outline" "black")) 'image "24e78945.png") + "101f7aee.png") + (list '(frame (ellipse 20 20 "outline" "black")) 'image "fe8415.png") + (list '(ellipse 60 60 "solid" "blue") 'image "21849ba8.png") + (list '(scale/xy 3 2 (ellipse 20 30 "solid" "blue")) 'image "209d169e.png") + (list '(ellipse 40 60 "solid" "blue") 'image "3a36050a.png") + (list '(scale 2 (ellipse 20 30 "solid" "blue")) 'image "24575fbb.png") + (list '(rotate 5 (rectangle 50 50 "outline" "black")) 'image "15a961ce.png") (list '(rotate 45 (ellipse 60 20 "solid" "olivedrab")) 'image - "36abd0a6.png") + "3d04f6fd.png") + (list + '(above/places + "center" + (ellipse 70 20 "solid" "yellowgreen") + (ellipse 50 20 "solid" "olivedrab") + (ellipse 30 20 "solid" "darkolivegreen") + (ellipse 10 20 "solid" "darkgreen")) + 'image + "36ef7bca.png") + (list + '(above/places + "right" + (ellipse 70 20 "solid" "gold") + (ellipse 50 20 "solid" "goldenrod") + (ellipse 30 20 "solid" "darkgoldenrod") + (ellipse 10 20 "solid" "sienna")) + 'image + "23f846d.png") + (list + '(above + (ellipse 70 20 "solid" "gray") + (ellipse 50 20 "solid" "darkgray") + (ellipse 30 20 "solid" "dimgray") + (ellipse 10 20 "solid" "black")) + 'image + "2d2a2d07.png") (list '(beside/places "baseline" (text "ijy" 18 "black") (text "ijy" 24 "black")) 'image - "128db302.png") + "3e8ce4fa.png") (list '(beside/places "center" @@ -51,7 +77,7 @@ (ellipse 20 30 "solid" "purple") (ellipse 20 10 "solid" "indigo")) 'image - "120469a1.png") + "2f5a1e0f.png") (list '(beside/places "bottom" @@ -60,7 +86,7 @@ (ellipse 20 30 "solid" "slateblue") (ellipse 20 10 "solid" "navy")) 'image - "1cdad38e.png") + "22d7c488.png") (list '(beside (ellipse 20 70 "solid" "gray") @@ -68,7 +94,7 @@ (ellipse 20 30 "solid" "dimgray") (ellipse 20 10 "solid" "black")) 'image - "5965553.png") + "2821cf32.png") (list '(overlay/xy (rectangle 10 10 "solid" "red") @@ -76,7 +102,7 @@ -10 (rectangle 10 10 "solid" "black")) 'image - "2e92034e.png") + "19758cc2.png") (list '(overlay/xy (rectangle 10 10 "solid" "red") @@ -84,7 +110,7 @@ 10 (rectangle 10 10 "solid" "black")) 'image - "107a175b.png") + "234ab918.png") (list '(overlay/xy (rectangle 10 10 "outline" "red") @@ -92,7 +118,7 @@ 0 (rectangle 10 10 "outline" "black")) 'image - "f404e3c.png") + "153ef52.png") (list '(overlay/xy (ellipse 40 40 "outline" "black") @@ -100,7 +126,7 @@ 25 (ellipse 10 10 "solid" "forestgreen")) 'image - "28fdf75c.png") + "171dc432.png") (list '(overlay/places "right" @@ -110,7 +136,7 @@ (rectangle 40 40 "solid" "red") (rectangle 50 50 "solid" "black")) 'image - "1331b42e.png") + "2a64c8fc.png") (list '(overlay/places "middle" @@ -118,7 +144,7 @@ (rectangle 30 60 "solid" "orange") (ellipse 60 30 "solid" "purple")) 'image - "10078cfc.png") + "31d2c2a.png") (list '(overlay (ellipse 10 10 "solid" "red") @@ -128,27 +154,27 @@ (ellipse 50 50 "solid" "red") (ellipse 60 60 "solid" "black")) 'image - "975b778.png") + "9369ffc.png") (list '(overlay (ellipse 60 30 "solid" "purple") (rectangle 30 60 "solid" "orange")) 'image - "cd2e82.png") + "2854877a.png") (list '(text/font "not really a link" 18 "blue" #f 'roman 'normal 'normal #t) 'image - "11536865.png") + "33752adc.png") (list '(text/font "Goodbye" 18 "indigo" #f 'modern 'italic 'normal #f) 'image - "2c27a4ab.png") + "4abf45f.png") (list '(text/font "Hello" 24 "olive" "Gill Sans" 'swiss 'normal 'bold #f) 'image - "3a5f8054.png") - (list '(text "Goodbye" 36 "indigo") 'image "f6b7cc9.png") - (list '(text "Hello" 24 "olive") 'image "116768e2.png") + "6d66aef.png") + (list '(text "Goodbye" 36 "indigo") 'image "3f338d3a.png") + (list '(text "Hello" 24 "olive") 'image "382436e0.png") (list '(add-line (ellipse 80 60 "outline" "darkolivegreen") @@ -158,45 +184,45 @@ (+ 30 (* 30 (sin (* pi 5/4)))) "darkolivegreen") 'image - "3c068285.png") + "39450ab.png") (list '(add-line (ellipse 40 40 "outline" "maroon") 0 40 40 0 "maroon") 'image - "370a84fa.png") - (list '(line 30 -20 "red") 'image "35ca3e57.png") - (list '(line -30 20 "red") 'image "149f7bed.png") - (list '(line 30 30 "black") 'image "216299fe.png") + "30639356.png") + (list '(line 30 -20 "red") 'image "260e5662.png") + (list '(line -30 20 "red") 'image "316a330b.png") + (list '(line 30 30 "black") 'image "6ad4614.png") (list '(star-polygon 20 10 3 "solid" "cornflowerblue") 'image - "1564e03e.png") - (list '(star-polygon 40 7 3 "outline" "darkred") 'image "33ded4e2.png") - (list '(star-polygon 40 5 2 "solid" "seagreen") 'image "35eefac.png") - (list '(star 40 "solid" "gray") 'image "194b0e44.png") - (list '(regular-polygon 20 8 "solid" "red") 'image "1343ddbd.png") - (list '(regular-polygon 40 4 "outline" "blue") 'image "36dc3be7.png") - (list '(regular-polygon 50 3 "outline" "red") 'image "110659e0.png") - (list '(rhombus 80 150 "solid" "mediumpurple") 'image "1817baf0.png") - (list '(rhombus 40 45 "solid" "magenta") 'image "eab359b.png") - (list '(rectangle 20 40 "solid" "blue") 'image "3f241026.png") - (list '(rectangle 40 20 "outline" "black") 'image "2c0ddeae.png") - (list '(square 50 "outline" "darkmagenta") 'image "97be4d.png") - (list '(square 40 "solid" "slateblue") 'image "5da309d.png") + "38814728.png") + (list '(star-polygon 40 7 3 "outline" "darkred") 'image "2f234f2e.png") + (list '(star-polygon 40 5 2 "solid" "seagreen") 'image "1176673d.png") + (list '(star 40 "solid" "gray") 'image "350feeaa.png") + (list '(regular-polygon 20 8 "solid" "red") 'image "ff15c8e.png") + (list '(regular-polygon 40 4 "outline" "blue") 'image "d27a587.png") + (list '(regular-polygon 50 3 "outline" "red") 'image "5dc8ec6.png") + (list '(rhombus 80 150 "solid" "mediumpurple") 'image "69207aa.png") + (list '(rhombus 40 45 "solid" "magenta") 'image "8a14504.png") + (list '(rectangle 20 40 "solid" "blue") 'image "1e727939.png") + (list '(rectangle 40 20 "outline" "black") 'image "30572a1c.png") + (list '(square 50 "outline" "darkmagenta") 'image "2cad7a84.png") + (list '(square 40 "solid" "slateblue") 'image "2ee6db0a.png") (list '(isosceles-triangle 60 330 "solid" "lightseagreen") 'image - "2fa1cd58.png") + "175cca09.png") (list '(isosceles-triangle 60 30 "solid" "aquamarine") 'image - "1ea53369.png") + "3f15cd12.png") (list '(isosceles-triangle 200 170 "solid" "seagreen") 'image - "1a19d76d.png") - (list '(right-triangle 36 48 "solid" "black") 'image "17923882.png") - (list '(triangle 40 "solid" "tan") 'image "264fff73.png") - (list '(ellipse 20 40 "solid" "blue") 'image "33bc4cc8.png") - (list '(ellipse 40 20 "outline" "black") 'image "3603dbc6.png") - (list '(circle 20 "solid" "blue") 'image "90999b2.png") - (list '(circle 30 "outline" "red") 'image "115c97e6.png"))) + "117fbb0d.png") + (list '(right-triangle 36 48 "solid" "black") 'image "28384a91.png") + (list '(triangle 40 "solid" "tan") 'image "3fb58822.png") + (list '(ellipse 20 40 "solid" "blue") 'image "4bfb85c.png") + (list '(ellipse 40 20 "outline" "black") 'image "118c2c14.png") + (list '(circle 20 "solid" "blue") 'image "2496a152.png") + (list '(circle 30 "outline" "red") 'image "3f0d4b2.png"))) diff --git a/collects/teachpack/2htdp/scribblings/image.scrbl b/collects/teachpack/2htdp/scribblings/image.scrbl index 1610fd0781..7608ec1178 100644 --- a/collects/teachpack/2htdp/scribblings/image.scrbl +++ b/collects/teachpack/2htdp/scribblings/image.scrbl @@ -319,6 +319,40 @@ other. The top and bottom pair of angles is @scheme[angle] and the left and righ } + +@defproc[(above [i1 image?] [i2 image?] [is image?] ...) image?]{ + Constructs an image by placing all of the argument images in a + vertical row, aligned along their left edges. + + @image-examples[(above (ellipse 70 20 "solid" "gray") + (ellipse 50 20 "solid" "darkgray") + (ellipse 30 20 "solid" "dimgray") + (ellipse 10 20 "solid" "black"))] + + + } + +@defproc[(above/places [y-place y-place?] [i1 image?] [i2 image?] [is image?] ...) image?]{ + Constructs an image by placing all of the argument images in a vertical row, lined + up as indicated by the @scheme[x-place] argument. For example, if @scheme[x-place] + is @scheme["middle"], then the images are placed above each other with their centers + lined up. + + @image-examples[(above/places "right" + (ellipse 70 20 "solid" "gold") + (ellipse 50 20 "solid" "goldenrod") + (ellipse 30 20 "solid" "darkgoldenrod") + (ellipse 10 20 "solid" "sienna")) + + (above/places "center" + (ellipse 70 20 "solid" "yellowgreen") + (ellipse 50 20 "solid" "olivedrab") + (ellipse 30 20 "solid" "darkolivegreen") + (ellipse 10 20 "solid" "darkgreen"))] + + + } + @section{Rotating, Scaling, and Framing Images} @defproc[(rotate [angle angle?] [image image?]) image?]{ diff --git a/collects/teachpack/2htdp/scribblings/img/10078cfc.png b/collects/teachpack/2htdp/scribblings/img/10078cfc.png deleted file mode 100644 index 699793483d..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/10078cfc.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/101f7aee.png b/collects/teachpack/2htdp/scribblings/img/101f7aee.png new file mode 100644 index 0000000000..12adfdabfc Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/101f7aee.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/107a175b.png b/collects/teachpack/2htdp/scribblings/img/107a175b.png deleted file mode 100644 index 6ecebf4d7e..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/107a175b.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/110659e0.png b/collects/teachpack/2htdp/scribblings/img/110659e0.png deleted file mode 100644 index 419e0ebcc7..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/110659e0.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/11536865.png b/collects/teachpack/2htdp/scribblings/img/11536865.png deleted file mode 100644 index 32e97fb0fd..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/11536865.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/115c97e6.png b/collects/teachpack/2htdp/scribblings/img/115c97e6.png deleted file mode 100644 index 3be5f40092..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/115c97e6.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/116768e2.png b/collects/teachpack/2htdp/scribblings/img/116768e2.png deleted file mode 100644 index faeb22e0d6..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/116768e2.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/1176673d.png b/collects/teachpack/2htdp/scribblings/img/1176673d.png new file mode 100644 index 0000000000..af23c00a64 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/1176673d.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/117fbb0d.png b/collects/teachpack/2htdp/scribblings/img/117fbb0d.png new file mode 100644 index 0000000000..e650be6e69 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/117fbb0d.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/118c2c14.png b/collects/teachpack/2htdp/scribblings/img/118c2c14.png new file mode 100644 index 0000000000..b7991ba733 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/118c2c14.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/120469a1.png b/collects/teachpack/2htdp/scribblings/img/120469a1.png deleted file mode 100644 index 5a40e1c91f..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/120469a1.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/128db302.png b/collects/teachpack/2htdp/scribblings/img/128db302.png deleted file mode 100644 index 642c76872e..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/128db302.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/1331b42e.png b/collects/teachpack/2htdp/scribblings/img/1331b42e.png deleted file mode 100644 index ccf681af8d..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/1331b42e.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/1343ddbd.png b/collects/teachpack/2htdp/scribblings/img/1343ddbd.png deleted file mode 100644 index f8f6a0b22a..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/1343ddbd.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/149f7bed.png b/collects/teachpack/2htdp/scribblings/img/149f7bed.png deleted file mode 100644 index c0cb686d8a..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/149f7bed.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/153ef52.png b/collects/teachpack/2htdp/scribblings/img/153ef52.png new file mode 100644 index 0000000000..60a97a2408 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/153ef52.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/1564e03e.png b/collects/teachpack/2htdp/scribblings/img/1564e03e.png deleted file mode 100644 index bca40f1df7..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/1564e03e.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/15a961ce.png b/collects/teachpack/2htdp/scribblings/img/15a961ce.png new file mode 100644 index 0000000000..7322f66859 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/15a961ce.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/171dc432.png b/collects/teachpack/2htdp/scribblings/img/171dc432.png new file mode 100644 index 0000000000..841284164b Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/171dc432.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/175cca09.png b/collects/teachpack/2htdp/scribblings/img/175cca09.png new file mode 100644 index 0000000000..44d0e23667 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/175cca09.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/17923882.png b/collects/teachpack/2htdp/scribblings/img/17923882.png deleted file mode 100644 index 4f493ae5de..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/17923882.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/1817baf0.png b/collects/teachpack/2htdp/scribblings/img/1817baf0.png deleted file mode 100644 index 47b5a22a31..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/1817baf0.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/194b0e44.png b/collects/teachpack/2htdp/scribblings/img/194b0e44.png deleted file mode 100644 index d18e479f50..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/194b0e44.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/19758cc2.png b/collects/teachpack/2htdp/scribblings/img/19758cc2.png new file mode 100644 index 0000000000..2b68c09f35 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/19758cc2.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/1a14c856.png b/collects/teachpack/2htdp/scribblings/img/1a14c856.png deleted file mode 100644 index b7251087dc..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/1a14c856.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/1a19d76d.png b/collects/teachpack/2htdp/scribblings/img/1a19d76d.png deleted file mode 100644 index e93f84df13..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/1a19d76d.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/1bebb5af.png b/collects/teachpack/2htdp/scribblings/img/1bebb5af.png deleted file mode 100644 index 3f184495d2..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/1bebb5af.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/1cdad38e.png b/collects/teachpack/2htdp/scribblings/img/1cdad38e.png deleted file mode 100644 index 8e0087d366..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/1cdad38e.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/1e727939.png b/collects/teachpack/2htdp/scribblings/img/1e727939.png new file mode 100644 index 0000000000..3b61141be6 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/1e727939.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/1ea53369.png b/collects/teachpack/2htdp/scribblings/img/1ea53369.png deleted file mode 100644 index 1fd5d93d55..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/1ea53369.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/209d169e.png b/collects/teachpack/2htdp/scribblings/img/209d169e.png new file mode 100644 index 0000000000..5051608ba5 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/209d169e.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/216299fe.png b/collects/teachpack/2htdp/scribblings/img/216299fe.png deleted file mode 100644 index cfabacdc92..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/216299fe.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/21849ba8.png b/collects/teachpack/2htdp/scribblings/img/21849ba8.png new file mode 100644 index 0000000000..5051608ba5 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/21849ba8.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/22d7c488.png b/collects/teachpack/2htdp/scribblings/img/22d7c488.png new file mode 100644 index 0000000000..99a2eca320 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/22d7c488.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/234ab918.png b/collects/teachpack/2htdp/scribblings/img/234ab918.png new file mode 100644 index 0000000000..79bb91c201 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/234ab918.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/23f846d.png b/collects/teachpack/2htdp/scribblings/img/23f846d.png new file mode 100644 index 0000000000..83f9deb887 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/23f846d.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/24575fbb.png b/collects/teachpack/2htdp/scribblings/img/24575fbb.png new file mode 100644 index 0000000000..26ebdc8f87 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/24575fbb.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/2496a152.png b/collects/teachpack/2htdp/scribblings/img/2496a152.png new file mode 100644 index 0000000000..8d9a9a112c Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/2496a152.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/24e78945.png b/collects/teachpack/2htdp/scribblings/img/24e78945.png deleted file mode 100644 index e13d1cbf45..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/24e78945.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/260e5662.png b/collects/teachpack/2htdp/scribblings/img/260e5662.png new file mode 100644 index 0000000000..df5da613c9 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/260e5662.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/264fff73.png b/collects/teachpack/2htdp/scribblings/img/264fff73.png deleted file mode 100644 index 8324d511c7..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/264fff73.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/2821cf32.png b/collects/teachpack/2htdp/scribblings/img/2821cf32.png new file mode 100644 index 0000000000..08e8736666 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/2821cf32.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/28384a91.png b/collects/teachpack/2htdp/scribblings/img/28384a91.png new file mode 100644 index 0000000000..47c9606c83 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/28384a91.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/2854877a.png b/collects/teachpack/2htdp/scribblings/img/2854877a.png new file mode 100644 index 0000000000..e5bec8f1d1 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/2854877a.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/28fdf75c.png b/collects/teachpack/2htdp/scribblings/img/28fdf75c.png deleted file mode 100644 index 6b722603b2..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/28fdf75c.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/2a64c8fc.png b/collects/teachpack/2htdp/scribblings/img/2a64c8fc.png new file mode 100644 index 0000000000..755b55bf26 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/2a64c8fc.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/2c0ddeae.png b/collects/teachpack/2htdp/scribblings/img/2c0ddeae.png deleted file mode 100644 index ee9e64901d..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/2c0ddeae.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/2c27a4ab.png b/collects/teachpack/2htdp/scribblings/img/2c27a4ab.png deleted file mode 100644 index 0d98e92b40..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/2c27a4ab.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/2cad7a84.png b/collects/teachpack/2htdp/scribblings/img/2cad7a84.png new file mode 100644 index 0000000000..e7aaad3eb2 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/2cad7a84.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/2d2a2d07.png b/collects/teachpack/2htdp/scribblings/img/2d2a2d07.png new file mode 100644 index 0000000000..73be916e42 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/2d2a2d07.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/2e92034e.png b/collects/teachpack/2htdp/scribblings/img/2e92034e.png deleted file mode 100644 index 3efd53971f..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/2e92034e.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/2ee6db0a.png b/collects/teachpack/2htdp/scribblings/img/2ee6db0a.png new file mode 100644 index 0000000000..ba63077485 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/2ee6db0a.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/2f234f2e.png b/collects/teachpack/2htdp/scribblings/img/2f234f2e.png new file mode 100644 index 0000000000..b7ee277187 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/2f234f2e.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/2f5a1e0f.png b/collects/teachpack/2htdp/scribblings/img/2f5a1e0f.png new file mode 100644 index 0000000000..9c4330165b Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/2f5a1e0f.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/2fa1cd58.png b/collects/teachpack/2htdp/scribblings/img/2fa1cd58.png deleted file mode 100644 index 96188e8df1..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/2fa1cd58.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/30572a1c.png b/collects/teachpack/2htdp/scribblings/img/30572a1c.png new file mode 100644 index 0000000000..02ac08dccb Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/30572a1c.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/30639356.png b/collects/teachpack/2htdp/scribblings/img/30639356.png new file mode 100644 index 0000000000..fcfcb653d3 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/30639356.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/316a330b.png b/collects/teachpack/2htdp/scribblings/img/316a330b.png new file mode 100644 index 0000000000..df5da613c9 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/316a330b.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/31d2c2a.png b/collects/teachpack/2htdp/scribblings/img/31d2c2a.png new file mode 100644 index 0000000000..aab464a076 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/31d2c2a.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/33752adc.png b/collects/teachpack/2htdp/scribblings/img/33752adc.png new file mode 100644 index 0000000000..f1985bc035 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/33752adc.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/33aaed94.png b/collects/teachpack/2htdp/scribblings/img/33aaed94.png deleted file mode 100644 index 01b14884a7..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/33aaed94.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/33bc4cc8.png b/collects/teachpack/2htdp/scribblings/img/33bc4cc8.png deleted file mode 100644 index 2120aa2bb9..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/33bc4cc8.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/33ded4e2.png b/collects/teachpack/2htdp/scribblings/img/33ded4e2.png deleted file mode 100644 index 8863bca869..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/33ded4e2.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/350feeaa.png b/collects/teachpack/2htdp/scribblings/img/350feeaa.png new file mode 100644 index 0000000000..dbbf37c78f Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/350feeaa.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/35ca3e57.png b/collects/teachpack/2htdp/scribblings/img/35ca3e57.png deleted file mode 100644 index c0cb686d8a..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/35ca3e57.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/35eefac.png b/collects/teachpack/2htdp/scribblings/img/35eefac.png deleted file mode 100644 index f62f5b0d10..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/35eefac.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/3603dbc6.png b/collects/teachpack/2htdp/scribblings/img/3603dbc6.png deleted file mode 100644 index e4a42684b4..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/3603dbc6.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/36abd0a6.png b/collects/teachpack/2htdp/scribblings/img/36abd0a6.png deleted file mode 100644 index b65f82c9e0..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/36abd0a6.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/36dc3be7.png b/collects/teachpack/2htdp/scribblings/img/36dc3be7.png deleted file mode 100644 index f26f88da69..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/36dc3be7.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/36ef7bca.png b/collects/teachpack/2htdp/scribblings/img/36ef7bca.png new file mode 100644 index 0000000000..8117a8b7b1 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/36ef7bca.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/370a84fa.png b/collects/teachpack/2htdp/scribblings/img/370a84fa.png deleted file mode 100644 index 54574602fb..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/370a84fa.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/382436e0.png b/collects/teachpack/2htdp/scribblings/img/382436e0.png new file mode 100644 index 0000000000..cd170b1c51 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/382436e0.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/38814728.png b/collects/teachpack/2htdp/scribblings/img/38814728.png new file mode 100644 index 0000000000..ee1f8e9d9f Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/38814728.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/39450ab.png b/collects/teachpack/2htdp/scribblings/img/39450ab.png new file mode 100644 index 0000000000..920180f964 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/39450ab.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/3a36050a.png b/collects/teachpack/2htdp/scribblings/img/3a36050a.png new file mode 100644 index 0000000000..26ebdc8f87 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/3a36050a.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/3a5f8054.png b/collects/teachpack/2htdp/scribblings/img/3a5f8054.png deleted file mode 100644 index ceed37389f..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/3a5f8054.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/3c068285.png b/collects/teachpack/2htdp/scribblings/img/3c068285.png deleted file mode 100644 index 632e9293ac..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/3c068285.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/3d04f6fd.png b/collects/teachpack/2htdp/scribblings/img/3d04f6fd.png new file mode 100644 index 0000000000..5cc44ce573 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/3d04f6fd.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/3e8ce4fa.png b/collects/teachpack/2htdp/scribblings/img/3e8ce4fa.png new file mode 100644 index 0000000000..8e2f621748 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/3e8ce4fa.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/3f0d4b2.png b/collects/teachpack/2htdp/scribblings/img/3f0d4b2.png new file mode 100644 index 0000000000..0dd50084e1 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/3f0d4b2.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/3f15cd12.png b/collects/teachpack/2htdp/scribblings/img/3f15cd12.png new file mode 100644 index 0000000000..a2bf256127 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/3f15cd12.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/3f241026.png b/collects/teachpack/2htdp/scribblings/img/3f241026.png deleted file mode 100644 index 6c34d4d5c6..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/3f241026.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/3f338d3a.png b/collects/teachpack/2htdp/scribblings/img/3f338d3a.png new file mode 100644 index 0000000000..b2593ebe1a Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/3f338d3a.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/3f9b7651.png b/collects/teachpack/2htdp/scribblings/img/3f9b7651.png deleted file mode 100644 index b7251087dc..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/3f9b7651.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/3fb58822.png b/collects/teachpack/2htdp/scribblings/img/3fb58822.png new file mode 100644 index 0000000000..d2acf6703a Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/3fb58822.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/4abf45f.png b/collects/teachpack/2htdp/scribblings/img/4abf45f.png new file mode 100644 index 0000000000..43659d6e16 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/4abf45f.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/4bfb85c.png b/collects/teachpack/2htdp/scribblings/img/4bfb85c.png new file mode 100644 index 0000000000..6203b7f95b Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/4bfb85c.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/5965553.png b/collects/teachpack/2htdp/scribblings/img/5965553.png deleted file mode 100644 index 51bc91e9c0..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/5965553.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/5da309d.png b/collects/teachpack/2htdp/scribblings/img/5da309d.png deleted file mode 100644 index e4abcd6a5c..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/5da309d.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/5dc8ec6.png b/collects/teachpack/2htdp/scribblings/img/5dc8ec6.png new file mode 100644 index 0000000000..347048016f Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/5dc8ec6.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/69207aa.png b/collects/teachpack/2htdp/scribblings/img/69207aa.png new file mode 100644 index 0000000000..1031d90f80 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/69207aa.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/6ad4614.png b/collects/teachpack/2htdp/scribblings/img/6ad4614.png new file mode 100644 index 0000000000..9cd644b314 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/6ad4614.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/6d66aef.png b/collects/teachpack/2htdp/scribblings/img/6d66aef.png new file mode 100644 index 0000000000..d4b7ede7b8 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/6d66aef.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/80c7ec4.png b/collects/teachpack/2htdp/scribblings/img/80c7ec4.png deleted file mode 100644 index 3f184495d2..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/80c7ec4.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/8a14504.png b/collects/teachpack/2htdp/scribblings/img/8a14504.png new file mode 100644 index 0000000000..f79f1198ad Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/8a14504.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/90999b2.png b/collects/teachpack/2htdp/scribblings/img/90999b2.png deleted file mode 100644 index a17b480c1e..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/90999b2.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/9369ffc.png b/collects/teachpack/2htdp/scribblings/img/9369ffc.png new file mode 100644 index 0000000000..c7a53e79ba Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/9369ffc.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/975b778.png b/collects/teachpack/2htdp/scribblings/img/975b778.png deleted file mode 100644 index b15c97c4f5..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/975b778.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/97be4d.png b/collects/teachpack/2htdp/scribblings/img/97be4d.png deleted file mode 100644 index bd15d8fe49..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/97be4d.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/b3e371c.png b/collects/teachpack/2htdp/scribblings/img/b3e371c.png deleted file mode 100644 index b5ef099a8c..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/b3e371c.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/cd2e82.png b/collects/teachpack/2htdp/scribblings/img/cd2e82.png deleted file mode 100644 index d3abd4688e..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/cd2e82.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/d27a587.png b/collects/teachpack/2htdp/scribblings/img/d27a587.png new file mode 100644 index 0000000000..b3c9e23f97 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/d27a587.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/eab359b.png b/collects/teachpack/2htdp/scribblings/img/eab359b.png deleted file mode 100644 index e5f998d425..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/eab359b.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/f404e3c.png b/collects/teachpack/2htdp/scribblings/img/f404e3c.png deleted file mode 100644 index 42033ae105..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/f404e3c.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/f6b7cc9.png b/collects/teachpack/2htdp/scribblings/img/f6b7cc9.png deleted file mode 100644 index 7e1e9a3726..0000000000 Binary files a/collects/teachpack/2htdp/scribblings/img/f6b7cc9.png and /dev/null differ diff --git a/collects/teachpack/2htdp/scribblings/img/fe8415.png b/collects/teachpack/2htdp/scribblings/img/fe8415.png new file mode 100644 index 0000000000..96584002be Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/fe8415.png differ diff --git a/collects/teachpack/2htdp/scribblings/img/ff15c8e.png b/collects/teachpack/2htdp/scribblings/img/ff15c8e.png new file mode 100644 index 0000000000..27c7c2cec9 Binary files /dev/null and b/collects/teachpack/2htdp/scribblings/img/ff15c8e.png differ diff --git a/collects/tests/2htdp/test-image.ss b/collects/tests/2htdp/test-image.ss index 0845792796..be82e56d18 100644 --- a/collects/tests/2htdp/test-image.ss +++ b/collects/tests/2htdp/test-image.ss @@ -353,6 +353,49 @@ (ellipse 50 100 'solid 'red) (ellipse 100 50 'solid 'blue))) +(test (above/places 'left + (ellipse 50 100 'solid 'red) + (ellipse 100 50 'solid 'blue)) + + => + (make-image + (make-overlay + (make-translate 0 0 (image-shape (ellipse 50 100 'solid 'red))) + (make-translate 0 100 (image-shape (ellipse 100 50 'solid 'blue)))) + (make-bb 100 150 150) + #f)) + +(test (above/places 'center + (ellipse 50 100 'solid 'red) + (ellipse 100 50 'solid 'blue)) + + => + (make-image + (make-overlay + (make-translate 25 0 (image-shape (ellipse 50 100 'solid 'red))) + (make-translate 0 100 (image-shape (ellipse 100 50 'solid 'blue)))) + (make-bb 100 150 100) + #f)) + +(test (above/places 'right + (ellipse 50 100 'solid 'red) + (ellipse 100 50 'solid 'blue)) + + => + (make-image + (make-overlay + (make-translate 50 0 (image-shape (ellipse 50 100 'solid 'red))) + (make-translate 0 100 (image-shape (ellipse 100 50 'solid 'blue)))) + (make-bb 100 150 150) + #f)) + +(test (above (ellipse 50 100 'solid 'red) + (ellipse 100 50 'solid 'blue)) + => + (above/places 'left + (ellipse 50 100 'solid 'red) + (ellipse 100 50 'solid 'blue))) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;