From 7d71c34ba9a5ff6f659bdac1a6a9e38ab4b09da0 Mon Sep 17 00:00:00 2001 From: Mike Sperber Date: Sat, 14 Mar 2009 13:42:57 +0000 Subject: [PATCH] Consolidate the DMdA docs into a single chapter. svn: r14098 --- .../deinprogramm/scribblings/DMdA-lib.scrbl | 2 +- .../scribblings/deinprogramm-langs.scrbl | 25 -------------- .../scribblings/deinprogramm.scrbl | 31 ++++++++++++++++++ .../deinprogramm/scribblings/image.scrbl | 0 collects/deinprogramm/scribblings/info.ss | 3 +- .../deinprogramm/scribblings/line3d.scrbl | 0 .../deinprogramm/scribblings/p1.jpg | Bin .../deinprogramm/scribblings/p2.jpg | Bin .../deinprogramm/scribblings/p3.jpg | Bin .../deinprogramm/scribblings/p4.jpg | Bin .../deinprogramm/scribblings/shared.ss | 0 .../deinprogramm/scribblings/sound.scrbl | 0 .../deinprogramm/scribblings/turtle.scrbl | 0 .../deinprogramm/scribblings/world.scrbl | 0 .../scribblings/deinprogramm.scrbl | 18 ---------- .../deinprogramm/scribblings/info.ss | 3 -- 16 files changed, 33 insertions(+), 49 deletions(-) delete mode 100644 collects/deinprogramm/scribblings/deinprogramm-langs.scrbl create mode 100644 collects/deinprogramm/scribblings/deinprogramm.scrbl rename collects/{teachpack => }/deinprogramm/scribblings/image.scrbl (100%) rename collects/{teachpack => }/deinprogramm/scribblings/line3d.scrbl (100%) rename collects/{teachpack => }/deinprogramm/scribblings/p1.jpg (100%) rename collects/{teachpack => }/deinprogramm/scribblings/p2.jpg (100%) rename collects/{teachpack => }/deinprogramm/scribblings/p3.jpg (100%) rename collects/{teachpack => }/deinprogramm/scribblings/p4.jpg (100%) rename collects/{teachpack => }/deinprogramm/scribblings/shared.ss (100%) rename collects/{teachpack => }/deinprogramm/scribblings/sound.scrbl (100%) rename collects/{teachpack => }/deinprogramm/scribblings/turtle.scrbl (100%) rename collects/{teachpack => }/deinprogramm/scribblings/world.scrbl (100%) delete mode 100644 collects/teachpack/deinprogramm/scribblings/deinprogramm.scrbl delete mode 100644 collects/teachpack/deinprogramm/scribblings/info.ss diff --git a/collects/deinprogramm/scribblings/DMdA-lib.scrbl b/collects/deinprogramm/scribblings/DMdA-lib.scrbl index e372fa50ce..28b3b13712 100644 --- a/collects/deinprogramm/scribblings/DMdA-lib.scrbl +++ b/collects/deinprogramm/scribblings/DMdA-lib.scrbl @@ -10,7 +10,7 @@ lang/prim)) @(define DMdA @italic{Die Macht der Abstraktion}) -@(define (DMdA-ref s) @secref[#:doc '(lib "deinprogramm/scribblings/deinprogramm-langs.scrbl") s]) +@(define (DMdA-ref s) @secref[#:doc '(lib "deinprogramm/scribblings/deinprogramm.scrbl") s]) Note: This is documentation for the language levels that go with the German textbook @italic{@link["http://www.deinprogramm.de/dmda/"]{Die diff --git a/collects/deinprogramm/scribblings/deinprogramm-langs.scrbl b/collects/deinprogramm/scribblings/deinprogramm-langs.scrbl deleted file mode 100644 index 383f5150b7..0000000000 --- a/collects/deinprogramm/scribblings/deinprogramm-langs.scrbl +++ /dev/null @@ -1,25 +0,0 @@ -#lang scribble/doc -@(require scribblings/htdp-langs/common) - -@title{Sprachebenen für @italic{Die Macht der Abstraktion}} - -Note: This is documentation for the language levels that go with the -German textbook @italic{@link["http://www.deinprogramm.de/dmda/"]{Die -Macht der Abstraktion}}. - -Die Sprachebenen in diesem Handbuch sind für Verwendung mit dem Buch -the @italic{@link["http://www.deinprogramm.de/dmda/"]{Die Macht der -Abstraktion}} gedacht. - -@table-of-contents[] - -@;------------------------------------------------------------------------ - -@include-section["DMdA-beginner.scrbl"] -@include-section["DMdA-vanilla.scrbl"] -@include-section["DMdA-assignments.scrbl"] -@include-section["DMdA-advanced.scrbl"] - -@;------------------------------------------------------------------------ - -@index-section[] diff --git a/collects/deinprogramm/scribblings/deinprogramm.scrbl b/collects/deinprogramm/scribblings/deinprogramm.scrbl new file mode 100644 index 0000000000..daddab6653 --- /dev/null +++ b/collects/deinprogramm/scribblings/deinprogramm.scrbl @@ -0,0 +1,31 @@ +#lang scribble/doc + +@(require scribble/manual + (for-label scheme)) + +@title[#:style '(toc) #:tag "deinprogramm"]{Sprachebenen und Material zu @italic{Die Macht der Abstraktion}} + +Note: This is documentation for the teachpacks that go with the German +textbook @italic{@link["http://www.deinprogramm.de/dmda/"]{Die Macht +der Abstraktion}}. + +Die Sprachebenen und Teachpacks in diesem Handbuch sind für Verwendung +mit dem Buch the @italic{@link["http://www.deinprogramm.de/dmda/"]{Die +Macht der Abstraktion}} gedacht. + +@table-of-contents[] + +@include-section["DMdA-beginner.scrbl"] +@include-section["DMdA-vanilla.scrbl"] +@include-section["DMdA-assignments.scrbl"] +@include-section["DMdA-advanced.scrbl"] + +@include-section["ka.scrbl"] + +@include-section["image.scrbl"] +@include-section["world.scrbl"] +@include-section["turtle.scrbl"] +@include-section["sound.scrbl"] +@include-section["line3d.scrbl"] + +@index-section[] diff --git a/collects/teachpack/deinprogramm/scribblings/image.scrbl b/collects/deinprogramm/scribblings/image.scrbl similarity index 100% rename from collects/teachpack/deinprogramm/scribblings/image.scrbl rename to collects/deinprogramm/scribblings/image.scrbl diff --git a/collects/deinprogramm/scribblings/info.ss b/collects/deinprogramm/scribblings/info.ss index 2ac704094a..cb89cb8058 100644 --- a/collects/deinprogramm/scribblings/info.ss +++ b/collects/deinprogramm/scribblings/info.ss @@ -1,6 +1,5 @@ #lang setup/infotab -(define scribblings '(("deinprogramm-langs.scrbl" (multi-page) (language -14)) - ("ka.scrbl" (multi-page) (other -10)) +(define scribblings '(("deinprogramm.scrbl" (multi-page) (language -14)) ("DMdA-lib.scrbl"))) diff --git a/collects/teachpack/deinprogramm/scribblings/line3d.scrbl b/collects/deinprogramm/scribblings/line3d.scrbl similarity index 100% rename from collects/teachpack/deinprogramm/scribblings/line3d.scrbl rename to collects/deinprogramm/scribblings/line3d.scrbl diff --git a/collects/teachpack/deinprogramm/scribblings/p1.jpg b/collects/deinprogramm/scribblings/p1.jpg similarity index 100% rename from collects/teachpack/deinprogramm/scribblings/p1.jpg rename to collects/deinprogramm/scribblings/p1.jpg diff --git a/collects/teachpack/deinprogramm/scribblings/p2.jpg b/collects/deinprogramm/scribblings/p2.jpg similarity index 100% rename from collects/teachpack/deinprogramm/scribblings/p2.jpg rename to collects/deinprogramm/scribblings/p2.jpg diff --git a/collects/teachpack/deinprogramm/scribblings/p3.jpg b/collects/deinprogramm/scribblings/p3.jpg similarity index 100% rename from collects/teachpack/deinprogramm/scribblings/p3.jpg rename to collects/deinprogramm/scribblings/p3.jpg diff --git a/collects/teachpack/deinprogramm/scribblings/p4.jpg b/collects/deinprogramm/scribblings/p4.jpg similarity index 100% rename from collects/teachpack/deinprogramm/scribblings/p4.jpg rename to collects/deinprogramm/scribblings/p4.jpg diff --git a/collects/teachpack/deinprogramm/scribblings/shared.ss b/collects/deinprogramm/scribblings/shared.ss similarity index 100% rename from collects/teachpack/deinprogramm/scribblings/shared.ss rename to collects/deinprogramm/scribblings/shared.ss diff --git a/collects/teachpack/deinprogramm/scribblings/sound.scrbl b/collects/deinprogramm/scribblings/sound.scrbl similarity index 100% rename from collects/teachpack/deinprogramm/scribblings/sound.scrbl rename to collects/deinprogramm/scribblings/sound.scrbl diff --git a/collects/teachpack/deinprogramm/scribblings/turtle.scrbl b/collects/deinprogramm/scribblings/turtle.scrbl similarity index 100% rename from collects/teachpack/deinprogramm/scribblings/turtle.scrbl rename to collects/deinprogramm/scribblings/turtle.scrbl diff --git a/collects/teachpack/deinprogramm/scribblings/world.scrbl b/collects/deinprogramm/scribblings/world.scrbl similarity index 100% rename from collects/teachpack/deinprogramm/scribblings/world.scrbl rename to collects/deinprogramm/scribblings/world.scrbl diff --git a/collects/teachpack/deinprogramm/scribblings/deinprogramm.scrbl b/collects/teachpack/deinprogramm/scribblings/deinprogramm.scrbl deleted file mode 100644 index ff415fcf71..0000000000 --- a/collects/teachpack/deinprogramm/scribblings/deinprogramm.scrbl +++ /dev/null @@ -1,18 +0,0 @@ -#lang scribble/doc - -@(require scribble/manual - (for-label scheme)) - -@title[#:style '(toc) #:tag "deinprogramm"]{DeinProgramm-Teachpacks} - -Note: This is documentation for the teachpacks that go with the German -textbook @italic{@link["http://www.deinprogramm.de/dmda/"]{Die Macht -der Abstraktion}}. - -@table-of-contents[] - -@include-section["image.scrbl"] -@include-section["world.scrbl"] -@include-section["turtle.scrbl"] -@include-section["sound.scrbl"] -@include-section["line3d.scrbl"] diff --git a/collects/teachpack/deinprogramm/scribblings/info.ss b/collects/teachpack/deinprogramm/scribblings/info.ss deleted file mode 100644 index 3bae7dc50b..0000000000 --- a/collects/teachpack/deinprogramm/scribblings/info.ss +++ /dev/null @@ -1,3 +0,0 @@ -#lang setup/infotab - -(define scribblings '(("deinprogramm.scrbl" (multi-page) (library -10))))