completed Matthias's aborted commit

svn: r12999

collects/teachpack/2htdp/scribblings/2htdp.scrbl

@@ -0,0 +1,10 @@
+#lang scribble/doc
+
+@(require scribble/manual
+          (for-label scheme))
+
+@title[#:style '(toc) #:tag "2htdp"]{HtDP/2e Teachpacks}
+
+@local-table-of-contents[]
+
+@include-section["universe.scrbl"]

collects/teachpack/2htdp/scribblings/universe.scrbl

@@ -1,9 +1,9 @@
 #lang scribble/doc
 
 @(require scribble/manual "shared.ss" 
-          (for-label scheme ; lang/htdp-beginner
+          (for-label scheme
 	  	     (only-in lang/htdp-beginner check-expect)
-		     "../universe.ss"
+		     teachpack/2htdp/universe
 		     teachpack/htdp/image))
 @(require scribble/struct)
 
@@ -47,7 +47,7 @@ The purpose of this documentation is to give experienced Schemers and HtDP
  have a series of projects available as a small booklet on
  @link["http://world.cs.brown.edu/"]{How to Design Worlds}.
 
-@declare-exporting["../universe.ss" #:use-sources (teachpack/htdp/image)]
+@declare-exporting[teachpack/2htdp/universe #:use-sources (teachpack/htdp/image)]
 
 @; -----------------------------------------------------------------------------
 

collects/teachpack/teachpack.scrbl

@@ -23,7 +23,8 @@ This chapter covers the teachpacks for @italic{How to Design Programs}
 
 @table-of-contents[]
 
-
 @include-section["htdp/scribblings/htdp.scrbl"]
 
 @include-section["htdc/scribblings/htdc.scrbl"]
+
+@include-section["2htdp/scribblings/2htdp.scrbl"]

collects/tests/drscheme/teachpack.ss

@@ -213,13 +213,16 @@
                         (printf "FAILED built in teachpack test: ~a~n" (path->string teachpack))
                         (printf "       got: ~s~n  expected: ~s~n" got expected)))))))]
            [test-teachpacks
-            (lambda (dir)
-              (for-each (test-teachpack dir) 
-                        (directory-list dir)))]
+            (lambda (paths)
+              (for-each (lambda (dir)
+                          (for-each (test-teachpack dir) 
+                                    (directory-list dir)))
+                        paths))]
            [teachpack-dir (normalize-path (collection-path "teachpack"))])
       (set-language-level! '("How to Design Programs" "Advanced Student"))
       (do-execute drs-frame)
-      (test-teachpacks (build-path teachpack-dir "htdp"))))
+      (test-teachpacks (list (build-path teachpack-dir "2htdp")
+                             (build-path teachpack-dir "htdp")))))
   
   (define (find-leftmost-choice frame)
     (let loop ([p frame])