Bump version to 0.1.2

Fix #10: Add generation to ebook

Gruntfile.js

@@ -28,14 +28,15 @@ module.exports = function (grunt) {
                     baseUrl: "theme/javascript/",
                     out: "theme/assets/app.js",
                     preserveLicenseComments: false,
-                    optimize: "uglify",
+                    optimize: "none", //"uglify",
                     include: ["requireLib"],
                     paths: {
                         "jQuery": 'vendors/jquery',
                         "lodash": 'vendors/lodash',
                         "requireLib": 'vendors/require',
                         "Mousetrap": 'vendors/mousetrap',
-                        "mixpanel": 'vendors/mixpanel'
+                        "mixpanel": 'vendors/mixpanel',
+                        "lunr": path.join(__dirname, "node_modules/lunr/lunr")
                     },
                     shim: {
                         'jQuery': {
@@ -49,6 +50,9 @@ module.exports = function (grunt) {
                         },
                         'mixpanel': {
                             exports: 'mixpanel'
+                        },
+                        'lunr': {
+                            exports: 'lunr'
                         }
                     }
                 }

README.md

@@ -33,8 +33,23 @@ Options for commands `build` and `serve` are:
 -t, --title <name> Name of the book to generate, defaults to repo name
 -i, --intro <intro> Description of the book to generate
 -g, --github <repo_path> ID of github repo like : username/repo
+-o, --output <directory>  Path to output directory, defaults to ./_book
+-f, --format <name>       Change generation format, defaults to site, availables are: site, page, pdf, json
+-i, --intro <intro>       Description of the book to generate
+-gh, --githubHost <url>   The url of the github host (defaults to https://github.com/)
+--theme <path>            Path to theme directory
 ```
 
+## Output Formats
+
+GitBook can generate your book in the following formats:
+
+* **Static Website**: This is the default format, it generates a complete interactive static website that can be for example hosted on GitHub Pages.
+* **PDF**: A complete PDF book with exercise solutions at the end of the book. Generate to this format using: ```gitbook pdf ./myrepo```, you need to have [gitbook-pdf](https://github.com/GitbookIO/gitbook-pdf) installed.
+* **eBook**: A complete eBook with exercise solutions at the end of the book. Generate to this format using: ```gitbook ebook ./myrepo```, you need to have [ebook-convert](http://manual.calibre-ebook.com/cli/ebook-convert.html) installed.
+* **Single Page**: The book will be stored in a single printable HTML page, this format is used for conversion to PDF or eBook. Generate to this format using: ```gitbook build ./myrepo -f page```.
+* **JSON**: This format is used for debugging or extracting metadata from a book. Generate to this format using: ```gitbook build ./myrepo -f json```.
+
 ## Book Format
 
 A book is a GitHub repository containing at least 2 files: `README.md` and `SUMMARY.md`.
@@ -77,19 +92,35 @@ An exercise is defined by 4 simple parts:
 Exercises need to start and finish with a separation bar (```---``` or ```***```). It should contain 3 code elements (**base**, **solution** and **validation**).
 
     ---
-    
+
     Define a variable `x` equal to 10.
-    
+
     ```js
-    var x = 
+    var x =
     ```
-    
+
     ```js
     var x = 10;
     ```
-    
+
     ```js
     assert(x == 10);
     ```
-    
+
     ---
+
+#### Multi-Languages
+
+GitBook supports building books written in multiple languages. Each language should be a sub-directory following the normal GitBook format, and a file named `LANGS.md` should be present at the root of the repository with the following format:
+
+```
+* [English](en/)
+* [French](fr/)
+* [Español](es/)
+```
+
+You can see a complete example with the [Learn Git](https://github.com/GitbookIO/git) book.
+
+#### Ignoring files & folders
+
+GitBook will read the `.gitignore`, `.bookignore` and `.ignore` files to get a list of files and folders to skip. (The format inside those files, follows the same convention as `.gitignore`)

bin/build.js

@@ -0,0 +1,113 @@
+var path = require('path');
+var Q = require('q');
+var _ = require('lodash');
+var tmp = require('tmp');
+
+var utils = require('./utils');
+
+var generate = require("../lib/generate");
+var parse = require("../lib/parse");
+var fs = require('../lib/generate/fs');
+var generators = require("../lib/generate").generators;
+
+var buildFunc = function(dir, options) {
+    dir = dir || process.cwd();
+    outputDir = options.output || path.join(dir, '_book');
+
+    console.log('Starting build ...');
+    // Get repo's URL
+    return utils.gitURL(dir)
+    .then(function(url) {
+        // Get ID of repo
+        return utils.githubID(url);
+    }, function(err) {
+        return null;
+    })
+    .then(function(repoID) {
+        var githubID = options.github || repoID;
+
+        if(!githubID) {
+            throw new Error('Needs a githubID (username/repo). Either set repo origin to a github repo or use the -g flag');
+        }
+
+        var parts = githubID.split('/', 2);
+        var user = parts[0], repo = parts[1];
+
+        var title = options.title || utils.titleCase(repo);
+
+        return generate.folder(
+            _.extend(options.options || {}, {
+                input: dir,
+                output: outputDir,
+                title: title,
+                description: options.intro,
+                github: githubID,
+                generator: options.format,
+                theme: options.theme
+            })
+        );
+    })
+    .then(function(output) {
+        console.log("Successfuly built !");
+        return output;
+    }, utils.logError);
+};
+
+var buildFiles = function(dir, outputFile, options, masterOptions) {
+    var ext = masterOptions.extension;
+
+    outputFile = outputFile || path.resolve(dir, "book."+ext);
+
+    Q.nfcall(tmp.dir)
+    .then(function(tmpDir) {
+        return buildFunc(
+            dir,
+            _.extend(options, {
+                output: tmpDir,
+                format: masterOptions.format,
+                options: masterOptions.options
+            })
+        )
+        .then(function(_options) {
+            var copyPDF = function(lang) {
+                var _outputFile = outputFile;
+                var _tmpDir = tmpDir;
+
+                if (lang) {
+                    _outputFile = _outputFile.slice(0, -path.extname(_outputFile).length)+"_"+lang+path.extname(_outputFile);
+                    _tmpDir = path.join(_tmpDir, lang);
+                }
+
+                console.log("Generating in", _outputFile);
+                return fs.copy(
+                    path.join(_tmpDir, "index."+ext),
+                    _outputFile
+                );
+            };
+
+            // Multi-langs book
+            return Q()
+            .then(function() {
+                if (_options.langsSummary) {
+                    console.log("Generating for all the languages");
+                    return Q.all(
+                        _.map(_options.langsSummary.list, function(lang) {
+                            return copyPDF(lang.lang);
+                        })
+                    );
+                } else {
+                    return copyPDF();
+                }
+            })
+            .then(function() {
+                return fs.remove(tmpDir);
+            })
+            .fail(utils.logError);
+        });
+    })
+};
+
+module.exports = {
+    folder: buildFunc,
+    files: buildFiles
+};

bin/gitbook.js

@@ -1,102 +1,48 @@
 #! /usr/bin/env node
 
-// Requires
 var Q = require('q');
 var _ = require('lodash');
 var path = require('path');
 var prog = require('commander');
 
-var fs = require('fs');
-
 var pkg = require('../package.json');
-var generate = require("../lib/generate");
-var parse = require("../lib/parse");
 var generators = require("../lib/generate").generators;
+var fs = require('../lib/generate/fs');
 
 var utils = require('./utils');
-
-var logError = function(err) {
-    console.log(err.message || err);
-    return Q.reject(err);
-};
+var build = require('./build');
 
 // General options
 prog
-.version(pkg.version)
-.option('-d, --dir <source_directory>', 'Source directory of book, containing Markdown files');
+.version(pkg.version);
 
+var buildCommand = function(command, action) {
+    return command
+    .option('-o, --output <directory>', 'Path to output directory, defaults to ./_book')
+    .option('-f, --format <name>', 'Change generation format, defaults to site, availables are: '+_.keys(generators).join(", "))
+    .option('-t, --title <name>', 'Name of the book to generate, defaults to repo name')
+    .option('-i, --intro <intro>', 'Description of the book to generate')
+    .option('-g, --github <repo_path>', 'ID of github repo like : username/repo')
+    .option('-gh, --githubHost <url>', 'The url of the github host (defaults to https://github.com/')
+    .option('--theme <path>', 'Path to theme directory')
+    .action(action);
+}
 
-var buildFunc;
-prog
+buildCommand(prog
 .command('build [source_dir]')
-.description('Build a gitbook from a directory')
-.option('-o, --output <directory>', 'Path to output directory, defaults to ./_book')
-.option('-f, --format <name>', 'Change generation format, defaults to site, availables are: '+_.keys(generators).join(", "))
-.option('-t, --title <name>', 'Name of the book to generate, defaults to repo name')
-.option('-i, --intro <intro>', 'Description of the book to generate')
-.option('-g, --github <repo_path>', 'ID of github repo like : username/repo')
-.option('-gh, --githubHost <url>', 'The url of the github host (defaults to https://github.com/')
-.option('--theme <path>', 'Path to theme directory')
-.action(buildFunc = function(dir, options) {
-    dir = dir || process.cwd();
-    outputDir = options.output || path.join(dir, '_book');
+.description('Build a gitbook from a directory'), build.folder);
 
-    console.log('Starting build ...');
-    // Get repo's URL
-    return utils.gitURL(dir)
-    .then(function(url) {
-        // Get ID of repo
-        return utils.githubID(url);
-    }, function(err) {
-        return null;
-    })
-    .then(function(repoID) {
-        var githubID = options.github || repoID;
-
-        if(!githubID) {
-            throw new Error('Needs a githubID (username/repo). Either set repo origin to a github repo or use the -g flag');
-        }
-
-        var parts = githubID.split('/', 2);
-        var user = parts[0], repo = parts[1];
-
-        var title = options.title || utils.titleCase(repo);
-
-        return generate.folder(
-            {
-                input: dir,
-                output: outputDir,
-                title: title,
-                description: options.intro,
-                github: githubID,
-                generator: options.format,
-                theme: options.theme
-            }
-        );
-    })
-    .then(function(output) {
-        console.log("Successfuly built !");
-    }, logError)
-    .then(_.constant(outputDir));
-});
-
-prog
+buildCommand(prog
 .command('serve [source_dir]')
 .description('Build then serve a gitbook from a directory')
-.option('-p, --port <port>', 'Port for server to listen on', 4000)
-.option('-o, --output <directory>', 'Path to output directory, defaults to ./_book')
-.option('-f, --format <name>', 'Change generation format, defaults to site, availables are: '+_.keys(generators).join(", "))
-.option('-t, --title <name>', 'Name of the book to generate, defaults to repo name')
-.option('-g, --github <repo_path>', 'ID of github repo like : username/repo')
-.option('-gh, --githubHost <url>', 'The url of the github host (defaults to https://github.com/')
-.option('--theme <path>', 'Path to theme directory')
-.action(function(dir, options) {
-    buildFunc(dir, options)
-    .then(function(outputDir) {
+.option('-p, --port <port>', 'Port for server to listen on', 4000),
+function(dir, options) {
+    build.folder(dir, options)
+    .then(function(_options) {
         console.log();
         console.log('Starting server ...');
-        return utils.serveDir(outputDir, options.port)
-        .fail(logError);
+        return utils.serveDir(_options.output, options.port)
+        .fail(utils.logError);
     })
     .then(function() {
         console.log('Serving book on http://localhost:'+options.port);
@@ -105,7 +51,36 @@ prog
     });
 });
 
+buildCommand(prog
+.command('pdf [source_dir] [output_file]')
+.description('Build a gitbook as a PDF')
+.option('-pf, --paperformat <format>', 'PDF paper format (default is A4): "5in*7.5in", "10cm*20cm", "A4", "Letter"'),
+function(dir, output, options) {
+    build.files(dir, output, options, {
+        extension: "pdf",
+        format: "pdf",
+        options: {
+            paperformat: options.paperformat
+        }
+    });
+});
 
+buildCommand(prog
+.command('ebook [source_dir] [output_file]')
+.description('Build a gitbook as a eBook')
+.option('-c, --cover <path>', 'Cover image, default is cover.png if exists'),
+function(dir, output, options) {
+    var ext = output ? path.extname(output) : "epub";
+    
+    build.files(dir, output, options, {
+        extension: ext,
+        format: "ebook",
+        options: {
+            extension: ext,
+            cover: options.cover
+        }
+    });
+});
 
 // Parse and fallback to help if no args
 if(_.isEmpty(prog.parse(process.argv).args) && process.argv.length === 2) {

bin/utils.js

@@ -82,6 +82,11 @@ function serveDir(dir, port) {
     return d.promise;
 }
 
+function logError(err) {
+    console.log(err.stack || err.message || err);
+    return Q.reject(err);
+};
+
 
 // Exports
 module.exports = {
@@ -89,4 +94,5 @@ module.exports = {
     githubID: githubID,
     titleCase: titleCase,
     serveDir: serveDir,
+    logError: logError
 };

lib/generate/ebook/index.js

@@ -0,0 +1,70 @@
+var util = require("util");
+var path = require("path");
+var Q = require("q");
+var _ = require("lodash");
+var exec = require('child_process').exec;
+
+var fs = require("fs");
+var parse = require("../../parse");
+var BaseGenerator = require("../page");
+
+/*
+ *  This generator inherits from the single page generator
+ *  and convert the page output to ebook
+ */
+var Generator = function() {
+    BaseGenerator.apply(this, arguments);
+
+    // Options for eBook generation
+    this.options = _.defaults(this.options, {
+        extension: "epub"
+    });
+
+    if (!this.options.cover && fs.existsSync(path.join(this.options.input, "cover.png"))) {
+        this.options.cover = path.join(this.options.input, "cover.png")
+    }
+};
+util.inherits(Generator, BaseGenerator);
+
+Generator.prototype.finish = function() {
+    var that = this;
+
+    return BaseGenerator.prototype.finish.apply(this)
+    .then(function() {
+        var d = Q.defer();
+
+        var _options = {
+            "--cover": that.options.cover
+        };
+
+        var command = [
+            "ebook-convert",
+            path.join(that.options.output, "index.html"),
+            path.join(that.options.output, "index."+that.options.extension),
+            _.chain(_options)
+            .map(function(value, key) {
+                if (value == null) return null;
+                return key+"="+value;
+            })
+            .compact()
+            .value()
+            .join(" ")
+        ].join(" ");
+
+        exec(command, function (error, stdout, stderr) {
+            if (error) {
+                if (error.code == 127) {
+                    error.message = "Need to install ebook-convert from Calibre";
+                } else {
+                    error.message = error.message + " "+stdout;
+                }
+                return d.reject(error);
+            }
+            d.resolve();
+        });
+
+        return d.promise;
+    });
+};
+
+module.exports = Generator;

lib/generate/fs.js

@@ -11,7 +11,7 @@ var getFiles = function(path) {
 
     var ig = Ignore({
         path: path,
-        ignoreFiles: ['.ignore', '.gitignore']
+        ignoreFiles: ['.ignore', '.gitignore', '.bookignore']
     });
 
     // Add extra rules to ignore common folders
@@ -27,13 +27,21 @@ var getFiles = function(path) {
     });
 
     ig.on('end', function() {
-        d.resolve(files);
+        // Normalize paths on Windows
+        if(process.platform === 'win32') {
+            return d.resolve(files.map(function(file) {
+                return file.replace(/\\/g, '/');
+            }));
+        }
+
+        // Simply return paths otherwise
+        return d.resolve(files);
     });
 
     ig.on('error', d.reject);
 
     return d.promise;
-}
+};
 
 module.exports = {
     list: getFiles,

lib/generate/generator.js

@@ -23,6 +23,10 @@ BaseGenerator.prototype.transferFolder = function(input) {
     );
 };
 
+BaseGenerator.prototype.langsIndex = function(langs) {
+    return Q.reject(new Error("Langs index is not supported in this generator"));
+};
+
 BaseGenerator.prototype.finish = function() {
     return Q.reject(new Error("Could not finish generation"));
 };

lib/generate/index.js

@@ -2,6 +2,7 @@ var Q = require("q");
 var _ = require("lodash");
 
 var path = require("path");
+var swig = require('swig');
 
 var fs = require("./fs");
 var parse = require("../parse");
@@ -9,6 +10,8 @@ var parse = require("../parse");
 var generators = {
     "site": require("./site"),
     "page": require("./page"),
+    "pdf": require("./pdf"),
+    "ebook": require("./ebook"),
     "json": require("./json")
 };
 
@@ -53,27 +56,10 @@ var generate = function(options) {
 
     // List all files in the repository
     .then(function() {
-        return fs.list(options.input);
-    })
-
-    // Check repository is valid
-    .then(function(_files) {
-        files = _files;
-
-        if (!_.contains(files, "SUMMARY.md") || !_.contains(files, "README.md")) {
-            return Q.reject(new Error("Invalid gitbook repository, need SUMMARY.md and README.md"));
-        }
-    })
-
-    // Get summary
-    .then(function() {
-        return fs.readFile(path.join(options.input, "SUMMARY.md"), "utf-8")
-        .then(function(_summary) {
-            options.summary = parse.summary(_summary);
-
-            // Parse navigation
-            options.navigation = parse.navigation(options.summary);
-        });
+        return fs.list(options.input)
+        .then(function(_files) {
+            files = _files;
+        })
     })
 
     // Create the generator
@@ -81,31 +67,78 @@ var generate = function(options) {
         generator = new generators[options.generator](options);
     })
 
-    // Copy file and replace markdown file
+    // Detect multi-languages book
     .then(function() {
-        return Q.all(
-            _.chain(files)
-            .map(function(file) {
-                if (!file) return;
+        if (_.contains(files, "LANGS.md")) {
+            // Multi-languages book
+            return fs.readFile(path.join(options.input, "LANGS.md"), "utf-8")
 
-                if (file[file.length -1] == "/") {
-                    return Q(generator.transferFolder(file));
-                } else if (path.extname(file) == ".md" && options.navigation[file] != null) {
-                    return fs.readFile(path.join(options.input, file), "utf-8")
-                    .then(function(content) {
-                        return Q(generator.convertFile(content, file));
-                    });
-                } else {
-                    return Q(generator.transferFile(file));
-                }
+            // Generate sub-books
+            .then(function(_langsSummary) {
+                options.langsSummary = parse.langs(_langsSummary);
+                
+                // Generated a book for each valid entry
+                return Q.all(
+                    _.map(options.langsSummary.list, function(entry) {
+                        return generate(_.extend({}, options, {
+                            input: path.join(options.input, entry.path),
+                            output: path.join(options.output, entry.path)
+                        }));
+                    })    
+                );
             })
-            .value()
-        );
+
+            // Generate languages index
+            .then(function() {
+                return generator.langsIndex(options.langsSummary);
+            });
+        } else if (!_.contains(files, "SUMMARY.md") || !_.contains(files, "README.md")) {
+            // Invalid book
+            return Q.reject(new Error("Invalid gitbook repository, need SUMMARY.md and README.md"));
+        } else {
+            // Generate the book
+            return fs.readFile(path.join(options.input, "SUMMARY.md"), "utf-8")
+
+            // Get summary
+            .then(function(_summary) {
+                options.summary = parse.summary(_summary);
+
+                // Parse navigation
+                options.navigation = parse.navigation(options.summary);
+            })
+
+            // Copy file and replace markdown file
+            .then(function() {
+                return Q.all(
+                    _.chain(files)
+                    .map(function(file) {
+                        if (!file) return;
+
+                        if (file[file.length -1] == "/") {
+                            return Q(generator.transferFolder(file));
+                        } else if (path.extname(file) == ".md" && options.navigation[file] != null) {
+                            return fs.readFile(path.join(options.input, file), "utf-8")
+                            .then(function(content) {
+                                return Q(generator.convertFile(content, file));
+                            });
+                        } else {
+                            return Q(generator.transferFile(file));
+                        }
+                    })
+                    .value()
+                );
+            })
+
+            // Finish gneration
+            .then(function() {
+                return generator.finish();
+            });
+        }
     })
 
-    // Finish gneration
+    // Return all options
     .then(function() {
-        return generator.finish();
+        return options;
     });
 };
 

lib/generate/page/index.js

@@ -7,7 +7,7 @@ var hljs = require('highlight.js');
 
 var fs = require("../fs");
 var parse = require("../../parse");
-var BaseGenerator = require("../generator");
+var BaseGenerator = require("../site");
 
 // Swig filter: highlight coloration
 swig.setFilter('code', function(code, lang) {
@@ -33,14 +33,6 @@ var Generator = function() {
 };
 util.inherits(Generator, BaseGenerator);
 
-Generator.prototype.transferFile = function(input) {
-    // ignore
-};
-
-Generator.prototype.transferFolder = function(input) {
-    // ignore
-};
-
 Generator.prototype.convertFile = function(content, input) {
     var that = this;
     var json = {
@@ -52,7 +44,8 @@ Generator.prototype.convertFile = function(content, input) {
     .then(function() {
         return parse.page(content, {
             repo: that.options.githubId,
-            dir: path.dirname(input) || '/'
+            dir: path.dirname(input) || '/',
+            outdir: './',
         });
     })
     .then(function(sections) {
@@ -71,30 +64,12 @@ Generator.prototype.finish = function() {
     return Q()
     // Generate html
     .then(function(pages) {
-        return that.template({
-            title: that.options.title,
-            description: that.options.description,
-
-            githubAuthor: that.options.github.split("/")[0],
-            githubId: that.options.github,
-            githubHost: that.options.githubHost,
-
-            summary: that.options.summary,
-            allNavigation: that.options.navigation,
-            
+        return that._writeTemplate(that.template, {
             pages: that.pages,
 
             basePath: basePath,
             staticBase: path.join(basePath, "gitbook"),
-        });
-    })
-
-    // Write html to index.html
-    .then(function(html) {
-        return fs.writeFile(
-            output,
-            html
-        );
+        }, output);
     })
 
     // Copy assets

lib/generate/pdf/index.js

@@ -0,0 +1,56 @@
+var util = require("util");
+var path = require("path");
+var Q = require("q");
+var _ = require("lodash");
+var exec = require('child_process').exec;
+
+var fs = require("../fs");
+var parse = require("../../parse");
+var BaseGenerator = require("../page");
+
+/*
+ *  This generator inherits from the single page generator
+ *  and convert the page output to pdf using gitbook-pdf
+ */
+var Generator = function() {
+    BaseGenerator.apply(this, arguments);
+
+    // Options for PDF generation
+    this.options = _.defaults(this.options, {
+        paperformat: "A4"
+    });
+};
+util.inherits(Generator, BaseGenerator);
+
+Generator.prototype.finish = function() {
+    var that = this;
+
+    return BaseGenerator.prototype.finish.apply(this)
+    .then(function() {
+        var d = Q.defer();
+
+        var command = [
+            "gitbook-pdf",
+            "generate",
+            path.join(that.options.output, "index.html"),
+            path.join(that.options.output, "index.pdf"),
+            "--format="+that.options.paperformat
+        ].join(" ");
+
+        exec(command, function (error, stdout, stderr) {
+            if (error) {
+                if (error.code == 127) {
+                    error.message = "Need to install gitbook-pdf using: npm install gitbook-pdf -g";
+                } else {
+                    error.message = error.message + " "+stdout;
+                }
+                return d.reject(error);
+            }
+            d.resolve();
+        });
+
+        return d.promise;
+    });
+};
+
+module.exports = Generator;

lib/generate/site/index.js

@@ -8,6 +8,8 @@ var fs = require("../fs");
 var parse = require("../../parse");
 var BaseGenerator = require("../generator");
 
+var indexer = require('./search_indexer');
+
 // Swig filter for returning the count of lines in a code section
 swig.setFilter('lines', function(content) {
     return content.split('\n').length;
@@ -15,38 +17,35 @@ swig.setFilter('lines', function(content) {
 
 // Swig filter for returning a link to the associated html file of a markdown file
 swig.setFilter('mdLink', function(link) {
-    return link.replace(".md", ".html");
+    var link = link.replace(".md", ".html");
+    if (link == "README.html") link = "index.html";
+    return link;
 });
 
 var Generator = function() {
     BaseGenerator.apply(this, arguments);
 
+    // Attach methods to instance
+    _.bindAll(this);
+
+    this.revision = Date.now();
+    this.indexer = indexer();
+
     // Load base template
     this.template = swig.compileFile(path.resolve(this.options.theme, 'templates/site.html'));
+    this.langsTemplate = swig.compileFile(path.resolve(this.options.theme, 'templates/langs.html'));
 };
 util.inherits(Generator, BaseGenerator);
 
 
-// Convert a markdown file to html
-Generator.prototype.convertFile = function(content, _input) {
+// Generate a template
+Generator.prototype._writeTemplate = function(tpl, options, output) {
     var that = this;
-    var progress = parse.progress(this.options.navigation, _input);
-
-    _output = _input.replace(".md", ".html");
-
-    var input = path.join(this.options.input, _input);
-    var output = path.join(this.options.output, _output);
-    var basePath = path.relative(path.dirname(output), this.options.output) || ".";
-
     return Q()
-    .then(function() {
-        return parse.page(content, {
-            repo: that.options.githubId,
-            dir: path.dirname(input) || '/'
-        });
-    })
     .then(function(sections) {
-        return that.template({
+        return tpl(_.extend({
+            revision: that.revision,
+
             title: that.options.title,
             description: that.options.description,
 
@@ -55,15 +54,8 @@ Generator.prototype.convertFile = function(content, _input) {
             githubHost: that.options.githubHost,
 
             summary: that.options.summary,
-            allNavigation: that.options.navigation,
-            progress: progress,
-
-            _input: _input,
-            content: sections,
-
-            basePath: basePath,
-            staticBase: path.join(basePath, "gitbook"),
-        });
+            allNavigation: that.options.navigation
+        }, options));
     })
     .then(function(html) {
         return fs.writeFile(
@@ -73,20 +65,92 @@ Generator.prototype.convertFile = function(content, _input) {
     });
 };
 
-// Symlink index.html and copy assets
-Generator.prototype.finish = function() {
-    var that = this;
+Generator.prototype.indexPage = function(lexed, pagePath) {
+    this.indexer.add(lexed, pagePath);
+    return Q();
+};
 
-    return fs.copy(
-        path.join(that.options.output, 'README.html'),
-        path.join(that.options.output, 'index.html')
-    )
+// Convert a markdown file to html
+Generator.prototype.convertFile = function(content, _input) {
+    var that = this;
+    var progress = parse.progress(this.options.navigation, _input);
+
+    _output = _input.replace(".md", ".html");
+    if (_output == "README.html") _output = "index.html";
+
+    var input = path.join(this.options.input, _input);
+    var output = path.join(this.options.output, _output);
+    var basePath = path.relative(path.dirname(output), this.options.output) || ".";
+
+    return Q()
     .then(function() {
-        return fs.copy(
-            path.join(that.options.theme, "assets"),
-            path.join(that.options.output, "gitbook")
-        );
+        // Lex page
+        return parse.lex(content);
+    })
+    .then(function(lexed) {
+        // Index page in search
+        return that.indexPage(lexed, _output)
+        .then(_.constant(lexed));
+    })
+    .then(function(lexed) {
+        // Get HTML generated sections
+        return parse.page(lexed, {
+            repo: that.options.githubId,
+            dir: path.dirname(_input) || '/',
+            outdir: path.dirname(_input) || '/',
+        });
+    })
+    .then(function(sections) {
+        return that._writeTemplate(that.template, {
+            progress: progress,
+
+            _input: _input,
+            content: sections,
+
+            basePath: basePath,
+            staticBase: path.join(basePath, "gitbook"),
+        }, output);
     });
 };
 
+// Generate languages index
+Generator.prototype.langsIndex = function(langs) {
+    var that = this;
+    var basePath = ".";
+
+    return this._writeTemplate(this.langsTemplate, {
+        langs: langs.list,
+
+        basePath: basePath,
+        staticBase: path.join(basePath, "gitbook"),
+    }, path.join(this.options.output, "index.html"))
+    .then(function() {
+        // Copy assets
+        return that.copyAssets();
+    });
+};
+
+// Copy assets
+Generator.prototype.copyAssets = function() {
+    var that = this;
+
+    return fs.copy(
+        path.join(that.options.theme, "assets"),
+        path.join(that.options.output, "gitbook")
+    );
+};
+
+// Dump search index to disk
+Generator.prototype.writeSearchIndex = function() {
+    return fs.writeFile(
+        path.join(this.options.output, 'search_index.json'),
+        this.indexer.dump()
+    );
+};
+
+Generator.prototype.finish = function() {
+    return this.copyAssets()
+    .then(this.writeSearchIndex);
+};
+
 module.exports = Generator;

lib/generate/site/search_indexer.js

@@ -0,0 +1,71 @@
+var Q = require("q");
+var _ = require("lodash");
+
+var lunr = require('lunr');
+var marked = require('marked');
+var textRenderer = require('marked-text-renderer');
+
+
+function Indexer() {
+    if(!(this instanceof Indexer)) {
+        return new Indexer();
+    }
+
+    _.bindAll(this);
+
+    // Setup lunr index
+    this.idx = lunr(function () {
+        this.ref('url');
+
+        this.field('title', { boost: 10 });
+        this.field('body');
+    });
+
+    this.renderer = textRenderer();
+}
+
+Indexer.prototype.text = function(nodes) {
+    // Copy section
+    var section = _.toArray(nodes);
+
+    // marked's Render expects this, we don't use it yet
+    section.links = {};
+
+    var options = _.extend({}, marked.defaults, {
+        renderer: this.renderer
+    });
+
+    return marked.parser(section, options);
+};
+
+Indexer.prototype.addSection = function(path, section) {
+    var url = [path, section.id].join('#');
+
+    var title = this.text(
+        _.filter(section, {'type': 'heading'})
+    );
+
+    var body = this.text(
+        _.omit(section, {'type': 'heading'})
+    );
+
+    // Add to lunr index
+    this.idx.add({
+        url: url,
+        title: title,
+        body: body,
+    });
+};
+
+Indexer.prototype.add = function(lexedPage, url) {
+    var sections = lexedPage;
+
+    _.map(sections, _.partial(this.addSection, url));
+};
+
+Indexer.prototype.dump = function() {
+    return JSON.stringify(this.idx);
+};
+
+// Exports
+module.exports = Indexer;

lib/parse/index.js

@@ -1,6 +1,8 @@
 module.exports = {
     summary: require('./summary'),
+    langs: require('./langs'),
     page: require('./page'),
+    lex: require('./lex'),
     progress: require('./progress'),
     navigation: require('./navigation'),
 };

lib/parse/langs.js

@@ -0,0 +1,23 @@
+var _ = require("lodash")
+var parseSummary = require("./summary");
+
+var parseLangs = function(content) {
+    var summary = parseSummary(content);
+
+    return {
+        list: _.chain(summary.chapters)
+            .filter(function(entry) {
+                return entry.path != null;
+            })
+            .map(function(entry) {
+                return {
+                    title: entry.title,
+                    path: entry.path,
+                    lang: entry.path.replace("/", "")
+                };
+            })
+            .value()
+    }
+};
+
+module.exports = parseLangs;

lib/parse/lex.js

@@ -0,0 +1,74 @@
+var _ = require('lodash');
+var marked = require('marked');
+
+// Split a page up into sections (lesson, exercises, ...)
+function splitSections(nodes) {
+    var section = [];
+
+    return _.reduce(nodes, function(sections, el) {
+        if(el.type === 'hr') {
+            sections.push(section);
+            section = [];
+        } else {
+            section.push(el);
+        }
+
+        return sections;
+    }, []).concat([section]); // Add remaining nodes
+}
+
+// What is the type of this section
+function sectionType(nodes, idx) {
+    var codeNodes = _.filter(nodes, {
+        type: 'code'
+    }).length;
+
+    if(codeNodes === 3 && (idx % 2) == 1) {
+        return 'exercise';
+    }
+
+    return 'normal';
+}
+
+// Generate a uniqueId to identify this section in our code
+function sectionId(section, idx) {
+    return _.uniqueId('gitbook_');
+}
+
+function lexPage(src) {
+    // Lex file
+    var nodes = marked.lexer(src);
+
+    return _.chain(splitSections(nodes))
+    .map(function(section, idx) {
+        // Detect section type
+        section.type = sectionType(section, idx);
+        return section;
+    })
+    .map(function(section, idx) {
+        // Give each section an ID
+        section.id = sectionId(section, idx);
+        return section;
+
+    })
+    .filter(function(section) {
+        return !_.isEmpty(section);
+    })
+    .reduce(function(sections, section) {
+        var last = _.last(sections);
+
+        // Merge normal sections together
+        if(last && last.type === section.type && last.type === 'normal') {
+            last.push.apply(last, [{'type': 'hr'}].concat(section));
+        } else {
+            // Add to list of sections
+            sections.push(section);
+        }
+
+        return sections;
+    }, [])
+    .value();
+}
+
+// Exports
+module.exports = lexPage;

lib/parse/page.js

@@ -2,8 +2,12 @@ var _ = require('lodash');
 var marked = require('marked');
 var hljs = require('highlight.js');
 
+var lex = require('./lex');
 var renderer = require('./renderer');
 
+var lnormalize = require('../utils/lang').normalize;
+
+
 // Synchronous highlighting with highlight.js
 marked.setOptions({
     highlight: function (code, lang) {
@@ -16,37 +20,11 @@ marked.setOptions({
 });
 
 
-// Split a page up into sections (lesson, exercises, ...)
-function splitSections(nodes) {
-    var section = [];
-
-    return _.reduce(nodes, function(sections, el) {
-        if(el.type === 'hr') {
-            sections.push(section);
-            section = [];
-        } else {
-            section.push(el);
-        }
-
-        return sections;
-    }, []).concat([section]); // Add remaining nodes
-}
-
-// What is the type of this section
-function sectionType(nodes, idx) {
-    var codeNodes = _.filter(nodes, {
-        type: 'code'
-    }).length;
-
-    if(codeNodes === 3 && (idx % 2) == 1) {
-        return 'exercise';
-    }
-
-    return 'normal';
-}
-
 // Render a section using our custom renderer
 function render(section, _options) {
+    // Copy section
+    section = _.toArray(section);
+
     // marked's Render expects this, we don't use it yet
     section.links = {};
 
@@ -61,35 +39,9 @@ function render(section, _options) {
 function parsePage(src, options) {
     options = options || {};
 
-    // Lex file
-    var nodes = marked.lexer(src);
-
-    return _.chain(splitSections(nodes))
-    .map(function(section, idx) {
-        // Detect section type
-        section.type = sectionType(section, idx);
-        return section;
-    })
-    .filter(function(section) {
-        return !_.isEmpty(section);
-    })
-    .reduce(function(sections, section) {
-        var last = _.last(sections);
-
-        // Merge normal sections together
-        if(last && last.type === section.type && last.type === 'normal') {
-            last.push.apply(last, [{'type': 'hr'}].concat(section));
-        } else {
-            // Add to list of sections
-            sections.push(section);
-        }
-
-        return sections;
-    }, [])
+    // Lex if not already lexed
+    return (_.isArray(src) ? src : lex(src))
     .map(function(section) {
-        // Generate a uniqueId to identify this section in our code
-        var id = _.uniqueId('gitbook_');
-
         // Transform given type
         if(section.type === 'exercise') {
             var nonCodeNodes = _.reject(section, {
@@ -100,10 +52,22 @@ function parsePage(src, options) {
                 'type': 'code'
             });
 
+            // Languages in code blocks
+            var langs = _.pluck(codeNodes, 'lang').map(lnormalize);
+
+            // Check that they are all the same
+            var validLangs = _.all(_.map(langs, function(lang) {
+                return lang && lang === langs[0];
+            }));
+
+            // Main language
+            var lang = validLangs ? langs[0] : null;
+
             return {
-                id: id,
+                id: section.id,
                 type: section.type,
                 content: render(nonCodeNodes),
+                lang: lang,
                 code: {
                     base: codeNodes[0].text,
                     solution: codeNodes[1].text,
@@ -114,12 +78,11 @@ function parsePage(src, options) {
 
         // Render normal pages
         return {
-            id: id,
+            id: section.id,
             type: section.type,
             content: render(section, options)
         };
-    })
-    .value();
+    });
 }
 
 // Exports

lib/parse/renderer.js

@@ -45,7 +45,7 @@ GitBookRenderer.prototype.link = function(href, title, text) {
 
     var o = this._extra_options;
     // Relative link, rewrite it to point to github repo
-    if(parsed.path[0] != '/' && o && o.repo && o.dir) {
+    if(!parsed.protocol && parsed.path[0] != '/' && o && o.repo && o.dir) {
         href = 'https://github.com/' + o.repo + '/blob' + path.normalize(path.join(
             '/',
             o.dir,
@@ -68,5 +68,27 @@ GitBookRenderer.prototype.link = function(href, title, text) {
     return out;
 };
 
+GitBookRenderer.prototype.image = function(href, title, text) {
+    // Our "fixed" href
+    var _href = href;
+
+    // Parsed version of the url
+    var parsed = url.parse(href);
+
+    // Options
+    var o = this._extra_options;
+
+    // Relative image, rewrite it depending output
+    if(!parsed.protocol && parsed.path[0] != '/' && o && o.dir && o.outdir) {
+        _href = path.relative(o.outdir, path.normalize(path.join(
+            o.dir,
+            href
+        )));
+    }
+
+    return GitBookRenderer.super_.prototype.image.call(this, _href, title, text);
+};
+
+
 // Exports
 module.exports = GitBookRenderer;

lib/utils/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+    lang: require('./lang'),
+};

lib/utils/lang.js

@@ -0,0 +1,16 @@
+var MAP = {
+    'py': 'python',
+    'js': 'javascript',
+    'rb': 'ruby',
+};
+
+function normalize(lang) {
+    var lower = lang.toLowerCase();
+    return MAP[lower] || lower;
+}
+
+// Exports
+module.exports = {
+    normalize: normalize,
+    MAP: MAP
+};

package.json

@@ -1,18 +1,21 @@
 {
     "name": "gitbook",
-    "version": "0.1.1",
+    "version": "0.1.2",
     "description": "Library and cmd utility to generate GitBooks",
     "main": "lib/index.js",
     "dependencies": {
         "q": "1.0.1",
         "lodash": "2.4.1",
         "marked": "0.3.2",
+        "marked-text-renderer": "0.0.1",
+        "lunr": "0.5.2",
         "swig": "1.3.2",
         "send": "0.2.0",
         "fstream-ignore": "0.0.7",
         "commander": "2.2.0",
         "fs-extra": "0.8.1",
-        "highlight.js": "8.0.0"
+        "highlight.js": "8.0.0",
+        "tmp": "0.0.23"
     },
     "devDependencies": {
         "mocha": "1.18.2",

test/page.js

@@ -45,6 +45,10 @@ describe('Page parsing', function() {
         // HRs inserted correctly
         assert.equal(HR_LEXED[0].content.match(/<hr>/g).length, 2);
     });
+
+    it('should detect an exercise\'s language', function() {
+        assert.equal(LEXED[1].lang, 'python');
+    });
 });
 
 

test/summary.js

@@ -10,7 +10,6 @@ var LEXED = summary(CONTENT);
 
 
 describe('Summary parsing', function () {
-    console.log(LEXED);
 
     it('should detect chapters', function() {
         assert.equal(LEXED.chapters.length, 5);

theme/assets/print.css

@@ -1 +1 @@
-h1,h2{page-break-after:avoid;page-break-before:auto}pre,blockquote{border:1px solid #999;page-break-inside:avoid}img{max-width:100%!important;page-break-inside:avoid}section{page-break-after:always}section#cover{padding:3cm 0;text-align:center}section#cover h1{font-size:1.5cm}section#summary{text-align:center}section#summary ul{font-size:.5cm;line-height:1.8em;padding:0;margin:0;list-style:none}section#summary>ul>li{margin-bottom:1cm}section#summary>ul>li>a{font-size:.6cm}section article{margin:1.5cm}section article.new-chapter{page-break-after:always;font-size:.6cm;text-align:center;padding:3cm 0;border-top:1px solid #ccc}@media print{section article.new-chapter{border:0}}section article .exercise{border:3px solid #ddd}
+h1,h2{page-break-after:avoid;page-break-before:auto}pre,blockquote{border:1px solid #999;page-break-inside:avoid}img{max-width:100%!important;page-break-inside:avoid}section{page-break-after:always}section#cover{padding:3cm 0;text-align:center}section#cover h1{font-size:1.5cm}section#summary{text-align:center}section#summary ul{font-size:.5cm;line-height:1.8em;padding:0;margin:0;list-style:none}section#summary>ul>li{margin-bottom:1cm}section#summary>ul>li>a{font-size:.6cm}section article{margin:1.5cm}section article.new-chapter{page-break-after:always;font-size:.6cm;text-align:center;padding:3cm 0;border-top:1px solid #ccc}@media print{section article.new-chapter{border:0}}section article .exercise{margin:1cm 0;padding:.4cm;page-break-inside:avoid;border:3px solid #ddd}section article .exercise .exercise-header{margin-bottom:.4cm;padding-bottom:.2cm;border-bottom:1px solid #ddd}

theme/javascript/app.js

@@ -8,10 +8,10 @@ require([
     "core/keyboard",
     "core/exercise",
     "core/progress",
-    "core/sidebar"
-], function($, storage, analytic, sharing, _state, keyboard, exercise, progress, sidebar){
+    "core/sidebar",
+    "core/search"
+], function($, storage, analytic, sharing, state, keyboard, exercise, progress, sidebar, search){
     $(document).ready(function() {
-        var state = _state();
         var $book = state.$book;
 
         // Initialize storage
@@ -20,6 +20,9 @@ require([
         // Init sidebar
         sidebar.init();
 
+        // Load search
+        search.init();
+
         // Init keyboard
         keyboard.init();
 

theme/javascript/core/exercise.js

@@ -20,7 +20,7 @@ define([
 
             analytic.track("exercise.submit");
 
-            execute(editor.getValue(), codeValidation, function(err, result) {
+            execute("javascript", editor.getValue(), codeValidation, function(err, result) {
                 $exercise.toggleClass("return-error", err != null);
                 $exercise.toggleClass("return-success", err == null);
                 if (err) $exercise.find(".alert-danger").text(err.message || err);
@@ -38,7 +38,7 @@ define([
 
     // Prepare all exercise
     var init = function() {
-        state().$book.find("section.exercise").each(function() {
+        state.$book.find("section.exercise").each(function() {
             prepareExercise($(this));
         });
     };

theme/javascript/core/keyboard.js

@@ -2,8 +2,9 @@ define([
     "jQuery",
     "Mousetrap",
     "core/navigation",
-    "core/sidebar"
-], function($, Mousetrap, navigation, sidebar){
+    "core/sidebar",
+    "core/search"
+], function($, Mousetrap, navigation, sidebar, search){
     // Bind keyboard shortcuts
     var init = function() {
         // Next
@@ -23,9 +24,16 @@ define([
             sidebar.toggle();
             return false;
         });
+
+        // Toggle Search
+        Mousetrap.bind(['f'], function(e) {
+            search.toggle();
+            return false;
+        });
     };
 
     return {
-        init: init
+        init: init,
+        search: search
     };
 });

theme/javascript/core/progress.js

@@ -6,7 +6,7 @@ define([
 ], function(_, $, storage, state) {
     // Get current level
     var getCurrentLevel = function() {
-        return state().level;
+        return state.level;
     };
 
     // Return all levels

theme/javascript/core/search.js

@@ -0,0 +1,97 @@
+define([
+    "jQuery",
+    "lodash",
+    "lunr",
+    "utils/storage",
+    "core/state",
+    "core/sidebar"
+], function($, _, lunr, storage, state, sidebar) {
+    var index = null;
+    var $searchBar = state.$book.find(".book-search");
+    var $searchInput = $searchBar.find("input");
+
+    // Use a specific idnex
+    var useIndex = function(data) {
+        index = lunr.Index.load(data);
+    };
+
+    // Load complete index
+    var loadIndex = function() {
+        $.getJSON(state.basePath+"/search_index.json")
+        .then(useIndex);
+    };
+
+    // Search for a term
+    var search = function(q) {
+        if (!index) return;
+        var results = _.chain(index.search(q))
+        .map(function(result) {
+            var parts = result.ref.split("#")
+            return {
+                path: parts[0],
+                hash: parts[1]
+            }
+        })
+        .value();
+
+        return results;
+    };
+
+    // Toggle search bar
+    var toggleSearch = function(_state) {
+        if (state != null && isSearchOpen() == _state) return;
+
+        state.$book.toggleClass("with-search", _state);
+
+        // If search bar is open: focus input
+        if (isSearchOpen()) {
+            sidebar.toggle(true);
+            $searchInput.focus();
+        } else {
+            $searchInput.blur();
+            $searchInput.val("");
+            sidebar.filter(null);
+        }
+    };
+
+    // Return true if search bar is open
+    var isSearchOpen = function() {
+        return state.$book.hasClass("with-search");
+    };
+
+
+    var init = function() {
+        loadIndex();
+
+        // Toggle search
+        state.$book.find(".book-header .toggle-search").click(function(e) {
+            e.preventDefault();
+            toggleSearch();
+        });
+
+        $searchInput.keyup(function(e) {
+            var key = (e.keyCode ? e.keyCode : e.which);
+            var q = $(this).val();
+
+            if (key == 27) {
+                e.preventDefault();
+                toggleSearch(false);
+                return;
+            }
+            if (q.length == 0) {
+                sidebar.filter(null);
+            } else {
+                var results = search(q);
+                sidebar.filter(
+                    _.pluck(results, "path")
+                );
+            }
+        });
+    };
+
+    return {
+        init: init,
+        search: search,
+        toggle: toggleSearch
+    };
+});

theme/javascript/core/sidebar.js

@@ -1,32 +1,31 @@
 define([
+    "lodash",
     "utils/storage",
     "utils/platform",
     "core/state"
-], function(storage, platform, state) {
+], function(_, storage, platform, state) {
+    var $summary = state.$book.find(".book-summary");
 
     // Toggle sidebar with or withour animation
     var toggleSidebar = function(_state, animation) {
-        if (-state != null && isOpen() == _state) return;
+        if (state != null && isOpen() == _state) return;
         if (animation == null) animation = true;
 
-        var $book = state().$book;
-        $book.toggleClass("without-animation", !animation);
-        $book.toggleClass("with-summary", _state);
+        state.$book.toggleClass("without-animation", !animation);
+        state.$book.toggleClass("with-summary", _state);
 
         storage.set("sidebar", isOpen());
     };
 
     // Return true if sidebar is open
     var isOpen = function() {
-        return state().$book.hasClass("with-summary");
+        return state.$book.hasClass("with-summary");
     };
 
     // Prepare sidebar: state and toggle button
     var init = function() {
-        var $book = state().$book;
-
         // Toggle summary
-        $book.find(".book-header .toggle-summary").click(function(e) {
+        state.$book.find(".book-header .toggle-summary").click(function(e) {
             e.preventDefault();
             toggleSidebar();
         });
@@ -37,8 +36,21 @@ define([
         }
     };
 
+    // Filter summary with a list of path
+    var filterSummary = function(paths) {
+        $summary.find("li").each(function() {
+            var path = $(this).data("path");
+            var st = paths == null || _.contains(paths, path);
+
+            $(this).toggle(st);
+            if (st) $(this).parents("li").show();
+        });
+    };
+
     return {
+        $el: $summary,
         init: init,
-        toggle: toggleSidebar
+        toggle: toggleSidebar,
+        filter: filterSummary
     }
 });

theme/javascript/core/state.js

@@ -1,14 +1,14 @@
 define([
     "jQuery"
 ], function() {
-    return function() {
-        var $book = $(".book");
+    var $book = $(".book");
 
-        return {
-            '$book': $book,
+    return {
+        '$book': $book,
 
-            'githubId': $book.data("github"),
-            'level': $book.data("level")
-        };
+        'githubId': $book.data("github"),
+        'level': $book.data("level"),
+        'basePath': $book.data("basepath"),
+        'revision': $book.data("revision")
     };
 });

theme/javascript/execute/javascript.js

@@ -0,0 +1,7 @@
+define(function() {
+    return {
+        id: "javascript",
+        assertCode: "function assert(condition, message) { \nif (!condition) { \n throw message || \"Assertion failed\"; \n } \n }\n",
+        REPL: JSREPL
+    };
+});

theme/javascript/utils/analytic.js

@@ -9,7 +9,10 @@ define([
     });
 
     var isAvailable = function() {
-        return (typeof mixpanel !== "undefined");
+        return (
+            typeof mixpanel !== "undefined" &&
+            typeof mixpanel.track === "function"
+        );
     };
 
     var track = function(e, data) {

theme/javascript/utils/execute.js

@@ -1,5 +1,12 @@
-define(function(){
-    var evalJS = function(code, callback) {
+define([
+    "execute/javascript"
+], function(javascript) {
+    var LANGUAGES = {
+        "javascript": javascript
+    };
+
+
+    var evalJS = function(lang, code, callback) {
         var ready = false;
         var finished = false;
 
@@ -11,7 +18,7 @@ define(function(){
             return callback.apply(null, arguments);
         };
 
-        var jsrepl;
+        var repl;
 
         // Handles all our events
         var eventHandler = function(data, eventType) {
@@ -42,14 +49,14 @@ define(function(){
                     // We're good to get results and stuff back now
                     ready = true;
                     // Eval our code now that the runtime is ready
-                    jsrepl.eval(code);
+                    repl.eval(code);
                     break;
                 default:
                     console.log('Unhandled event =', eventType, 'data =', data);
             }
         };
 
-        jsrepl = new JSREPL({
+        repl = new lang.REPL({
             input: eventHandler,
             output: eventHandler,
             result: eventHandler,
@@ -61,16 +68,16 @@ define(function(){
             }
         });
 
-        jsrepl.loadLanguage('javascript', eventHandler);
+        repl.loadLanguage(lang.id, eventHandler);
     };
 
+    var execute = function(lang, solution, validation, callback) {
+        // Check language is supported
+        if (!LANGUAGES[lang]) return callback(new Error("Language '"+lang+"' not available for execution"));
 
-    var ass = "function assert(condition, message) { \nif (!condition) { \n throw message || \"Assertion failed\"; \n } \n }\n";   
-
-    var execute = function(solution, validation, callback) {
         // Validate with validation code
-        var code = [solution, ass, validation].join(";\n");
-        evalJS(code, function(err, res) {
+        var code = [solution, LANGUAGES[lang].assertCode, validation].join(";\n");
+        evalJS(LANGUAGES[lang], code, function(err, res) {
             if(err) return callback(err);
 
             if (res.type == "error") callback(new Error(res.value));

theme/stylesheets/book/body.less

@@ -5,7 +5,15 @@
         right: 0px;
         left: 0px;
         bottom: 0px;
-        overflow-y: auto;
+
+        .body-inner {
+            position: absolute;
+            top: 0px;
+            right: 0px;
+            left: 0px;
+            bottom: 0px;
+            overflow-y: auto;
+        }
 
         .transition(left 0.5s ease);
 
@@ -14,7 +22,6 @@
         .page-wrapper {
             position: relative;
             min-height: 100%;
-            padding-bottom: 100px;
 
             .page-inner {
                 max-width: 800px;
@@ -39,6 +46,16 @@
                 }
             }
         }
+
+        @media (max-width: @mobileMaxWidth) {
+            overflow-y: auto;
+
+            .body-inner {
+                position: static;
+                padding-bottom: 20px;
+                min-height: calc(~"100% - 57px")
+            }
+        }
     }
 
     &.with-summary {

theme/stylesheets/book/footer.less

@@ -1,42 +0,0 @@
-.book {
-    .page-footer {
-        position: absolute;
-        bottom: 0px;
-
-        width: 100%;
-        height: 80px;
-
-        padding: 10px;
-
-        overflow: hidden;
-        
-        color: #fff;
-
-        .navigation-link {
-            display: inline-block;
-            text-align: center;
-            width: 100%;
-            height: 100%;
-            font-size: 24px;
-            line-height: 60px;
-            border-radius: 2px;
-
-            background: @brand-success;
-            color: inherit;
-
-            text-transform: uppercase;
-
-            &:hover {
-                background: darken(@btn-success-bg, 5%);
-                text-decoration: none;
-            }
-
-            &.coming-soon, &.coming-soon:hover {
-                background: #f0ad4e;
-            }
-            &.finished, &.finished:hover {
-                background: darken(@btn-success-bg, 5%);
-            }
-        }
-    }
-}

theme/stylesheets/book/languages.less

@@ -0,0 +1,46 @@
+.book-langs-index {
+    width: 100%;
+    height: 100%;
+    background: #edece4;
+    padding: 40px 0px;
+    margin: 0px;
+    overflow: auto;
+
+    .inner {
+        max-width: 350px;
+        width: 100%;
+
+        margin: 0px auto;
+        padding: 15px;
+
+        background: #fff;
+        border-radius: 3px;
+
+        h1 {
+            margin: 0px;
+            text-align: center;
+        }
+
+        .languages {
+            list-style: none;
+            padding: 0px;
+            margin: 0px;
+            margin-top: 20px;
+
+            border-top: 1px solid #eee;
+
+            li {
+                text-align: center;
+                padding: 10px 5px;
+
+                font-size: 16px;
+
+                border-bottom: 1px solid #eee;
+
+                a {
+
+                }
+            }
+        }
+    }
+}

theme/stylesheets/book/markdown.less

@@ -156,7 +156,10 @@
             margin-bottom: 0; }
      
     table {
-        padding: 0; }
+        width: 100%;
+        padding: 0;
+    }
+    
         table tr {
             border-top: 1px solid #cccccc;
             background-color: white;
@@ -181,7 +184,10 @@
                 margin-bottom: 0; }
      
     img {
-        max-width: 100%; }
+        max-width: 100%;
+        display: block;
+        margin: 0px auto;
+    }
      
     span.frame {
         display: block;

theme/stylesheets/book/navigation.less

@@ -0,0 +1,45 @@
+.book .book-body  {
+    .navigation {
+        position: absolute;
+        top: 0px;
+        bottom: 0px;
+        margin: 0;
+        max-width: 150px;
+        min-width: 90px;
+
+        display: flex;
+        justify-content:center;
+        align-content:center;
+        flex-direction:column;
+
+        font-size: 40px;
+        color: rgba(0,0,0, 0.5);
+
+        text-align: center;
+
+        .transition(all 350ms ease);
+
+        &:hover {
+            background-color: rgba(0,0,0, 0.06);
+            text-decoration: none;
+        } 
+
+        &.navigation-next {
+            right: 0px;
+        }
+        &.navigation-prev {
+            left: 0px;
+        }
+    }
+
+    @media (max-width: @mobileMaxWidth) {
+        .navigation {
+            position: static;
+            top: auto;
+            max-width: 50%;
+            width: 50%;
+            display: inline-block;
+            float: left;
+        } 
+    }
+}

theme/stylesheets/book/progress.less

@@ -23,6 +23,7 @@
         position: relative;
         background: #fff;
         margin-bottom: 20px;
+        z-index: 10;
 
         .bar {
             height: 8px;

theme/stylesheets/book/summary.less

@@ -1,4 +1,6 @@
 .book {
+    @searchHeight: 41px;
+
     .book-summary {
         @width: 250px;
 
@@ -8,19 +10,49 @@
         bottom: 0px;
         z-index: 1;
 
-        overflow-y: auto;
-
         width: @width;
         background: #2e3133;
         color: #e2edf2;
 
         .transition(all 0.5s ease);
 
+        .book-search {
+            padding: 6px;
+            padding-top: 0px;
+
+            background: #242628;
+            border-bottom: 1px solid #333;
+
+            position: absolute;
+            top: -@searchHeight;
+            left: 0px;
+            right: 0px;
+
+            .transition(top 0.5s ease);
+
+
+            input, input:focus {
+                width: 100%;
+                border: none;
+                .box-shadow(none);
+            }
+        }
+
         ul.summary {
+            position: absolute;
+            top: 0px;
+            left: 0px;
+            right: 0px;
+            bottom: 0px;
+
+            overflow-y: auto;
+
             list-style: none;
             margin: 0px;
             padding: 0px;
 
+            .transition(top 0.5s ease);
+
             li {
                 list-style: none;
                 
@@ -96,4 +128,16 @@
             .transition(none) !important;
         }
     }
+
+    &.with-search {
+        .book-summary {
+            .book-search {
+                top: 0px;
+            }
+
+            ul.summary {
+                top: @searchHeight;
+            }
+        }
+    }
 }

theme/stylesheets/main.less

@@ -7,13 +7,14 @@
 
 @import "highlight.less";
 
+@import "book/languages.less";
 @import "book/header.less";
 @import "book/summary.less";
 @import "book/body.less";
-@import "book/footer.less";
 @import "book/exercise.less";
 @import "book/markdown.less";
 @import "book/progress.less";
+@import "book/navigation.less";
 
 * {
     -webkit-overflow-scrolling: touch;

theme/stylesheets/print.less

@@ -65,8 +65,17 @@ section {
         }
 
         .exercise {
+            margin: 1cm 0cm;
+            padding: 0.4cm;
+            page-break-inside: avoid;
+
             border: 3px solid #ddd;
-            
+
+            .exercise-header {
+                margin-bottom: 0.4cm;
+                padding-bottom: 0.2cm;
+                border-bottom: 1px solid #ddd;
+            }
         }
     }
 }

theme/stylesheets/variables.less

@@ -1,11 +1,9 @@
 /* Base static */
 @staticPath: "./";
 
-/* Colors */
-@codeboxMainColor: #F16956; /* red */
-@codeboxMainColorDarker: darken(@codeboxMainColor, 15%);
+// Sizes
+@mobileMaxWidth: 1240px;
 
-@codeboxMainColor2: #353D48;
 
 // Basics of a navbar
 @navbar-height:                    50px;
@@ -22,13 +20,6 @@
 @navbar-default-brand-hover-color:         @navbar-default-link-color;
 @navbar-default-brand-hover-bg:            transparent;
 
-// Navbar toggle
-@navbar-default-toggle-hover-bg:           #fff;
-@navbar-default-toggle-icon-bar-bg:        @codeboxMainColorDarker;
-@navbar-default-toggle-border-color:       @codeboxMainColorDarker;
-@navbar-default-link-active-color:         @codeboxMainColor;
-@navbar-default-link-active-bg:            #fff;
-
 @border-radius-base:  1px;
 @border-radius-large: 3px;
 @border-radius-small: 1px;

theme/templates/includes/book/footer.html

@@ -1,15 +0,0 @@
-<div class="page-footer">
-    {% if _input == "README.md" %}
-        <a href="{{ basePath }}/{{ progress.current.next.path|mdLink }}" class="navigation-link">Start</a>
-    {% else %}
-        {% if progress.current.next %}
-            {% if progress.current.next.path %}
-            <a href="{{ basePath }}/{{ progress.current.next.path|mdLink }}" class="navigation-link next">Next</a>
-            {% else %}
-            <div class="navigation-link coming-soon">Coming soon</div>
-            {% endif %}
-        {% else %}
-        <div class="navigation-link finished">Finished!</div>
-        {% endif %}
-    {% endif %}
-</div>

theme/templates/includes/book/header.html

@@ -2,6 +2,7 @@
     <!-- Actions Left -->
     <a href="{{ githubHost }}{{ githubId }}" target="_blank" class="btn pull-left"><i class="fa fa-github-alt"></i></a>
     <a href="#" class="btn pull-left toggle-summary"><i class="fa fa-align-justify"></i></a>
+    <a href="#" class="btn pull-left toggle-search"><i class="fa fa-search"></i></a>
 
     <!-- Actions Right -->
     <a href="#" target="_blank" class="btn pull-right" data-sharing="google-plus"><i class="fa fa-google-plus"></i></a>
@@ -13,5 +14,5 @@
 
 
     <!-- Title -->
-    <h1><a href="{{ basePath }}/README.html" >{{ title }}</a></h1>
+    <h1><a href="{{ basePath }}/" >{{ title }}</a></h1>
 </div>

theme/templates/includes/book/summary.html

@@ -1,4 +1,7 @@
 <div class="book-summary">
+    <div class="book-search">
+        <input type="text" placeholder="Search" class="form-control" />
+    </div>
     <ul class="summary">
         <li>
             <a href="{{ githubHost }}{{ githubAuthor }}" target="blank">About the author</a>
@@ -10,11 +13,11 @@
             <a href="{{ githubHost }}{{ githubId }}/edit/master/{{ _input }}" target="blank">Edit and Contribute</a>
         </li>
         <li class="divider"></li>
-        <li data-level="0">
-            <a href="{{ basePath }}/README.html"><i class="fa fa-check"></i> Introduction</a>
+        <li data-level="0" data-path="index.html">
+            <a href="{{ basePath }}/"><i class="fa fa-check"></i> Introduction</a>
         </li>
         {% for item in summary.chapters %}
-            <li {% if item._path == _input %}class="active"{% endif %} data-level="{{ item.level }}">
+            <li {% if item._path == _input %}class="active"{% endif %} data-level="{{ item.level }}" {% if item.path %}data-path="{{ item.path|mdLink }}"{% endif %}>
                 {% if item.path %}
                 <a href="{{ basePath }}/{{ item.path|mdLink }}">
                     <i class="fa fa-check"></i> <b>{{ item.level }})</b> {{ item.title }}
@@ -25,7 +28,7 @@
                 {% if item.articles.length > 0 %}
                 <ul class="articles">
                     {% for article in item.articles %}
-                        <li {% if article._path == _input %}class="active"{% endif %} data-level="{{ article.level }}">
+                        <li {% if article._path == _input %}class="active"{% endif %} data-level="{{ article.level }}" {% if article.path %}data-path="{{ article.path|mdLink }}"{% endif %}>
                             {% if article.path %}
                             <a href="{{ basePath }}/{{ article.path|mdLink }}">
                                 <i class="fa fa-check"></i> <b>{{ article.level }})</b> {{ article.title }}

theme/templates/langs.html

@@ -0,0 +1,21 @@
+{% extends "layout.html" %}
+
+{% block title %}{{ title }}{% endblock %}
+
+{% block content %}
+<div class="book-langs-index">
+    <div class="inner">
+        <h1>{{ title }}</h1>
+
+        <ul class="languages">
+        {%  for lang in langs %}
+            <li>
+                <a href="{{ basePath}}/{{ lang.path }}">{{ lang.title }}</a>
+            </li>
+        {% endfor %}
+        </ul>
+    </div>
+</div>
+{% endblock %}
+
+{% block javascript %}{% endblock %}

theme/templates/page.html

@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="{{ staticBase }}/print.css">
 {% endblock %}
 
-{% set exercise = 0 %}
+{% set exercise = 1 %}
 {% block content %}
     {# Cover #}
     <section id="cover">
@@ -41,6 +41,22 @@
     </section>
 
     {# Pages content #}
+    <section>
+        <article id="README.md">
+        {% for section in pages["README.md"].content %}
+            {% if section.type == "normal" %}
+                {% autoescape false %}{{ section.content }}{% endautoescape %}
+            {% elif section.type == "exercise" %}
+                <div class="exercise">
+                    <div class="exercise-header">Exercise #{{ exercise }}</div>
+                    {% autoescape false %}{{ section.content }}{% endautoescape %}
+                    <pre><code>{% autoescape false %}{{ section.code.base|code }}{% endautoescape %}</code></pre>
+                    {% set exercise = exercise + 1 %}
+                </div>
+            {% endif %}
+        {% endfor %}
+        </article>
+    </section>
     {% for item in summary.chapters %}
         {% if item.articles.length > 0 %}
         <section>
@@ -49,28 +65,55 @@
             </article>
 
             {% for article in item.articles %}
-                <article id="{{ article.path }}">
-                {% for section in pages[article.path].content %}
-                        {% if section.type == "normal" %}
-                            {% autoescape false %}{{ section.content }}{% endautoescape %}
-                        {% elif section.type == "exercise" %}
-                            <div class="exercise">
-                                <div class="exercise-header">Exercise #{{ exercise }}</div>
+                {% if pages[article.path] %}
+                    <article id="{{ article.path }}">
+                    {% for section in pages[article.path].content %}
+                            {% if section.type == "normal" %}
                                 {% autoescape false %}{{ section.content }}{% endautoescape %}
-                                <pre>
-                                    <code>
-                                    {% autoescape false %}{{ section.code.base|code }}{% endautoescape %}
-                                    </code>
-                                </pre>
-                                {% set exercise = exercise + 1 %}
-                            </div>
-                        {% endif %}
-                    {% endfor %}
-                </article>
+                            {% elif section.type == "exercise" %}
+                                <div class="exercise">
+                                    <div class="exercise-header">Exercise #{{ exercise }}</div>
+                                    {% autoescape false %}{{ section.content }}{% endautoescape %}
+                                    <pre><code>{% autoescape false %}{{ section.code.base|code }}{% endautoescape %}</code></pre>
+                                    {% set exercise = exercise + 1 %}
+                                </div>
+                            {% endif %}
+                        {% endfor %}
+                    </article>
+                {% endif %}
             {% endfor %}
         </section>
         {% endif %}
     {% endfor %}
+
+
+    {# Exercise solutions #}
+    {% if exercise > 1 %}
+        {% set exercise = 1 %}
+        <section>
+            <article class="new-chapter">
+                <h1>Exercise Solutions</h1>
+            </article>
+            <article>
+            {% for item in summary.chapters %}
+                {% for article in item.articles %}
+                    {% if pages[article.path] %}
+                        {% for section in pages[article.path].content %}
+                            {% if section.type == "exercise" %}
+                                <div class="exercise">
+                                    <div class="exercise-header">Exercise #{{ exercise }}</div>
+                                    {% autoescape false %}{{ section.content }}{% endautoescape %}
+                                    <pre><code>{% autoescape false %}{{ section.code.solution|code }}{% endautoescape %}</code></pre>
+                                    {% set exercise = exercise + 1 %}
+                                </div>
+                            {% endif %}
+                        {% endfor %}
+                    {% endif %}
+                {% endfor %}
+            {% endfor %}
+            </article>
+        </section>
+    {% endif %}
 {% endblock %}
 
 {% block javascript %}{% endblock %}

theme/templates/site.html

@@ -2,27 +2,34 @@
 
 {% block title %}{{ progress.current.title }}{% parent %}{% endblock %}
 {% block content %}
-<div class="book" data-github="{{ githubId }}" data-level="{{ progress.current.level }}">
+<div class="book" data-github="{{ githubId }}" data-level="{{ progress.current.level }}" data-basepath="{{ basePath }}" data-revision="{{ revision }}">
     {% include "includes/book/header.html" %}
     {% include "includes/book/summary.html" %}
     <div class="book-body" tabindex="-1">
-        <div class="page-wrapper">
-            {% include "includes/book/progress.html" %}
+        <div class="body-inner">
+            <div class="page-wrapper">
+                {% include "includes/book/progress.html" %}
 
-            <div class="page-inner">
-            {% for section in content %}
-                <section class="{{ section.type }}" id="section-{{ section.id }}">
-                {% if section.type == "normal" %}
-                    {% autoescape false %}{{ section.content }}{% endautoescape %}
-                {% elif section.type == "exercise" %}
-                    {% include "./includes/book/exercise.html" with {section: section} %}
-                {% endif %}
-                </section>
-            {% endfor %}
+                <div class="page-inner">
+                {% for section in content %}
+                    <section class="{{ section.type }}" id="section-{{ section.id }}">
+                    {% if section.type == "normal" %}
+                        {% autoescape false %}{{ section.content }}{% endautoescape %}
+                    {% elif section.type == "exercise" %}
+                        {% include "./includes/book/exercise.html" with {section: section} %}
+                    {% endif %}
+                    </section>
+                {% endfor %}
+                </div>
             </div>
-
-            {% include "includes/book/footer.html" %}
         </div>
+
+        {% if progress.current.prev and progress.current.prev.path %}
+        <a href="{{ basePath }}/{{ progress.current.prev.path|mdLink }}" class="navigation navigation-prev"><i class="fa fa-angle-left"></i></a>
+        {% endif %}
+        {% if progress.current.next and progress.current.next.path %}
+        <a href="{{ basePath }}/{{ progress.current.next.path|mdLink }}" class="navigation navigation-next"><i class="fa fa-angle-right"></i></a>
+        {% endif %}
     </div>
 </div>
 {% endblock %}