From e371bd8f4aff334cd13ec827dc1038c7d7976c78 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Sun, 4 Jan 2009 13:59:00 +0000 Subject: [PATCH] completed Matthias's aborted commit svn: r12999 --- collects/teachpack/2htdp/scribblings/2htdp.scrbl | 10 ++++++++++ collects/teachpack/2htdp/scribblings/universe.scrbl | 6 +++--- collects/teachpack/teachpack.scrbl | 3 ++- collects/tests/drscheme/teachpack.ss | 11 +++++++---- 4 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 collects/teachpack/2htdp/scribblings/2htdp.scrbl diff --git a/collects/teachpack/2htdp/scribblings/2htdp.scrbl b/collects/teachpack/2htdp/scribblings/2htdp.scrbl new file mode 100644 index 0000000000..9f1a950ef6 --- /dev/null +++ b/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"] diff --git a/collects/teachpack/2htdp/scribblings/universe.scrbl b/collects/teachpack/2htdp/scribblings/universe.scrbl index c95ddeabc8..e6485da455 100644 --- a/collects/teachpack/2htdp/scribblings/universe.scrbl +++ b/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)] @; ----------------------------------------------------------------------------- diff --git a/collects/teachpack/teachpack.scrbl b/collects/teachpack/teachpack.scrbl index 4d288e3dea..409cd70f8c 100644 --- a/collects/teachpack/teachpack.scrbl +++ b/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"] diff --git a/collects/tests/drscheme/teachpack.ss b/collects/tests/drscheme/teachpack.ss index c3de7a7deb..f78ebed614 100644 --- a/collects/tests/drscheme/teachpack.ss +++ b/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])