Move per-chapter extracted code to code/chapter. Put code symlink in html root

marijnh · marijnh · commit 2164e270ece7 · 2014-06-16T08:55:03.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 /tex/*
 /html/*.html
-/html/js/0*.js
-/html/js/1*.js
+/code/chapter/*
 /node_modules
 .tern-port
+toc.txt
+img/cover.xcf
diff --git a/00_intro.txt b/00_intro.txt
@@ -1,5 +1,5 @@
 :next_link: 01_values
-:load_files: ["js/00_intro.js"]
+:load_files: ["code/chapter/00_intro.js"]
 
 = Introduction =
 
diff --git a/04_data.txt b/04_data.txt
@@ -1,7 +1,7 @@
 :chap_num: 4
 :prev_link: 03_functions
 :next_link: 05_higher_order
-:load_files: ["js/code/jacques_journal.js", "js/04_data.js"]
+:load_files: ["code/jacques_journal.js", "code/chapter/04_data.js"]
 
 = Data Structures: Objects and Arrays =
 
diff --git a/05_higher_order.txt b/05_higher_order.txt
@@ -1,7 +1,7 @@
 :chap_num: 5
 :prev_link: 04_data
 :next_link: 06_object
-:load_files: ["js/code/ancestry.js", "js/00_intro.js", "js/05_higher_order.js"]
+:load_files: ["code/ancestry.js", "code/chapter/00_intro.js", "code/chapter/05_higher_order.js"]
 
 = Higher-Order Functions =
 
diff --git a/06_object.txt b/06_object.txt
@@ -1,7 +1,7 @@
 :chap_num: 6
 :prev_link: 05_higher_order
 :next_link: 07_elife
-:load_files: ["js/code/mountains.js", "js/06_object.js"]
+:load_files: ["code/mountains.js", "code/chapter/06_object.js"]
 
 = The Secret Life of Objects =
 
diff --git a/07_elife.txt b/07_elife.txt
@@ -1,7 +1,7 @@
 :chap_num: 7
 :prev_link: 06_object
 :next_link: 08_error
-:load_files: ["js/07_elife.js", "js/animateworld.js"]
+:load_files: ["code/chapter/07_elife.js", "js/animateworld.js"]
 
 = Project: Electronic Life =
 
diff --git a/08_error.txt b/08_error.txt
@@ -1,7 +1,7 @@
 :chap_num: 8
 :prev_link: 07_elife
 :next_link: 09_regexp
-:load_files: ["js/08_error.js"]
+:load_files: ["code/chapter/08_error.js"]
 
 = Bugs and Error Handling =
 
diff --git a/10_modules.txt b/10_modules.txt
@@ -1,7 +1,7 @@
 :chap_num: 10
 :prev_link: 09_regexp
 :next_link: 11_language
-:load_files: ["js/10_modules.js", "js/loadfile.js"]
+:load_files: ["code/chapter/10_modules.js", "js/loadfile.js"]
 
 = Modules =
 
diff --git a/11_language.txt b/11_language.txt
@@ -1,7 +1,7 @@
 :chap_num: 11
 :prev_link: 10_modules
 :next_link: 12_browser
-:load_files: ["js/11_language.js"]
+:load_files: ["code/chapter/11_language.js"]
 
 = Project: A Programming Language =
 
diff --git a/12_browser.txt b/12_browser.txt
@@ -266,10 +266,10 @@ the JavaScript program) to be fetched from a URL.
 [source,text/html]
 ----
 <h1>Testing alert</h1>
-<script src="js/hello.js"></script>
+<script src="code/hello.js"></script>
 ----
 
-The _js/hello.js_ file included here contains the same simple program,
+The _code/hello.js_ file included here contains the same simple program,
 `alert("hello!")`. When an HTML page references other URLs as part of
 itself, for example an image file or a script, web browsers will
 retrieve those immediately, and include them in the page.
diff --git a/13_dom.txt b/13_dom.txt
@@ -1,7 +1,7 @@
 :chap_num: 13
 :prev_link: 12_browser
 :next_link: 14_event
-:load_files: ["js/code/mountains.js", "js/13_dom.js"]
+:load_files: ["code/mountains.js", "code/chapter/13_dom.js"]
 
 = The Document Object Model =
 
diff --git a/14_event.txt b/14_event.txt
@@ -650,7 +650,7 @@ isolated JavaScript environment, which runs alongside the main program
 for a document, and can only communicate with it by sending and
 receiving messages.
 
-Assume we have this code in `js/squareworker.js`, which is a program
+Assume we have this code in `code/squareworker.js`, which is a program
 that computes squares, which we will run inside of an isolated worker
 process.
 
@@ -669,7 +669,7 @@ worker, sends it a few messages, and outputs the responses.
 
 [source,javascript]
 ----
-var squareWorker = new Worker("js/squareworker.js");
+var squareWorker = new Worker("code/squareworker.js");
 squareWorker.addEventListener("message", function(event) {
   console.log("The worker responded:", event.data);
 });
diff --git a/15_game.txt b/15_game.txt
@@ -1,7 +1,7 @@
 :chap_num: 15
 :prev_link: 14_event
 :next_link: 16_canvas
-:load_files: ["js/15_game.js", "js/code/game_levels.js"]
+:load_files: ["code/chapter/15_game.js", "code/game_levels.js"]
 
 = Project: A Platform Game =
 
diff --git a/16_canvas.txt b/16_canvas.txt
@@ -1,7 +1,7 @@
 :chap_num: 16
 :prev_link: 15_game
 :next_link: 17_http
-:load_files: ["js/15_game.js", "js/code/game_levels.js", "js/16_canvas.js"]
+:load_files: ["code/chapter/15_game.js", "code/game_levels.js", "code/chapter/16_canvas.js"]
 
 = Drawing on Canvas =
 
diff --git a/17_http.txt b/17_http.txt
@@ -1,7 +1,7 @@
 :chap_num: 17
 :prev_link: 16_canvas
 :next_link: 18_forms
-:load_files: ["js/17_http.js", "js/promise.js"]
+:load_files: ["code/chapter/17_http.js", "js/promise.js"]
 
 = HTTP =
 
diff --git a/19_paint.txt b/19_paint.txt
@@ -1,7 +1,7 @@
 :chap_num: 19
 :prev_link: 18_forms
 :next_link: 20_FIXME
-:load_files: ["js/19_paint.js"]
+:load_files: ["code/chapter/19_paint.js"]
 
 = Project: A Paint Program =
 
diff --git a/bin/build_code.js b/bin/build_code.js
@@ -15,6 +15,6 @@ while (m = included.exec(input)) {
 }
 
 if (code.length) {
-  var out = "html/js/" + file.replace(".txt", ".js");
+  var out = "code/chapter/" + file.replace(".txt", ".js");
   fs.writeFileSync(out, code.join("\n"), "utf8");
 }
diff --git a/code/chapter/.keep b/code/chapter/.keep
diff --git a/code/hello.js b/code/hello.js
diff --git a/code/squareworker.js b/code/squareworker.js
diff --git a/html/code b/html/code
@@ -0,0 +1 @@
+../code
diff --git a/html/js/00_intro.js b/html/js/00_intro.js
diff --git a/html/js/code b/html/js/code
