Move tutorial over to a format similar to the reference doc

And adjust highlighting/testing scripts to deal with this.

Author: marijnh

doc/extract-tests.js

@@ -0,0 +1,44 @@
+#!/usr/local/bin/node
+
+/***
+ * Script for extracting compilable fragments from markdown
+ * documentation. See prep.js for a description of the format
+ * recognized by this tool. Expects a directory fragements/ to exist
+ * under the current directory, and writes the fragments in there as
+ * individual .rs files.
+ */
+
+var fs = require("fs");
+
+if (!process.argv[2]) {
+  console.log("Please provide an input file name.");
+  process.exit(1);
+}
+
+var lines = fs.readFileSync(process.argv[2]).toString().split(/\n\r?/g);
+var cur = 0, line, chapter, chapter_n;
+
+while ((line = lines[cur++]) != null) {
+  var chap = line.match(/^# (.*)/);
+  if (chap) {
+    chapter = chap[1].toLowerCase().replace(/\W/g, "_");
+    chapter_n = 1;
+  } else if (/^~~~/.test(line)) {
+    var block = "", ignore = false;
+    while ((line = lines[cur++]) != null) {
+      if (/^\s*## (?:notrust|ignore)/.test(line)) ignore = true;
+      else if (/^~~~/.test(line)) break;
+      else block += line.replace(/^# /, "") + "\n";
+    }
+    if (!ignore) {
+      if (!/\bfn main\b/.test(block)) {
+        if (/(^|\n) *(native|use|mod|import|export)\b/.test(block))
+          block += "\nfn main() {}\n";
+        else block = "fn main() {\n" + block + "\n}\n";
+      }
+      if (!/\buse std\b/.test(block)) block = "use std;\n" + block;
+      var filename = "fragments/" + chapter + "_" + (chapter_n++) + ".rs";
+      fs.writeFileSync(filename, block);
+    }
+  }
+}

doc/tutorial/lib/codemirror-node.js renamed to doc/lib/codemirror-node.js

@@ -0,0 +1,67 @@
+#!/usr/local/bin/node
+
+/***
+ * Pandoc-style markdown preprocessor that drops extra directives
+ * included for running doc code, and that optionally, when
+ * --highlight is provided, replaces code blocks that are Rust code
+ * with highlighted HTML blocks. The directives recognized are:
+ *
+ * '## ignore' tells the test extractor (extract-tests.js) to ignore
+ *   the block completely.
+ * '## notrust' makes the test extractor ignore the block, makes
+ *   this script not highlight the block.
+ * '# [any text]' is a line that is stripped out by this script, and
+ *   converted to a normal line of code (without the leading #) by
+ *   the test extractor.
+ */
+
+var fs = require("fs");
+CodeMirror = require("./lib/codemirror-node");
+require("./lib/codemirror-rust");
+
+function help() {
+  console.log("usage: " + process.argv[0] + " [--highlight] [-o outfile] [infile]");
+  process.exit(1);
+}
+
+var highlight = false, infile, outfile;
+
+for (var i = 2; i < process.argv.length; ++i) {
+  var arg = process.argv[i];
+  if (arg == "--highlight") highlight = true;
+  else if (arg == "-o" && outfile == null && ++i < process.argv.length) outfile = process.argv[i];
+  else if (arg[0] != "-") infile = arg;
+  else help();
+}
+
+var lines = fs.readFileSync(infile || "/dev/stdin").toString().split(/\n\r?/g), cur = 0, line;
+var out = outfile ? fs.createWriteStream(outfile) : process.stdout;
+
+while ((line = lines[cur++]) != null) {
+  if (/^~~~/.test(line)) {
+    var block = "", bline, isRust = true;
+    while ((bline = lines[cur++]) != null) {
+      if (/^\s*## notrust/.test(bline)) isRust = false;
+      else if (/^~~~/.test(bline)) break;
+      if (!/^\s*##? /.test(bline)) block += bline + "\n";
+    }
+    if (!highlight || !isRust)
+      out.write(line + "\n" + block + bline + "\n");
+    else {
+      var html = '<pre class="cm-s-default">', curstr = "", curstyle = null;
+      function add(str, style) {
+        if (style != curstyle) {
+          if (curstyle) html += '<span class="cm-' + curstyle + '">' + curstr
+            + "</span>";
+          else if (curstr) html += curstr;
+          curstr = str; curstyle = style;
+        } else curstr += str;
+      }
+      CodeMirror.runMode(block, "rust", add);
+      add("", "bogus"); // Flush pending string.
+      out.write(html + "</pre>\n");
+    }
+  } else {
+    out.write(line + "\n");
+  }
+}

doc/tutorial/lib/codemirror-rust.js renamed to doc/lib/codemirror-rust.js

@@ -1,7 +1,7 @@
 #!/bin/bash
 rm -f fragments/*.rs
 mkdir -p fragments
-node extract.js
+node extract-tests.js $1
 for F in `ls fragments/*.rs`; do
   $RUSTC $F > /dev/null
   if [[ $? != 0 ]] ; then echo $F; fi

doc/prep.js

@@ -6,10 +6,14 @@ body {
 
 body {
   padding: 1em 6em;
-  max-width: 50em;
+  max-width: 60em;
 }
 
-h1 { font-size: 22pt; }
+h1 {
+  font-size: 22pt;
+  margin-top: 2em;
+  border-bottom: 2px solid silver;
+}
 h2 { font-size: 17pt; }
 h3 { font-size: 14pt; }
 
@@ -23,3 +27,27 @@ a, a:visited, a:link {
   text-decoration: none;
   color: #00438a;
 }
+
+h1 a:link, h1 a:visited, h2 a:link, h2 a:visited,
+h3 a:link, h3 a:visited { color: black; }
+
+/* Code highlighting */
+.cm-s-default span.cm-keyword {color: #708;}
+.cm-s-default span.cm-atom {color: #219;}
+.cm-s-default span.cm-number {color: #164;}
+.cm-s-default span.cm-def {color: #00f;}
+.cm-s-default span.cm-variable {color: black;}
+.cm-s-default span.cm-variable-2 {color: #05a;}
+.cm-s-default span.cm-variable-3 {color: #085;}
+.cm-s-default span.cm-property {color: black;}
+.cm-s-default span.cm-operator {color: black;}
+.cm-s-default span.cm-comment {color: #a50;}
+.cm-s-default span.cm-string {color: #a11;}
+.cm-s-default span.cm-string-2 {color: #f50;}
+.cm-s-default span.cm-meta {color: #555;}
+.cm-s-default span.cm-error {color: #f00;}
+.cm-s-default span.cm-qualifier {color: #555;}
+.cm-s-default span.cm-builtin {color: #30a;}
+.cm-s-default span.cm-bracket {color: #cc7;}
+.cm-s-default span.cm-tag {color: #170;}
+.cm-s-default span.cm-attribute {color: #00c;}