Bump version to 0.4.7

More than two section level in summary

.gitignore

@@ -23,3 +23,8 @@ build/Release
 # Deployed apps should consider commenting this line out:
 # see https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
 node_modules
+
+theme/javascript/vendors
+
+# vim swapfile
+*.swp

CHANGES.md

@@ -0,0 +1,2 @@
+# Release notes
+

Gruntfile.js

@@ -4,10 +4,18 @@ module.exports = function (grunt) {
     // Load NPM tasks
     grunt.loadNpmTasks('grunt-contrib-less');
     grunt.loadNpmTasks('grunt-contrib-requirejs');
+    grunt.loadNpmTasks("grunt-bower-install-simple");
 
     // Init GRUNT configuraton
     grunt.initConfig({
         pkg: grunt.file.readJSON('package.json'),
+        'bower-install-simple': {
+            options: {
+                color:       true,
+                production:  false,
+                directory:   "theme/javascript/vendors"
+            }
+        },
         less: {
             development: {
                 options: {
@@ -31,11 +39,12 @@ module.exports = function (grunt) {
                     optimize: "uglify", //"uglify",
                     include: ["requireLib"],
                     paths: {
-                        "jQuery": 'vendors/jquery',
+                        "jQuery": 'vendors/jquery/dist/jquery',
-                        "lodash": 'vendors/lodash',
+                        "lodash": 'vendors/lodash/dist/lodash',
-                        "requireLib": 'vendors/require',
+                        "requireLib": 'vendors/requirejs/require',
-                        "Mousetrap": 'vendors/mousetrap',
+                        "Mousetrap": 'vendors/mousetrap/mousetrap',
-                        "lunr": path.join(__dirname, "node_modules/lunr/lunr")
+                        "lunr": 'vendors/lunr.js/lunr',
+                        "URI": 'vendors/URIjs/src/URI'
                     },
                     shim: {
                         'jQuery': {
@@ -56,8 +65,11 @@ module.exports = function (grunt) {
         }
     });
 
+    grunt.registerTask("bower-install", [ "bower-install-simple" ]);
+
     // Build
     grunt.registerTask('build', [
+        'bower-install',
         'less',
         'requirejs'
     ]);

README.md

@@ -3,7 +3,7 @@ GitBook
 
 [![Build Status](https://travis-ci.org/GitbookIO/gitbook.png?branch=master)](https://travis-ci.org/GitbookIO/gitbook)
 
-GitBook is a command line tool (and Node.js library) for building beautiful programming books and exercises using GitHub/Git and Markdown. You can see an example: [Learn Javascript](http://gitbookio.github.io/javascript/). An [editor](https://github.com/GitbookIO/editor) is available for Windows, Mac and Linux. You can follow [@GitBookIO](https://twitter.com/GitBookIO) on Twitter.
+GitBook is a command line tool (and Node.js library) for building beautiful books and exercises using GitHub/Git and Markdown. You can see an example: [Learn Javascript](https://www.gitbook.io/book/GitBookIO/javascript). An [editor](https://github.com/GitbookIO/editor) is available for Windows, Mac and Linux. You can follow [@GitBookIO](https://twitter.com/GitBookIO) on Twitter. Complete documentation is available at [help.gitbook.io](http://help.gitbook.io/).
 
 ![Image](https://raw.github.com/GitbookIO/gitbook/master/preview.png)
 
@@ -30,14 +30,66 @@ $ gitbook build ./repository --output=./outputFolder
 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
---githubHost <url>   The url of the github host (defaults to https://github.com/)
+--config <config file>    Configuration file to use, defaults to book.json
---plugins <plugins>  List of plugins to use separated by ","
+```
---pluginsConfig <json file> JSON File containing plugins configuration
+
+GitBook loads the default configuration from a `book.json` file in the repository if it exists.
+
+Here are the options that can be stored in this file:
+
+```
+{
+    // Folders to use for output (caution: it overrides the value from the command line)
+    "output": null,
+
+    // Generator to use for building (caution: it overrides the value from the command line)
+    "generator": "site",
+
+    // Book title and description (defaults are extracted from the README)
+    "title": null,
+    "description": null,
+
+    // GitHub information (defaults are extracted using git)
+    "github": null,
+    "githubHost": "https://github.com/",
+
+    // Plugins list, can contain "-name" for removing default plugins
+    "plugins": [],
+
+    // Global configuration for plugins
+    "pluginsConfig": {
+        "fontSettings": {
+            "theme": "sepia", "night" or "white",
+            "family": "serif" or "sans",
+            "size": 1 to 4
+        }
+    },
+
+    // Set another theme with your own layout
+    // It's recommended to use plugins or add more options for default theme, though
+    // See https://github.com/GitbookIO/gitbook/issues/209
+    "theme": "./localtheme",
+
+    // Links in template (null: default, false: remove, string: new value)
+    "links": {
+        // Link to home in the top-left corner
+        "home": null,
+
+        // Links in top of sidebar
+        "about": null,
+        "issues": null,
+        "contribute": null,
+
+        // Sharing links
+        "sharing": {
+            "google": null,
+            "facebook": null,
+            "twitter": null
+        }
+    }
+}
 ```
 
 You can publish your books to our index by visiting [GitBook.io](http://www.gitbook.io)
@@ -46,19 +98,19 @@ You can publish your books to our index by visiting [GitBook.io](http://www.gitb
 
 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.
+* **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.
+* **PDF**: A complete PDF book with exercise solutions at the end of the book. Generate 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.
+* **eBook**: A complete eBook with exercise solutions at the end of the book. Generate 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```.
+* **Single Page**: The book will be stored in a single printable HTML page. This format is used for conversion to PDF or eBook. Generate 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```.
+* **JSON**: This format is used for debugging or extracting metadata from a book. Generate 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`.
+A book is a Git repository containing at least 2 files: `README.md` and `SUMMARY.md`.
 
 #### README.md
 
-As usual, it should contains an introduction for your book. It will be automatically added to the final summary.
+Typically, this should be the introduction for your book. It will be automatically added to the final summary.
 
 #### SUMMARY.md
 
@@ -78,11 +130,11 @@ This is the summary of my book.
     * [example 1](section2/example1.md)
 ```
 
-Files that are not included in the `SUMMARY.md` will not be processed by `gitbook`.
+Files that are not included in `SUMMARY.md` will not be processed by `gitbook`.
 
 #### Exercises
 
-A book can contain interactive exercises (currently only in Javascript but Python and Ruby are coming soon ;) ). An exercise is a code challenge provided to the reader, which is given a code editor to write a solution which is checked against the book author's validation code.
+A book can contain interactive exercises (currently only in Javascript but Python and Ruby are coming soon ;) ). An exercise is a code challenge provided to the reader, who is given a code editor to write a solution which is checked against the book author's validation code.
 
 An exercise is defined by 4 simple parts:
 
@@ -91,7 +143,7 @@ An exercise is defined by 4 simple parts:
 * **Solution** code, being a correct solution to the exercise
 * **Validation** code that tests the correctness of the user's input
 
-Exercises need to start and finish with a separation bar (```---``` or ```***```). It should contain 3 code elements (**base**, **solution** and **validation**). It can contain a 4th element that provides **context** code (functions, imports of libraries etc ... that shouldn't be displayed to the user).
+Exercises need to start and finish with a separation bar (```---``` or ```***```). It should contain 3 code elements (**base**, **solution** and **validation**). It can contain a 4th element that provides **context** code (functions, imports of libraries, etc which shouldn't be displayed to the user).
 
     ---
 
@@ -133,11 +185,22 @@ You can see a complete example with the [Learn Git](https://github.com/GitbookIO
 
 #### 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`)
+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`)
+
+#### Cover
+
+A cover image can be set by creating a file: **/cover.jpg**.
+The best resolution is **1800x2360**. The generation of the cover can be done automatically using the plugin [autocover](https://github.com/GitbookIO/plugin-autocover).
+
+A small version of the cover can also be set by creating a file: **/cover_small.jpg**.
+
+#### Publish your book
+
+The platform [GitBook.io](https://www.gitbook.io/) is like an "Heroku for books": you can create a book on it (public, paid, or private) and update it using **git push**.
 
 #### Plugins
 
-Plugins can used to extend your book functionnalities. Read [GitbookIO/plugin](https://github.com/GitbookIO/plugin) for more informations about how to build a plugin for gitbook.
+Plugins can used to extend your book's functionality. Read [GitbookIO/plugin](https://github.com/GitbookIO/plugin) for more information about how to build a plugin for GitBook.
 
 ##### Default plugins:
 
@@ -148,5 +211,9 @@ Plugins can used to extend your book functionnalities. Read [GitbookIO/plugin](h
 
 * [Google Analytics](https://github.com/GitbookIO/plugin-ga): Google Analytics tracking for your book
 * [Disqus](https://github.com/GitbookIO/plugin-disqus): Disqus comments integration in your book
-* [Transform comments to notes](https://github.com/erixtekila/gitbook-plugin-comments): Allow markdown comments to be inserted in HTML output
+* [Autocover](https://github.com/GitbookIO/plugin-autocover): Generate a cover for your book
-* [Send code to console](https://github.com/erixtekila/gitbook-plugin-toconsole): Evaluate javascript blockin the browser inspector's console
+* [Transform annoted quotes to notes](https://github.com/erixtekila/gitbook-plugin-richquotes): Allow extra markdown markup to render blockquotes as nice notes
+* [Send code to console](https://github.com/erixtekila/gitbook-plugin-toconsole): Evaluate javascript block in the browser inspector's console
+* [Revealable sections](https://github.com/mrpotes/gitbook-plugin-reveal): Reveal sections of the page using buttons made from the first title in each section
+* [Markdown within HTML](https://github.com/mrpotes/gitbook-plugin-nestedmd): Process markdown within HTML blocks - allows custom layout options for individual pages
+* [Bootstrap JavaScript plugins](https://github.com/mrpotes/gitbook-plugin-bootstrapjs): Use the [Bootstrap JavaScript plugins](http://getbootstrap.com/javascript) in your online GitBook

bin/build.js

@@ -12,12 +12,7 @@ var buildCommand = function(command) {
     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, default is extracted from readme')
+    .option('--config <config file>', 'Configuration file to use, defualt to book.json')
-    .option('-i, --intro <intro>', 'Description of the book to generate, default is extracted from readme')
-    .option('--plugins <plugins>', 'List of plugins to use separated by ","')
-    .option('--pluginsConfig <json file>', 'JSON File containing plugins configuration')
-    .option('-g, --github <repo_path>', 'ID of github repo like : username/repo')
-    .option('--githubHost <url>', 'The url of the github host (defaults to https://github.com/');
 };
 
 
@@ -26,42 +21,23 @@ var makeBuildFunc = function(converter) {
         dir = dir || process.cwd();
         outputDir = options.output;
 
-        // Read plugins config
-        var pluginsConfig = {};
-        if (options.pluginsConfig) {
-            pluginsConfig = JSON.parse(fs.readFileSync(options.pluginsConfig))
-        }
-
-
         console.log('Starting build ...');
-        // Get repo's URL
+        return converter(
-        return utils.gitURL(dir)
+            _.extend({}, options || {}, {
-        .then(function(url) {
+                input: dir,
-            // Get ID of repo
+                output: outputDir,
-            return utils.githubID(url);
+                generator: options.format,
-        }, function(err) {
+                configFile: options.config
-            return null;
+            })
-        })
+        )
-        .then(function(repoID) {
-            return converter(
-                _.extend({}, options || {}, {
-                    input: dir,
-                    output: outputDir,
-                    title: options.title,
-                    description: options.intro,
-                    github: options.github || repoID,
-                    githubHost: options.githubHost,
-                    generator: options.format,
-                    plugins: options.plugins,
-                    pluginsConfig: pluginsConfig
-                })
-            );
-        })
         .then(function(output) {
             console.log("Successfuly built !");
             return output;
-        }, utils.logError);
+        }, utils.logError)
-    };   
+        .fail(function() {
+            process.exit(-1);
+        });
+    };
 };
 
 module.exports = {

bin/gitbook.js

@@ -4,6 +4,7 @@ var Q = require('q');
 var _ = require('lodash');
 var path = require('path');
 var prog = require('commander');
+var tinylr = require('tiny-lr-fork');
 
 var pkg = require('../package.json');
 var generators = require("../lib/generate").generators;
@@ -29,12 +30,24 @@ build.command(prog.command('serve [source_dir]'))
 .action(function(dir, options) {
     var server = new Server();
 
+    // init livereload server
+    var lrOptions = {port: 35729};
+    var lrServer = tinylr(lrOptions);
+    var lrPath = undefined;
+    lrServer.listen(lrOptions.port, function(err) {
+      if (err) { return console.log(err); }
+      console.log('Live reload server started on port: ' + lrOptions.port);
+    });
+
     var generate = function() {
         if (server.isRunning()) console.log("Stopping server");
 
         server.stop()
         .then(function() {
-            return build.folder(dir, options);
+            return build.folder(dir, _.extend(options || {}, {
+                cache: false,
+                defaultsPlugins: ["livereload"]
+            }));
         })
         .then(function(_options) {
             console.log();
@@ -43,10 +56,17 @@ build.command(prog.command('serve [source_dir]'))
             .then(function() {
                 console.log('Serving book on http://localhost:'+options.port);
 
+                if (lrPath) {
+                  // trigger livereload
+                  lrServer.changed({body:{files:[lrPath]}})
+                }
+
                 if (!options.watch) return;
                 return utils.watch(_options.input)
                 .then(function(filepath) {
-                    console.log("Restart after change in "+path.relative(dir, filepath));
+                    // set livereload path
+                    lrPath = filepath;
+                    console.log("Restart after change in files");
                     console.log('');
                     return generate();
                 })
@@ -72,7 +92,7 @@ build.command(prog.command('pdf [source_dir]'))
 
 build.command(prog.command('ebook [source_dir]'))
 .description('Build a gitbook as a eBook')
-.option('-c, --cover <path>', 'Cover image, default is cover.png if exists')
+.option('-c, --cover <path>', 'Cover image, default is cover.jpg if exists')
 .action(function(dir, options) {
     var ext = options.output ? path.extname(options.output) : "epub";
 

bin/utils.js

@@ -4,60 +4,9 @@ var _ = require('lodash');
 var http = require('http');
 var send = require('send');
 
-var cp = require('child_process');
 var path = require('path');
-var url = require('url');
-
 var Gaze = require('gaze').Gaze;
 
-
-// Get the remote of a given repo
-function gitURL(path) {
-    var d = Q.defer();
-
-    cp.exec("git config --get remote.origin.url", {
-        cwd: path,
-        env: process.env,
-    }, function(err, stdout, stderr) {
-        if(err) {
-            return d.reject(err);
-        }
-
-        return d.resolve(stdout);
-    });
-
-    return d.promise
-    .then(function(output) {
-        return output.replace(/(\r\n|\n|\r)/gm, "");
-    });
-}
-
-// Poorman's parsing
-// Parse a git URL to a github ID : username/reponame
-function githubID(_url) {
-    // Remove .git if it's in _url
-    var sliceEnd = _url.slice(-4) === '.git' ? -4 : _url.length;
-
-    // Detect HTTPS repos
-    var parsed = url.parse(_url);
-    if(parsed.protocol === 'https:' && parsed.host === 'github.com') {
-        return parsed.path.slice(1, sliceEnd);
-    }
-
-    // Detect SSH repos
-    if(_url.indexOf('git@') === 0) {
-        return _url.split(':', 2)[1].slice(0, sliceEnd);
-    }
-
-    // None found
-    return null;
-}
-
-function titleCase(str)
-{
-    return str.replace(/\w\S*/g, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();});
-}
-
 function watch(dir) {
     var d = Q.defer();
     dir = path.resolve(dir);
@@ -81,16 +30,15 @@ function watch(dir) {
 }
 
 function logError(err) {
-    console.log(err.stack || err.message || err);
+    var message = err.message || err;
+    if (process.env.DEBUG != null) message = err.stack || message;
+    console.log(message);
     return Q.reject(err);
 };
 
 
 // Exports
 module.exports = {
-    gitURL: gitURL,
-    githubID: githubID,
-    titleCase: titleCase,
     watch: watch,
     logError: logError
 };

bower.json

@@ -0,0 +1,12 @@
+{
+    "name": "GitBook",
+    "version": "1.0.0",
+    "dependencies": {
+        "jquery": "2.1.1",
+        "lodash": "2.4.1",
+        "requirejs": "2.1.11",
+        "URIjs": "1.13.1",
+        "mousetrap": "1.4.6",
+        "lunr.js": "0.5.2"
+    }
+}

lib/generate/ebook/index.js

@@ -19,10 +19,6 @@ var Generator = function() {
     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);
 
@@ -33,6 +29,10 @@ Generator.prototype.finish = function() {
     .then(function() {
         var d = Q.defer();
 
+        if (!that.options.cover && fs.existsSync(path.join(that.options.output, "cover.jpg"))) {
+            that.options.cover = path.join(that.options.output, "cover.jpg");
+        }
+
         var _options = {
             "--cover": that.options.cover
         };

lib/generate/generator.js

@@ -9,11 +9,12 @@ var BaseGenerator = function(options) {
     this.options = options;
 
     this.options.plugins = Plugin.normalizeNames(this.options.plugins);
+    this.options.plugins = _.union(this.options.plugins, this.options.defaultsPlugins);
     this.plugins = [];
 };
 
-BaseGenerator.prototype.callHook = function(name) {
+BaseGenerator.prototype.callHook = function(name, data) {
-    return this.plugins.hook(name, this);
+    return this.plugins.hook(name, this, data);
 };
 
 BaseGenerator.prototype.loadPlugins = function() {

lib/generate/index.js

@@ -18,50 +18,209 @@ var generators = {
 
 var defaultDescription = "Book generated using GitBook";
 
-/*
- *  Use a specific generator to convert a gitbook to a site/pdf/ebook/
- *  output is always a folder
- */
-var generate = function(options) {
-    var generator = null;
-    var files;
 
+var containsFiles = function(dir, files) {
+    return Q.all(_.map(files, function(file) {
+        return fs.exists(path.join(dir, file));
+    }))
+    .then(_.all);
+};
+
+
+// Create the generator and load plugins
+var loadGenerator = function(options) {
+    var generator = new generators[options.generator](options);
+
+    return generator.loadPlugins()
+    .then(_.constant(generator));
+};
+
+
+
+var generate = function(options) {
+    // Set defaults to options
     options = _.defaults(options || {}, {
         // Folders to use
-        input: null,
+        "input": null,
-        output: null,
+        "output": null,
+
+        // Config file (relative to input)
+        "configFile": "book.json",
 
         // Output generator
-        generator: "site",
+        "generator": "site",
 
         // Book title, keyword, description
-        title: null,
+        "title": null,
-        description: null,
+        "description": null,
 
         // Origin github repository id
-        github: null,
+        "github": null,
-        githubHost: 'https://github.com/',
+        "githubHost": 'https://github.com/',
 
         // Theming
-        theme: path.resolve(__dirname, '../../theme'),
+        "theme": path.resolve(__dirname, '../../theme'),
 
         // Plugins
-        plugins: [],
+        "plugins": [],
-        pluginsConfig: {}
+        "pluginsConfig": {},
+        "defaultsPlugins": [], // Default plugins that can't be set in book.json
+
+        // Links
+        "links": {
+            "about": null,
+            "issues": null,
+            "contribue": null,
+        }
     });
 
+    // Validate options
     if (!options.input) {
         return Q.reject(new Error("Need option input (book input directory)"));
     }
 
+    // Ensure generator exists
     if (!generators[options.generator]) {
         return Q.reject(new Error("Invalid generator (availables are: "+_.keys(generators).join(", ")));
     }
 
+    // Check files to get folder type (book, multilanguage book or neither)
+    return Q()
+
+    // Read config file
+    .then(function() {
+        return fs.readFile(path.resolve(options.input, options.configFile))
+        .then(function(_config) {
+            // Extend current config
+            _config = JSON.parse(_config);
+            _config = _.omit(_config, 'input', 'configFile', 'defaultsPlugins');
+
+            _.extend(options, _config);
+        }, function() {
+            // No config file: not a big deal
+            return Q();
+        });
+    })
+
+    // Read readme
+    .then(function() {
+        return fs.readFile(path.join(options.input, "README.md"), "utf-8")
+        .then(function(_readme) {
+            _readme = parse.readme(_readme);
+
+            options.title = options.title || _readme.title;
+            options.description = options.description || _readme.description || defaultDescription;
+        });
+    })
+
+    // Detect multi-languages book
+    .then(function() {
+        return containsFiles(options.input, ['LANGS.md'])
+    })
+
+    .then(function(isMultiLang) {
+        // Multi language book
+        if(isMultiLang) {
+            return generateMultiLang(options);
+        }
+
+        // Book
+        return generateBook(options);
+    });
+};
+
+
+var generateMultiLang = function(options) {
+    var langsSummary;
     options.output = options.output || path.join(options.input, "_book");
 
+    // Multi-languages book
+    return fs.readFile(path.join(options.input, "LANGS.md"), "utf-8")
+
     // Clean output folder
-    return fs.remove(options.output)
+    .then(function(_langsSummary) {
+        langsSummary = _langsSummary;
+        return fs.remove(options.output);
+    })
+    .then(function() {
+        return fs.mkdirp(options.output);
+    })
+
+    // Generate sub-books
+    .then(function() {
+        options.langsSummary = parse.langs(langsSummary);
+
+        // Generated a book for each valid entry
+        return _.reduce(options.langsSummary.list, function(prev, entry) {
+            return prev.then(function() {
+                return generate(_.extend({}, options, {
+                    input: path.join(options.input, entry.path),
+                    output: path.join(options.output, entry.path)
+                }));
+            })
+        }, Q());
+    })
+
+    .then(function() {
+        return loadGenerator(options);
+    })
+
+    // Generate languages index
+    .then(function(generator) {
+        return generator.langsIndex(options.langsSummary);
+    })
+
+    // Return options to caller
+    .then(_.constant(options));
+};
+
+/*
+ *  Use a specific generator to convert a gitbook to a site/pdf/ebook/
+ *  output is always a folder
+ */
+var generateBook = function(options) {
+    var files;
+
+    options.output = options.output || path.join(options.input, "_book");
+
+    // Check if it's a book
+    return containsFiles(options.input, ['SUMMARY.md', 'README.md'])
+
+    // Fail if not a book
+    .then(function(isBook) {
+        if(!isBook) {
+            return Q.reject(new Error("Invalid gitbook repository, need SUMMARY.md and README.md"));
+        }
+    })
+
+    // Clean output folder
+    .then(function() {
+        return fs.remove(options.output);
+    })
+
+    // Get repo's URL
+    .then(function() {
+        // Git deactivated
+        if(options.github === false) {
+            options.github = null;
+            return null;
+        } else if(options.github) {
+        // Git already specified in options
+            return options.github;
+        }
+
+        // Try auto detecting
+        return parse.git.url(options.input)
+        .then(function(_url) {
+            // Get ID of repo
+            return parse.git.githubID(_url);
+        }, function(err) {
+            return null;
+        })
+        .then(function(repoId) {
+            options.github = repoId;
+        });
+    })
 
     .then(function() {
         return fs.mkdirp(options.output);
@@ -72,108 +231,67 @@ var generate = function(options) {
         return fs.list(options.input)
         .then(function(_files) {
             files = _files;
+        });
+    })
+
+    .then(function() {
+        return loadGenerator(options);
+    })
+
+    // Convert files
+    .then(function(generator) {
+        // Generate the book
+        return Q()
+
+        // 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);
+            });
         })
-    })
 
-    // Create the generator and load plugins
+        // Skip processing some files
-    .then(function() {
+        .then(function() {
-        generator = new generators[options.generator](options);
+            files = _.filter(files, function (file) {
-        return generator.loadPlugins();
+                return !(
-    })
+                    file === 'SUMMARY.md'
-
-    // Detect multi-languages book
-    .then(function() {
-        if (_.contains(files, "LANGS.md")) {
-            // Multi-languages book
-            return fs.readFile(path.join(options.input, "LANGS.md"), "utf-8")
-
-            // 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)
-                        }));
-                    })
                 );
-            })
-
-            // 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 Q()
 
-            // Read readme
+        // Copy file and replace markdown file
-            .then(function() {
+        .then(function() {
-                return fs.readFile(path.join(options.input, "README.md"), "utf-8")
+            return Q.all(
-                .then(function(_readme) {
+                _.chain(files)
-                    _readme = parse.readme(_readme);
+                .map(function(file) {
+                    if (!file) return;
 
-                    options.title = options.title || _readme.title;
+                    if (file[file.length -1] == "/") {
-                    options.description = options.description || _readme.description || defaultDescription;
+                        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()
+            );
+        })
 
-            // Get summary
+        // Finish generation
-            .then(function() {
+        .then(function() {
-                return fs.readFile(path.join(options.input, "SUMMARY.md"), "utf-8")
+            return generator.finish();
-                .then(function(_summary) {
+        })
-                    options.summary = parse.summary(_summary);
+        .then(function() {
-
+            return generator.callHook("finish");
-                    // Parse navigation
+        });
-                    options.navigation = parse.navigation(options.summary);
-                });
-            })
-
-            // Skip processing some files
-            .then(function() {
-                files = _.filter(files, function (file) {
-                    return !(
-                        file === 'SUMMARY.md'
-                    );
-                });
-            })
-
-            // 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 generation
-            .then(function() {
-                return generator.finish();
-            })
-            .then(function() {
-                return generator.callHook("finish");
-            });
-        }
     })
 
     // Return all options
@@ -244,5 +362,6 @@ module.exports = {
     generators: generators,
     folder: generate,
     file: generateFile,
-    Plugin: Plugin
+    book: generateBook,
+    Plugin: Plugin,
 };

lib/generate/json/index.js

@@ -1,6 +1,7 @@
 var util = require("util");
 var path = require("path");
 var Q = require("q");
+var _ = require("lodash");
 
 var fs = require("../fs");
 var parse = require("../../parse");
@@ -40,6 +41,35 @@ Generator.prototype.convertFile = function(content, input) {
     });
 };
 
+// Generate languages index
+// Contains the first languages readme and langs infos
+Generator.prototype.langsIndex = function(langs) {
+    var that = this;
+
+    if (langs.list.length == 0) return Q.reject("Need at least one language");
+
+    var mainLang = _.first(langs.list).lang;
+    console.log("Main language is", mainLang);
+
+    return Q()
+    .then(function() {
+        return fs.readFile(
+            path.join(that.options.output, mainLang, "README.json")
+        );
+    })
+    .then(function(content) {
+        var json = JSON.parse(content);
+        _.extend(json, {
+            langs: langs.list
+        });
+
+        return fs.writeFile(
+            path.join(that.options.output, "README.json"),
+            JSON.stringify(json, null, 4)
+        );
+    });
+};
+
 Generator.prototype.finish = function() {
     // ignore
 };

lib/generate/plugin.js

@@ -74,21 +74,26 @@ Plugin.prototype.resolveFile = function(filename) {
 };
 
 // Resolve file path
-Plugin.prototype.callHook = function(name, args) {
+Plugin.prototype.callHook = function(name, context, data) {
     var hookFunc = this.infos.hooks? this.infos.hooks[name] : null;
-    args = _.isArray(args) ? args : [args];
+    data = data || {};
 
-    if (!hookFunc) return Q();
+    if (!hookFunc) return Q(data);
 
     return Q()
     .then(function() {
-        return hookFunc.apply(null, args);
+        return hookFunc.apply(context, [data]);
     });
 };
 
+// Has assets
+Plugin.prototype.hasAssets = function(out) {
+    return (this.infos.book && this.infos.book.assets);
+};
+
 // Copy plugin assets fodler
 Plugin.prototype.copyAssets = function(out) {
-    if (!this.infos.book ||  !this.infos.book.assets) return Q();
+    if (!this.hasAssets()) return Q();
     return fs.copy(
         this.resolveFile(this.infos.book.assets),
         out
@@ -155,16 +160,26 @@ Plugin.fromList = function(names, root) {
     })
     .object()
     .value();
+    resources.html = {}
+
+    _.each(plugins, function(plugin) {
+        var html = plugin.infos.book.html || {};
+        _.each(html, function(code, key) {
+            if (!_.isFunction(code)) code = _.constant(code);
+            if (!resources.html[key]) resources.html[key] = [];
+            resources.html[key].push(code);
+        })
+    });
 
     return Q({
         'list': plugins,
         'resources': resources,
-        'hook': function(name, args) {
+        'hook': function(name, context, data) {
             return _.reduce(plugins, function(prev, plugin) {
-                return prev.then(function() {
+                return prev.then(function(ret) {
-                    return plugin.callHook(name, args);
+                    return plugin.callHook(name, context, ret);
                 })
-            }, Q());
+            }, Q(data));
         },
         'template': function(name) {
             var withTpl = _.find(plugins, function(plugin) {
@@ -174,6 +189,11 @@ Plugin.fromList = function(names, root) {
 
             if (!withTpl) return null;
             return withTpl.resolveFile(withTpl.infos.templates[name]);
+        },
+        'html': function(tag, context, options) {
+            return _.map(resources.html[tag] || [], function(code) {
+                return code.call(context, options);
+            }).join("\n");
         }
     });
 };
@@ -184,4 +204,4 @@ Plugin.defaults = [
     "mathjax"
 ];
 
-module.exports = Plugin;
+module.exports = Plugin;

lib/generate/site/index.js

@@ -59,8 +59,11 @@ Generator.prototype.loadPlugins = function() {
 };
 
 // Generate a template
-Generator.prototype._writeTemplate = function(tpl, options, output) {
+Generator.prototype._writeTemplate = function(tpl, options, output, interpolate) {
     var that = this;
+
+    interpolate = interpolate || _.identity;
+
     return Q()
     .then(function(sections) {
         return tpl(_.extend({
@@ -77,9 +80,13 @@ Generator.prototype._writeTemplate = function(tpl, options, output) {
             allNavigation: that.options.navigation,
 
             plugins: that.plugins,
-            pluginsConfig: JSON.stringify(that.options.pluginsConfig)
+            pluginsConfig: JSON.stringify(that.options.pluginsConfig),
+            htmlSnippet: _.partialRight(that.plugins.html, that, options),
+
+            options: that.options
         }, options));
     })
+    .then(interpolate)
     .then(function(html) {
         return fs.writeFile(
             output,
@@ -96,7 +103,6 @@ Generator.prototype.indexPage = function(lexed, pagePath) {
 // 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";
@@ -105,10 +111,28 @@ Generator.prototype.convertFile = function(content, _input) {
     var output = path.join(this.options.output, _output);
     var basePath = path.relative(path.dirname(output), this.options.output) || ".";
 
+    var page = {
+        path: _input,
+        content: content,
+        progress: parse.progress(this.options.navigation, _input)
+    };
+
+    var _callHook = function(name) {
+        return that.callHook(name, page)
+        .then(function(_page) {
+            page = _page;
+            return page;
+        });
+    };
+
     return Q()
+    .then(function() {
+        // Send content to plugins
+        return _callHook("page:before");
+    })
     .then(function() {
         // Lex page
-        return parse.lex(content);
+        return parse.lex(page.content);
     })
     .then(function(lexed) {
         // Index page in search
@@ -124,17 +148,27 @@ Generator.prototype.convertFile = function(content, _input) {
         });
     })
     .then(function(sections) {
+        page.sections = sections;
+
+        // Use plugin hook
+        return _callHook("page");
+    })
+    .then(function() {
         that.manifest.add("CACHE", _output);
 
         return that._writeTemplate(that.template, {
-            progress: progress,
+            progress: page.progress,
 
             _input: _input,
-            content: sections,
+            content: page.sections,
 
             basePath: basePath,
             staticBase: path.join(basePath, "gitbook"),
-        }, output);
+        }, output, function(html) {
+            page.content = html;
+
+            return _callHook("page:after").get("content")
+        });
     });
 };
 
@@ -174,8 +208,9 @@ Generator.prototype.copyAssets = function() {
     .then(function() {
         return Q.all(
             _.map(that.plugins.list, function(plugin) {
-                var pluginAssets = path.join(that.options.output, "gitbook/plugins/", plugin.name);
+                if (!plugin.hasAssets()) return Q();
 
+                var pluginAssets = path.join(that.options.output, "gitbook/plugins/", plugin.name);
                 return plugin.copyAssets(pluginAssets)
                 .then(function() {
                     return that.manifest.addFolder(pluginAssets, "gitbook/plugins/"+plugin.name);
@@ -203,9 +238,13 @@ Generator.prototype.writeCacheManifest = function() {
 };
 
 Generator.prototype.finish = function() {
-    return this.copyAssets()
+    var deferred = this.copyAssets().then(this.writeSearchIndex);
-    .then(this.writeSearchIndex)
+
-    .then(this.writeCacheManifest);
+    if (this.options.cache !== false) {
+        deferred = deferred.then(this.writeCacheManifest);
+    }
+
+    return deferred;
 };
 
 module.exports = Generator;

lib/parse/git.js

@@ -0,0 +1,56 @@
+var Q = require('q');
+var _ = require('lodash');
+var cp = require('child_process');
+var url = require('url');
+
+// Get the remote of a given repo
+function gitURL(path) {
+    var d = Q.defer();
+
+    cp.exec("git config --get remote.origin.url", {
+        cwd: path,
+        env: process.env,
+    }, function(err, stdout, stderr) {
+        if(err) {
+            return d.reject(err);
+        }
+
+        return d.resolve(stdout);
+    });
+
+    return d.promise
+    .then(function(output) {
+        return output.replace(/(\r\n|\n|\r)/gm, "");
+    });
+}
+
+// Poorman's parsing
+// Parse a git URL to a github ID : username/reponame
+function githubID(_url) {
+    // Remove .git if it's in _url
+    var sliceEnd = _url.slice(-4) === '.git' ? -4 : _url.length;
+
+    // Detect HTTPS repos
+    var parsed = url.parse(_url);
+    if(parsed.protocol === 'https:' && parsed.host === 'github.com') {
+        return parsed.path.slice(1, sliceEnd);
+    }
+
+    // Detect SSH repos
+    if(_url.indexOf('git@') === 0) {
+        return _url.split(':', 2)[1].slice(0, sliceEnd);
+    }
+
+    // None found
+    return null;
+}
+
+function titleCase(str) {
+    return str.replace(/\w\S*/g, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();});
+}
+
+module.exports = {
+    url: gitURL,
+    githubID: githubID,
+    titleCase: titleCase
+};

lib/parse/index.js

@@ -5,5 +5,6 @@ module.exports = {
     lex: require('./lex'),
     progress: require('./progress'),
     navigation: require('./navigation'),
-    readme: require('./readme')
+    readme: require('./readme'),
+    git: require('./git')
 };

lib/parse/navigation.js

@@ -8,7 +8,7 @@ function clean(obj) {
 
 function flattenChapters(chapters) {
     return _.reduce(chapters, function(accu, chapter) {
-        return accu.concat([clean(chapter)].concat(chapter.articles));
+        return accu.concat([clean(chapter)].concat(flattenChapters(chapter.articles)));
     }, []);
 }
 

lib/parse/progress.js

@@ -12,7 +12,7 @@ var calculProgress = function(navigation, current) {
         return nav;
     })
     .sortBy(function(nav) {
-        return nav.level;
+        return parseFloat(nav.level);
     })
     .map(function(nav, i) {
         // Calcul percent
@@ -27,7 +27,7 @@ var calculProgress = function(navigation, current) {
         } else if (done) {
             prevPercent = nav.percent;
         }
-        
+
         return nav;
     })
     .value();

lib/parse/readme.js

@@ -1,5 +1,6 @@
 var _ = require('lodash');
 var marked = require('marked');
+var textRenderer = require('marked-text-renderer');
 
 function extractFirstNode(nodes, nType) {
     return _.chain(nodes)
@@ -14,16 +15,28 @@ function extractFirstNode(nodes, nType) {
 
 function parseReadme(src) {
     var nodes, title, description;
+    var renderer = textRenderer();
 
     // Parse content
     nodes = marked.lexer(src);
-    
+
-    var title = extractFirstNode(nodes, "heading");
+    title = extractFirstNode(nodes, "heading") || '';
-    var description = extractFirstNode(nodes, "paragraph");
+    description = extractFirstNode(nodes, "paragraph") || '';
+
+    var convert = _.compose(
+        function(text) {
+            return _.unescape(text.replace(/(\r\n|\n|\r)/gm, ""));
+        },
+        function(text) {
+            return marked.parse(text, _.extend({}, marked.defaults, {
+                renderer: renderer
+            }));
+        }
+    );
 
     return {
-        title: title,
+        title: convert(title),
-        description: description
+        description: convert(description)
     };
 }
 

lib/parse/summary.js

@@ -82,17 +82,15 @@ function parseTitle(src, nums) {
         level: level,
 
         // Replace .md references with .html
-        path: matches[2],
+        path: matches[2].replace(/\\/g, '/'),
     };
 }
 
-function parseArticle(chapterNum, nodes, idx) {
+function parseChapter(nodes, nums) {
-    return parseTitle(_.first(nodes).text, [chapterNum, idx+1]);
+    return _.extend(parseTitle(_.first(nodes).text, nums), {
-}
+        articles: _.map(listSplit(filterList(nodes), 'list_item_start', 'list_item_end'), function(nodes, i) {
-
+            return parseChapter(nodes, nums.concat(i + 1));
-function parseChapter(nodes, idx) {
+        })
-    return _.extend(parseTitle(_.first(nodes).text, [idx+1]), {
-        articles: _.map(listSplit(filterList(nodes), 'list_item_start', 'list_item_end'), parseArticle.bind(null, idx+1))
     });
 }
 
@@ -104,7 +102,9 @@ function parseSummary(src) {
 
     // Split out chapter sections
     var chapters = _.chain(listSplit(chapterList, 'list_item_start', 'list_item_end'))
-    .map(parseChapter)
+    .map(function(nodes, i) {
+        return parseChapter(nodes, [i + 1]);
+    })
     .value();
 
     return {

lib/utils/links.js

@@ -19,6 +19,10 @@ var toAbsolute = function(_href, dir, outdir) {
     // make it relative to output
     _href = path.relative(outdir, _href);
 
+    if (process.platform === 'win32') {
+        _href = _href.replace(/\\/g, '/');
+    }
+
     return _href;
 };
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "gitbook",
-    "version": "0.3.2",
+    "version": "0.4.7",
     "homepage": "http://www.gitbook.io/",
     "description": "Library and cmd utility to generate GitBooks",
     "main": "lib/index.js",
@@ -18,19 +18,21 @@
         "highlight.js": "8.0.0",
         "tmp": "0.0.23",
         "semver": "2.2.1",
-        "gaze": "0.6.4",
+        "gaze": "~0.5.1",
         "resolve": "0.6.3",
-
+        "tiny-lr-fork": "0.0.5",
         "gitbook-plugin": "0.0.2",
         "gitbook-plugin-mixpanel": "0.0.2",
-        "gitbook-plugin-mathjax": "0.0.3"
+        "gitbook-plugin-mathjax": "0.0.3",
+        "gitbook-plugin-livereload": "0.0.1"
     },
     "devDependencies": {
         "mocha": "1.18.2",
         "grunt": "~0.4.2",
         "grunt-cli": "0.1.11",
         "grunt-contrib-less": "~0.5.0",
-        "grunt-contrib-requirejs": "0.4.1"
+        "grunt-contrib-requirejs": "0.4.1",
+        "grunt-bower-install-simple": "0.9.2"
     },
     "scripts": {
         "test": "export TESTING=true; mocha --reporter list"

test/fixtures/SUMMARY.md

@@ -3,6 +3,8 @@
 * [Chapter 1](chapter-1/README.md)
     * [Article 1](chapter-1/ARTICLE1.md)
     * [Article 2](chapter-1/ARTICLE2.md)
+        * [article 1.2.1](chapter-1/ARTICLE-1-2-1.md)
+        * [article 1.2.2](chapter-1/ARTICLE-1-2-2.md)
 * [Chapter 2](chapter-2/README.md)
 * [Chapter 3](chapter-3/README.md)
 * [Chapter 4](chapter-4/README.md)

test/fixtures/book1/README.md

@@ -0,0 +1,2 @@
+# This is a test
+

test/fixtures/book1/SUMMARY.md

@@ -0,0 +1,3 @@
+# Summary
+
+* [test](test.md)

test/fixtures/book1/test.md

@@ -0,0 +1 @@
+# Test

test/fixtures/book2/README.md

@@ -0,0 +1 @@
+# This should fail

test/generate.js

@@ -0,0 +1,46 @@
+var _ = require('lodash');
+var Q = require('q');
+var path = require('path');
+var tmp = require('tmp');
+var assert = require('assert');
+
+var generate = require("../lib/generate");
+
+var generateTmpBook = function(path) {
+    return ;
+};
+
+
+var BOOKS = {
+    "book1": true,
+    "book2": false
+};
+
+describe('Site Generation', function () {
+    var ret = {};
+
+    beforeEach(function(done){
+        Q.all(_.map(BOOKS, function(state, bookName) {
+            return Q.nfcall(tmp.dir)
+            .then(function(_dir) {
+                return generate.folder({
+                    input: path.join(__dirname, "fixtures", bookName),
+                    output: _dir
+                });
+            })
+            .then(function(_book) {
+                ret[bookName] = _book;
+            }, function(err) {
+                // ignore errors here
+            });
+        }))
+        .fin(done);
+    });
+
+
+    it('should generate the valid sites', function() {
+        _.each(BOOKS, function(state, bookName) {
+            assert((ret[bookName] != null) == state);
+        });
+    });
+});

test/navigation.js

@@ -18,6 +18,8 @@ describe('Summary navigation', function() {
             'chapter-1/ARTICLE1.md',
             'chapter-1/ARTICLE2.md',
             'chapter-2/README.md',
+            'chapter-1/ARTICLE-1-2-1.md',
+            'chapter-1/ARTICLE-1-2-2.md'
         ]);
 
         // Make sure it found the files we gave it
@@ -26,6 +28,8 @@ describe('Summary navigation', function() {
         assert(nav['chapter-1/ARTICLE1.md']);
         assert(nav['chapter-1/ARTICLE2.md']);
         assert(nav['chapter-2/README.md']);
+        assert(nav['chapter-1/ARTICLE-1-2-1.md']);
+        assert(nav['chapter-1/ARTICLE-1-2-2.md']);
 
 
         assert.equal(nav['README.md'].prev, null);
@@ -38,9 +42,15 @@ describe('Summary navigation', function() {
         assert.equal(nav['chapter-1/ARTICLE1.md'].next.path, 'chapter-1/ARTICLE2.md');
 
         assert.equal(nav['chapter-1/ARTICLE2.md'].prev.path, 'chapter-1/ARTICLE1.md');
-        assert.equal(nav['chapter-1/ARTICLE2.md'].next.path, 'chapter-2/README.md');
+        assert.equal(nav['chapter-1/ARTICLE2.md'].next.path, 'chapter-1/ARTICLE-1-2-1.md');
 
-        assert.equal(nav['chapter-2/README.md'].prev.path, 'chapter-1/ARTICLE2.md');
+        assert.equal(nav['chapter-1/ARTICLE-1-2-1.md'].prev.path, 'chapter-1/ARTICLE2.md');
+        assert.equal(nav['chapter-1/ARTICLE-1-2-1.md'].next.path, 'chapter-1/ARTICLE-1-2-2.md');
+
+        assert.equal(nav['chapter-1/ARTICLE-1-2-2.md'].prev.path, 'chapter-1/ARTICLE-1-2-1.md');
+        assert.equal(nav['chapter-1/ARTICLE-1-2-2.md'].next.path, 'chapter-2/README.md');
+
+        assert.equal(nav['chapter-2/README.md'].prev.path, 'chapter-1/ARTICLE-1-2-2.md');
         assert.equal(nav['chapter-2/README.md'].next.path, 'chapter-3/README.md');
     });
 

test/summary.js

@@ -50,5 +50,6 @@ describe('Summary parsing', function () {
 
         assert.equal(c[0].articles[0].level, '1.1');
         assert.equal(c[0].articles[1].level, '1.2');
+        assert.equal(c[0].articles[1].articles[0].level, '1.2.1');
     });
 });

theme/javascript/core/font-settings.js

@@ -4,6 +4,17 @@ define([
 ], function($, storage) {
     var fontState;
 
+    var THEMES = {
+        "white": 0,
+        "sepia": 1,
+        "night": 2
+    };
+
+    var FAMILY = {
+        "serif": 0,
+        "sans": 1
+    };
+
     var togglePopover = function(e) {
         var $dropdown = $("#font-settings-wrapper .dropdown-menu");
 
@@ -11,7 +22,7 @@ define([
         e.stopPropagation();
         e.preventDefault();
     };
-    
+
     var closePopover = function(e) {
         var $dropdown = $("#font-settings-wrapper .dropdown-menu");
 
@@ -19,40 +30,23 @@ define([
     };
 
     var enlargeFontSize = function(e){
-        var $bookBody = $(".book-body");
-
         if (fontState.size < 4){
-            $bookBody.toggleClass("font-size-"+fontState.size, false);
             fontState.size++;
-
-            $bookBody.toggleClass("font-size-"+fontState.size, true);
             fontState.save();
         }
     };
-    
+
     var reduceFontSize = function(e){
-        var $bookBody = $(".book-body");
-
         if (fontState.size > 0){
-            $bookBody.toggleClass("font-size-"+fontState.size);
             fontState.size--;
-
-            $bookBody.toggleClass("font-size-"+fontState.size);
             fontState.save();
         }
     };
 
     var changeFontFamily = function(){
-        var $bookBody = $(".book-body");
         var index = $(this).data("font");
 
-        $bookBody.toggleClass("font-family-"+fontState.family);
-        $(".font-settings .font-family-list li:nth-child("+(fontState.family+1)+")")
-            .removeClass("active");
-
         fontState.family = index;
-        $bookBody.toggleClass("font-family-"+fontState.family);
-        $(this).addClass("active");
         fontState.save();
     };
 
@@ -70,7 +64,23 @@ define([
         fontState.save();
     };
 
-    var init = function() {
+    var update = function() {
+        var $book = $(".book");
+
+        $(".font-settings .font-family-list li").removeClass("active");
+        $(".font-settings .font-family-list li:nth-child("+(fontState.family+1)+")").addClass("active");
+
+        $book[0].className = $book[0].className.replace(/\bfont-\S+/g, '');
+        $book.addClass("font-size-"+fontState.size);
+        $book.addClass("font-family-"+fontState.family);
+
+        if(fontState.theme !== 0) {
+            $book[0].className = $book[0].className.replace(/\bcolor-theme-\S+/g, '');
+            $book.addClass("color-theme-"+fontState.theme);
+        }
+    };
+
+    var init = function(config) {
         var $toggle, $bookBody, $dropdown, $book;
 
         //Find DOM elements.
@@ -79,37 +89,33 @@ define([
         $dropdown = $("#font-settings-wrapper .dropdown-menu");
         $bookBody = $(".book-body");
 
-        //Instantiate font state object 
+        // Instantiate font state object
         fontState = storage.get("fontState", {
-            size:1,
+            size: config.size || 1,
-            family:0,
+            family: FAMILY[config.family || "serif"],
-            theme:0
+            theme: THEMES[config.theme || "white"]
         });
         fontState.save = function(){
             storage.set("fontState",fontState);
+            update();
         };
 
-        $bookBody.addClass("font-size-"+fontState.size);
+        update();
-        $bookBody.addClass("font-family-"+fontState.family);
-
-        $(".font-settings .font-family-list li:nth-child("+(fontState.family+1)+")").addClass("active");
-
-        if(fontState.theme !== 0)
-            $book.addClass("color-theme-"+fontState.theme);
 
         //Add event listeners
         $(document).on('click', "#enlarge-font-size", enlargeFontSize);
         $(document).on('click', "#reduce-font-size", reduceFontSize);
-        
+
         $(document).on('click', "#font-settings-wrapper .font-family-list li", changeFontFamily);
         $(document).on('click', "#font-settings-wrapper .color-theme-list button", changeColorTheme);
 
-        $(document).on('click', ".book-header .toggle-font-settings", togglePopover);   
+        $(document).on('click', ".book-header .toggle-font-settings", togglePopover);
         $(document).on('click', "#font-settings-wrapper .dropdown-menu", function(e){ e.stopPropagation(); });
         $(document).on("click", closePopover);
     };
-    
+
     return {
-        init: init
+        init: init,
+        update: update
     }
 });

theme/javascript/core/loading.js

@@ -2,11 +2,9 @@ define([
     "jQuery"
 ], function($) {
     var showLoading = function(p) {
-        var $book = $(".book");
+        $(".book").addClass("is-loading");
-
-        $book.addClass("is-loading");
         p.always(function() {
-            $book.removeClass("is-loading");
+            $(".book").removeClass("is-loading");
         });
 
         return p;

theme/javascript/core/navigation.js

@@ -1,22 +1,21 @@
 define([
     "jQuery",
-    "utils/path",
+    "utils/url",
     "core/events",
     "core/state",
-    "core/search",
     "core/progress",
     "core/exercise",
     "core/quiz",
     "core/loading"
-], function($, path, events, state, search, progress, exercises, quiz, loading) {
+], function($, URL, events, state, progress, exercises, quiz, loading) {
     var prev, next;
     var githubCountStars, githubCountWatch;
 
     var usePushState = (typeof history.pushState !== "undefined");
 
     var handleNavigation = function(relativeUrl, push) {
-        var url = path.isAbsolute(relativeUrl) ? relativeUrl : path.join(path.dirname(window.location.pathname), relativeUrl);
+        var url = URL.join(window.location.pathname, relativeUrl);
-        console.log("navigate to ", url, "baseurl="+relativeUrl);
+        console.log("navigate to ", url, "baseurl="+relativeUrl, "current="+window.location.pathname);
 
         if (!usePushState) {
             // Refresh the page to the new URL if pushState not supported
@@ -28,7 +27,7 @@ define([
         .done(function (html) {
             // Push url to history
             if (push) history.pushState({ path: url }, null, url);
-            
+
             // Replace html content
             html = html.replace( /<(\/?)(html|head|body)([^>]*)>/ig, function(a,b,c,d){
                 return '<' + b + 'div' + ( b ? '' : ' data-element="' + c + '"' ) + d + '>';
@@ -36,6 +35,7 @@ define([
 
             var $page = $(html);
             var $pageHead = $page.find("[data-element=head]");
+            var $pageBody = $page.find('.book');
 
             // Merge heads
             var headContent = $pageHead.html()
@@ -45,13 +45,13 @@ define([
             });
             $("head").html(headContent);
 
-            // Update header, body
+            // Merge body
-            $('.book-header').html($page.find('.book-header').html());
+            var bodyClass = $(".book").attr("class");
-            $('.book-body').html($page.find('.book-body').html());
-
-            // Update summary
             var scrollPosition = $('.book-summary .summary').scrollTop();
-            $('.book-summary').html($page.find('.book-summary').html());
+            $pageBody.toggleClass("with-summary", $(".book").hasClass("with-summary"))
+
+            $(".book").replaceWith($pageBody);
+            $(".book").attr("class", bodyClass);
             $('.book-summary .summary').scrollTop(scrollPosition);
 
             // Update state
@@ -95,9 +95,6 @@ define([
         // Focus on content
         $pageWrapper.focus();
 
-        // Prepare search bar
-        search.prepare();
-
         // Update GitHub count
         if (state.githubId) {
             if (githubCountStars) {
@@ -134,7 +131,7 @@ define([
         if (url) handleNavigation(url, true);
     };
 
-    
+
 
     var init = function() {
         // Prevent cache so that using the back button works
@@ -157,7 +154,7 @@ define([
         $(document).on('click', ".navigation-prev", handlePagination);
         $(document).on('click', ".navigation-next", handlePagination);
         $(document).on('click', ".summary [data-path] a", handlePagination);
-        
+
         $(window).resize(updateNavigationPosition);
 
         // Prepare current page

theme/javascript/core/search.js

@@ -67,12 +67,10 @@ define([
             e.preventDefault();
             toggleSearch();
         });
-    };
 
-    var prepare = function() {
-        var $searchInput = $(".book-search input");
 
-        $searchInput.keyup(function(e) {
+        // Type in search bar
+        $(document).on("keyup", ".book-search input", function(e) {
             var key = (e.keyCode ? e.keyCode : e.which);
             var q = $(this).val();
 
@@ -89,13 +87,12 @@ define([
                     _.pluck(results, "path")
                 );
             }
-        });
+        })
-    }
+    };
 
     return {
         init: init,
         search: search,
-        toggle: toggleSearch,
+        toggle: toggleSearch
-        prepare: prepare
     };
 });

theme/javascript/core/sidebar.js

@@ -1,11 +1,10 @@
 define([
+    "jQuery",
     "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;
@@ -38,6 +37,8 @@ define([
 
     // Filter summary with a list of path
     var filterSummary = function(paths) {
+        var $summary = $(".book-summary");
+
         $summary.find("li").each(function() {
             var path = $(this).data("path");
             var st = paths == null || _.contains(paths, path);
@@ -48,7 +49,6 @@ define([
     };
 
     return {
-        $el: $summary,
         init: init,
         toggle: toggleSidebar,
         filter: filterSummary

theme/javascript/gitbook.js

@@ -36,12 +36,12 @@ define([
 
         // Bind sharing button
         sharing.init();
-        
+
         // Init navigation
         navigation.init();
 
-        //Init font settings 
+        //Init font settings
-        fontSettings.init();
+        fontSettings.init(config.fontSettings || {});
 
         events.trigger("start", config);
     }

theme/javascript/utils/path.js

@@ -1,47 +0,0 @@
-define([], function() {
-    // Joins path segments.  Preserves initial "/" and resolves ".." and "."
-    // Does not support using ".." to go above/outside the root.
-    // This means that join("foo", "../../bar") will not resolve to "../bar"
-    function join(/* path segments */) {
-        // Split the inputs into a list of path commands.
-        var parts = [];
-        for (var i = 0, l = arguments.length; i < l; i++) {
-            parts = parts.concat(arguments[i].split("/"));
-        }
-        // Interpret the path commands to get the new resolved path.
-        var newParts = [];
-        for (i = 0, l = parts.length; i < l; i++) {
-            var part = parts[i];
-            // Remove leading and trailing slashes
-            // Also remove "." segments
-            if (!part || part === ".") continue;
-            // Interpret ".." to pop the last segment
-            if (part === "..") newParts.pop();
-            // Push new path segments.
-            else newParts.push(part);
-        }
-        // Preserve the initial slash if there was one.
-        if (parts[0] === "") newParts.unshift("");
-        // Turn back into a single string path.
-        return newParts.join("/") || (newParts.length ? "/" : ".");
-    }
-     
-    // A simple function to get the dirname of a path
-    // Trailing slashes are ignored. Leading slash is preserved.
-    function dirname(path) {
-        return join(path, "..");
-    }
-
-    // test if a path or url is absolute
-    function isAbsolute(path) {
-        if (!path) return false;
-
-        return (path[0] == "/" || path.indexOf("http://") == 0 || path.indexOf("https://") == 0);
-    }
-
-    return {
-        dirname: dirname,
-        join: join,
-        isAbsolute: isAbsolute
-    };
-})

theme/javascript/utils/url.js

@@ -0,0 +1,33 @@
+define([
+    "vendors/URIjs/src/URI"
+], function(URI) {
+    // Joins path segments.  Preserves initial "/" and resolves ".." and "."
+    // Does not support using ".." to go above/outside the root.
+    // This means that join("foo", "../../bar") will not resolve to "../bar"
+    function join(baseUrl, url) {
+        var theUrl = new URI(url);
+        if (theUrl.is("relative")) {
+            theUrl = theUrl.absoluteTo(baseUrl);
+        }
+        return theUrl.toString();
+    }
+
+    // A simple function to get the dirname of a path
+    // Trailing slashes are ignored. Leading slash is preserved.
+    function dirname(path) {
+        return join(path, "..");
+    }
+
+    // test if a path or url is absolute
+    function isAbsolute(path) {
+        if (!path) return false;
+
+        return (path[0] == "/" || path.indexOf("http://") == 0 || path.indexOf("https://") == 0);
+    }
+
+    return {
+        dirname: dirname,
+        join: join,
+        isAbsolute: isAbsolute
+    };
+})

theme/javascript/vendors/mousetrap.js

@@ -1,953 +0,0 @@
-/*global define:false */
-/**
- * Copyright 2013 Craig Campbell
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Mousetrap is a simple keyboard shortcut library for Javascript with
- * no external dependencies
- *
- * @version 1.4.6
- * @url craig.is/killing/mice
- */
-(function(window, document, undefined) {
-
-    /**
-     * mapping of special keycodes to their corresponding keys
-     *
-     * everything in this dictionary cannot use keypress events
-     * so it has to be here to map to the correct keycodes for
-     * keyup/keydown events
-     *
-     * @type {Object}
-     */
-    var _MAP = {
-            8: 'backspace',
-            9: 'tab',
-            13: 'enter',
-            16: 'shift',
-            17: 'ctrl',
-            18: 'alt',
-            20: 'capslock',
-            27: 'esc',
-            32: 'space',
-            33: 'pageup',
-            34: 'pagedown',
-            35: 'end',
-            36: 'home',
-            37: 'left',
-            38: 'up',
-            39: 'right',
-            40: 'down',
-            45: 'ins',
-            46: 'del',
-            91: 'meta',
-            93: 'meta',
-            224: 'meta'
-        },
-
-        /**
-         * mapping for special characters so they can support
-         *
-         * this dictionary is only used incase you want to bind a
-         * keyup or keydown event to one of these keys
-         *
-         * @type {Object}
-         */
-        _KEYCODE_MAP = {
-            106: '*',
-            107: '+',
-            109: '-',
-            110: '.',
-            111 : '/',
-            186: ';',
-            187: '=',
-            188: ',',
-            189: '-',
-            190: '.',
-            191: '/',
-            192: '`',
-            219: '[',
-            220: '\\',
-            221: ']',
-            222: '\''
-        },
-
-        /**
-         * this is a mapping of keys that require shift on a US keypad
-         * back to the non shift equivelents
-         *
-         * this is so you can use keyup events with these keys
-         *
-         * note that this will only work reliably on US keyboards
-         *
-         * @type {Object}
-         */
-        _SHIFT_MAP = {
-            '~': '`',
-            '!': '1',
-            '@': '2',
-            '#': '3',
-            '$': '4',
-            '%': '5',
-            '^': '6',
-            '&': '7',
-            '*': '8',
-            '(': '9',
-            ')': '0',
-            '_': '-',
-            '+': '=',
-            ':': ';',
-            '\"': '\'',
-            '<': ',',
-            '>': '.',
-            '?': '/',
-            '|': '\\'
-        },
-
-        /**
-         * this is a list of special strings you can use to map
-         * to modifier keys when you specify your keyboard shortcuts
-         *
-         * @type {Object}
-         */
-        _SPECIAL_ALIASES = {
-            'option': 'alt',
-            'command': 'meta',
-            'return': 'enter',
-            'escape': 'esc',
-            'mod': /Mac|iPod|iPhone|iPad/.test(navigator.platform) ? 'meta' : 'ctrl'
-        },
-
-        /**
-         * variable to store the flipped version of _MAP from above
-         * needed to check if we should use keypress or not when no action
-         * is specified
-         *
-         * @type {Object|undefined}
-         */
-        _REVERSE_MAP,
-
-        /**
-         * a list of all the callbacks setup via Mousetrap.bind()
-         *
-         * @type {Object}
-         */
-        _callbacks = {},
-
-        /**
-         * direct map of string combinations to callbacks used for trigger()
-         *
-         * @type {Object}
-         */
-        _directMap = {},
-
-        /**
-         * keeps track of what level each sequence is at since multiple
-         * sequences can start out with the same sequence
-         *
-         * @type {Object}
-         */
-        _sequenceLevels = {},
-
-        /**
-         * variable to store the setTimeout call
-         *
-         * @type {null|number}
-         */
-        _resetTimer,
-
-        /**
-         * temporary state where we will ignore the next keyup
-         *
-         * @type {boolean|string}
-         */
-        _ignoreNextKeyup = false,
-
-        /**
-         * temporary state where we will ignore the next keypress
-         *
-         * @type {boolean}
-         */
-        _ignoreNextKeypress = false,
-
-        /**
-         * are we currently inside of a sequence?
-         * type of action ("keyup" or "keydown" or "keypress") or false
-         *
-         * @type {boolean|string}
-         */
-        _nextExpectedAction = false;
-
-    /**
-     * loop through the f keys, f1 to f19 and add them to the map
-     * programatically
-     */
-    for (var i = 1; i < 20; ++i) {
-        _MAP[111 + i] = 'f' + i;
-    }
-
-    /**
-     * loop through to map numbers on the numeric keypad
-     */
-    for (i = 0; i <= 9; ++i) {
-        _MAP[i + 96] = i;
-    }
-
-    /**
-     * cross browser add event method
-     *
-     * @param {Element|HTMLDocument} object
-     * @param {string} type
-     * @param {Function} callback
-     * @returns void
-     */
-    function _addEvent(object, type, callback) {
-        if (object.addEventListener) {
-            object.addEventListener(type, callback, false);
-            return;
-        }
-
-        object.attachEvent('on' + type, callback);
-    }
-
-    /**
-     * takes the event and returns the key character
-     *
-     * @param {Event} e
-     * @return {string}
-     */
-    function _characterFromEvent(e) {
-
-        // for keypress events we should return the character as is
-        if (e.type == 'keypress') {
-            var character = String.fromCharCode(e.which);
-
-            // if the shift key is not pressed then it is safe to assume
-            // that we want the character to be lowercase.  this means if
-            // you accidentally have caps lock on then your key bindings
-            // will continue to work
-            //
-            // the only side effect that might not be desired is if you
-            // bind something like 'A' cause you want to trigger an
-            // event when capital A is pressed caps lock will no longer
-            // trigger the event.  shift+a will though.
-            if (!e.shiftKey) {
-                character = character.toLowerCase();
-            }
-
-            return character;
-        }
-
-        // for non keypress events the special maps are needed
-        if (_MAP[e.which]) {
-            return _MAP[e.which];
-        }
-
-        if (_KEYCODE_MAP[e.which]) {
-            return _KEYCODE_MAP[e.which];
-        }
-
-        // if it is not in the special map
-
-        // with keydown and keyup events the character seems to always
-        // come in as an uppercase character whether you are pressing shift
-        // or not.  we should make sure it is always lowercase for comparisons
-        return String.fromCharCode(e.which).toLowerCase();
-    }
-
-    /**
-     * checks if two arrays are equal
-     *
-     * @param {Array} modifiers1
-     * @param {Array} modifiers2
-     * @returns {boolean}
-     */
-    function _modifiersMatch(modifiers1, modifiers2) {
-        return modifiers1.sort().join(',') === modifiers2.sort().join(',');
-    }
-
-    /**
-     * resets all sequence counters except for the ones passed in
-     *
-     * @param {Object} doNotReset
-     * @returns void
-     */
-    function _resetSequences(doNotReset) {
-        doNotReset = doNotReset || {};
-
-        var activeSequences = false,
-            key;
-
-        for (key in _sequenceLevels) {
-            if (doNotReset[key]) {
-                activeSequences = true;
-                continue;
-            }
-            _sequenceLevels[key] = 0;
-        }
-
-        if (!activeSequences) {
-            _nextExpectedAction = false;
-        }
-    }
-
-    /**
-     * finds all callbacks that match based on the keycode, modifiers,
-     * and action
-     *
-     * @param {string} character
-     * @param {Array} modifiers
-     * @param {Event|Object} e
-     * @param {string=} sequenceName - name of the sequence we are looking for
-     * @param {string=} combination
-     * @param {number=} level
-     * @returns {Array}
-     */
-    function _getMatches(character, modifiers, e, sequenceName, combination, level) {
-        var i,
-            callback,
-            matches = [],
-            action = e.type;
-
-        // if there are no events related to this keycode
-        if (!_callbacks[character]) {
-            return [];
-        }
-
-        // if a modifier key is coming up on its own we should allow it
-        if (action == 'keyup' && _isModifier(character)) {
-            modifiers = [character];
-        }
-
-        // loop through all callbacks for the key that was pressed
-        // and see if any of them match
-        for (i = 0; i < _callbacks[character].length; ++i) {
-            callback = _callbacks[character][i];
-
-            // if a sequence name is not specified, but this is a sequence at
-            // the wrong level then move onto the next match
-            if (!sequenceName && callback.seq && _sequenceLevels[callback.seq] != callback.level) {
-                continue;
-            }
-
-            // if the action we are looking for doesn't match the action we got
-            // then we should keep going
-            if (action != callback.action) {
-                continue;
-            }
-
-            // if this is a keypress event and the meta key and control key
-            // are not pressed that means that we need to only look at the
-            // character, otherwise check the modifiers as well
-            //
-            // chrome will not fire a keypress if meta or control is down
-            // safari will fire a keypress if meta or meta+shift is down
-            // firefox will fire a keypress if meta or control is down
-            if ((action == 'keypress' && !e.metaKey && !e.ctrlKey) || _modifiersMatch(modifiers, callback.modifiers)) {
-
-                // when you bind a combination or sequence a second time it
-                // should overwrite the first one.  if a sequenceName or
-                // combination is specified in this call it does just that
-                //
-                // @todo make deleting its own method?
-                var deleteCombo = !sequenceName && callback.combo == combination;
-                var deleteSequence = sequenceName && callback.seq == sequenceName && callback.level == level;
-                if (deleteCombo || deleteSequence) {
-                    _callbacks[character].splice(i, 1);
-                }
-
-                matches.push(callback);
-            }
-        }
-
-        return matches;
-    }
-
-    /**
-     * takes a key event and figures out what the modifiers are
-     *
-     * @param {Event} e
-     * @returns {Array}
-     */
-    function _eventModifiers(e) {
-        var modifiers = [];
-
-        if (e.shiftKey) {
-            modifiers.push('shift');
-        }
-
-        if (e.altKey) {
-            modifiers.push('alt');
-        }
-
-        if (e.ctrlKey) {
-            modifiers.push('ctrl');
-        }
-
-        if (e.metaKey) {
-            modifiers.push('meta');
-        }
-
-        return modifiers;
-    }
-
-    /**
-     * prevents default for this event
-     *
-     * @param {Event} e
-     * @returns void
-     */
-    function _preventDefault(e) {
-        if (e.preventDefault) {
-            e.preventDefault();
-            return;
-        }
-
-        e.returnValue = false;
-    }
-
-    /**
-     * stops propogation for this event
-     *
-     * @param {Event} e
-     * @returns void
-     */
-    function _stopPropagation(e) {
-        if (e.stopPropagation) {
-            e.stopPropagation();
-            return;
-        }
-
-        e.cancelBubble = true;
-    }
-
-    /**
-     * actually calls the callback function
-     *
-     * if your callback function returns false this will use the jquery
-     * convention - prevent default and stop propogation on the event
-     *
-     * @param {Function} callback
-     * @param {Event} e
-     * @returns void
-     */
-    function _fireCallback(callback, e, combo, sequence) {
-
-        // if this event should not happen stop here
-        if (Mousetrap.stopCallback(e, e.target || e.srcElement, combo, sequence)) {
-            return;
-        }
-
-        if (callback(e, combo) === false) {
-            _preventDefault(e);
-            _stopPropagation(e);
-        }
-    }
-
-    /**
-     * handles a character key event
-     *
-     * @param {string} character
-     * @param {Array} modifiers
-     * @param {Event} e
-     * @returns void
-     */
-    function _handleKey(character, modifiers, e) {
-        var callbacks = _getMatches(character, modifiers, e),
-            i,
-            doNotReset = {},
-            maxLevel = 0,
-            processedSequenceCallback = false;
-
-        // Calculate the maxLevel for sequences so we can only execute the longest callback sequence
-        for (i = 0; i < callbacks.length; ++i) {
-            if (callbacks[i].seq) {
-                maxLevel = Math.max(maxLevel, callbacks[i].level);
-            }
-        }
-
-        // loop through matching callbacks for this key event
-        for (i = 0; i < callbacks.length; ++i) {
-
-            // fire for all sequence callbacks
-            // this is because if for example you have multiple sequences
-            // bound such as "g i" and "g t" they both need to fire the
-            // callback for matching g cause otherwise you can only ever
-            // match the first one
-            if (callbacks[i].seq) {
-
-                // only fire callbacks for the maxLevel to prevent
-                // subsequences from also firing
-                //
-                // for example 'a option b' should not cause 'option b' to fire
-                // even though 'option b' is part of the other sequence
-                //
-                // any sequences that do not match here will be discarded
-                // below by the _resetSequences call
-                if (callbacks[i].level != maxLevel) {
-                    continue;
-                }
-
-                processedSequenceCallback = true;
-
-                // keep a list of which sequences were matches for later
-                doNotReset[callbacks[i].seq] = 1;
-                _fireCallback(callbacks[i].callback, e, callbacks[i].combo, callbacks[i].seq);
-                continue;
-            }
-
-            // if there were no sequence matches but we are still here
-            // that means this is a regular match so we should fire that
-            if (!processedSequenceCallback) {
-                _fireCallback(callbacks[i].callback, e, callbacks[i].combo);
-            }
-        }
-
-        // if the key you pressed matches the type of sequence without
-        // being a modifier (ie "keyup" or "keypress") then we should
-        // reset all sequences that were not matched by this event
-        //
-        // this is so, for example, if you have the sequence "h a t" and you
-        // type "h e a r t" it does not match.  in this case the "e" will
-        // cause the sequence to reset
-        //
-        // modifier keys are ignored because you can have a sequence
-        // that contains modifiers such as "enter ctrl+space" and in most
-        // cases the modifier key will be pressed before the next key
-        //
-        // also if you have a sequence such as "ctrl+b a" then pressing the
-        // "b" key will trigger a "keypress" and a "keydown"
-        //
-        // the "keydown" is expected when there is a modifier, but the
-        // "keypress" ends up matching the _nextExpectedAction since it occurs
-        // after and that causes the sequence to reset
-        //
-        // we ignore keypresses in a sequence that directly follow a keydown
-        // for the same character
-        var ignoreThisKeypress = e.type == 'keypress' && _ignoreNextKeypress;
-        if (e.type == _nextExpectedAction && !_isModifier(character) && !ignoreThisKeypress) {
-            _resetSequences(doNotReset);
-        }
-
-        _ignoreNextKeypress = processedSequenceCallback && e.type == 'keydown';
-    }
-
-    /**
-     * handles a keydown event
-     *
-     * @param {Event} e
-     * @returns void
-     */
-    function _handleKeyEvent(e) {
-
-        // normalize e.which for key events
-        // @see http://stackoverflow.com/questions/4285627/javascript-keycode-vs-charcode-utter-confusion
-        if (typeof e.which !== 'number') {
-            e.which = e.keyCode;
-        }
-
-        var character = _characterFromEvent(e);
-
-        // no character found then stop
-        if (!character) {
-            return;
-        }
-
-        // need to use === for the character check because the character can be 0
-        if (e.type == 'keyup' && _ignoreNextKeyup === character) {
-            _ignoreNextKeyup = false;
-            return;
-        }
-
-        Mousetrap.handleKey(character, _eventModifiers(e), e);
-    }
-
-    /**
-     * determines if the keycode specified is a modifier key or not
-     *
-     * @param {string} key
-     * @returns {boolean}
-     */
-    function _isModifier(key) {
-        return key == 'shift' || key == 'ctrl' || key == 'alt' || key == 'meta';
-    }
-
-    /**
-     * called to set a 1 second timeout on the specified sequence
-     *
-     * this is so after each key press in the sequence you have 1 second
-     * to press the next key before you have to start over
-     *
-     * @returns void
-     */
-    function _resetSequenceTimer() {
-        clearTimeout(_resetTimer);
-        _resetTimer = setTimeout(_resetSequences, 1000);
-    }
-
-    /**
-     * reverses the map lookup so that we can look for specific keys
-     * to see what can and can't use keypress
-     *
-     * @return {Object}
-     */
-    function _getReverseMap() {
-        if (!_REVERSE_MAP) {
-            _REVERSE_MAP = {};
-            for (var key in _MAP) {
-
-                // pull out the numeric keypad from here cause keypress should
-                // be able to detect the keys from the character
-                if (key > 95 && key < 112) {
-                    continue;
-                }
-
-                if (_MAP.hasOwnProperty(key)) {
-                    _REVERSE_MAP[_MAP[key]] = key;
-                }
-            }
-        }
-        return _REVERSE_MAP;
-    }
-
-    /**
-     * picks the best action based on the key combination
-     *
-     * @param {string} key - character for key
-     * @param {Array} modifiers
-     * @param {string=} action passed in
-     */
-    function _pickBestAction(key, modifiers, action) {
-
-        // if no action was picked in we should try to pick the one
-        // that we think would work best for this key
-        if (!action) {
-            action = _getReverseMap()[key] ? 'keydown' : 'keypress';
-        }
-
-        // modifier keys don't work as expected with keypress,
-        // switch to keydown
-        if (action == 'keypress' && modifiers.length) {
-            action = 'keydown';
-        }
-
-        return action;
-    }
-
-    /**
-     * binds a key sequence to an event
-     *
-     * @param {string} combo - combo specified in bind call
-     * @param {Array} keys
-     * @param {Function} callback
-     * @param {string=} action
-     * @returns void
-     */
-    function _bindSequence(combo, keys, callback, action) {
-
-        // start off by adding a sequence level record for this combination
-        // and setting the level to 0
-        _sequenceLevels[combo] = 0;
-
-        /**
-         * callback to increase the sequence level for this sequence and reset
-         * all other sequences that were active
-         *
-         * @param {string} nextAction
-         * @returns {Function}
-         */
-        function _increaseSequence(nextAction) {
-            return function() {
-                _nextExpectedAction = nextAction;
-                ++_sequenceLevels[combo];
-                _resetSequenceTimer();
-            };
-        }
-
-        /**
-         * wraps the specified callback inside of another function in order
-         * to reset all sequence counters as soon as this sequence is done
-         *
-         * @param {Event} e
-         * @returns void
-         */
-        function _callbackAndReset(e) {
-            _fireCallback(callback, e, combo);
-
-            // we should ignore the next key up if the action is key down
-            // or keypress.  this is so if you finish a sequence and
-            // release the key the final key will not trigger a keyup
-            if (action !== 'keyup') {
-                _ignoreNextKeyup = _characterFromEvent(e);
-            }
-
-            // weird race condition if a sequence ends with the key
-            // another sequence begins with
-            setTimeout(_resetSequences, 10);
-        }
-
-        // loop through keys one at a time and bind the appropriate callback
-        // function.  for any key leading up to the final one it should
-        // increase the sequence. after the final, it should reset all sequences
-        //
-        // if an action is specified in the original bind call then that will
-        // be used throughout.  otherwise we will pass the action that the
-        // next key in the sequence should match.  this allows a sequence
-        // to mix and match keypress and keydown events depending on which
-        // ones are better suited to the key provided
-        for (var i = 0; i < keys.length; ++i) {
-            var isFinal = i + 1 === keys.length;
-            var wrappedCallback = isFinal ? _callbackAndReset : _increaseSequence(action || _getKeyInfo(keys[i + 1]).action);
-            _bindSingle(keys[i], wrappedCallback, action, combo, i);
-        }
-    }
-
-    /**
-     * Converts from a string key combination to an array
-     *
-     * @param  {string} combination like "command+shift+l"
-     * @return {Array}
-     */
-    function _keysFromString(combination) {
-        if (combination === '+') {
-            return ['+'];
-        }
-
-        return combination.split('+');
-    }
-
-    /**
-     * Gets info for a specific key combination
-     *
-     * @param  {string} combination key combination ("command+s" or "a" or "*")
-     * @param  {string=} action
-     * @returns {Object}
-     */
-    function _getKeyInfo(combination, action) {
-        var keys,
-            key,
-            i,
-            modifiers = [];
-
-        // take the keys from this pattern and figure out what the actual
-        // pattern is all about
-        keys = _keysFromString(combination);
-
-        for (i = 0; i < keys.length; ++i) {
-            key = keys[i];
-
-            // normalize key names
-            if (_SPECIAL_ALIASES[key]) {
-                key = _SPECIAL_ALIASES[key];
-            }
-
-            // if this is not a keypress event then we should
-            // be smart about using shift keys
-            // this will only work for US keyboards however
-            if (action && action != 'keypress' && _SHIFT_MAP[key]) {
-                key = _SHIFT_MAP[key];
-                modifiers.push('shift');
-            }
-
-            // if this key is a modifier then add it to the list of modifiers
-            if (_isModifier(key)) {
-                modifiers.push(key);
-            }
-        }
-
-        // depending on what the key combination is
-        // we will try to pick the best event for it
-        action = _pickBestAction(key, modifiers, action);
-
-        return {
-            key: key,
-            modifiers: modifiers,
-            action: action
-        };
-    }
-
-    /**
-     * binds a single keyboard combination
-     *
-     * @param {string} combination
-     * @param {Function} callback
-     * @param {string=} action
-     * @param {string=} sequenceName - name of sequence if part of sequence
-     * @param {number=} level - what part of the sequence the command is
-     * @returns void
-     */
-    function _bindSingle(combination, callback, action, sequenceName, level) {
-
-        // store a direct mapped reference for use with Mousetrap.trigger
-        _directMap[combination + ':' + action] = callback;
-
-        // make sure multiple spaces in a row become a single space
-        combination = combination.replace(/\s+/g, ' ');
-
-        var sequence = combination.split(' '),
-            info;
-
-        // if this pattern is a sequence of keys then run through this method
-        // to reprocess each pattern one key at a time
-        if (sequence.length > 1) {
-            _bindSequence(combination, sequence, callback, action);
-            return;
-        }
-
-        info = _getKeyInfo(combination, action);
-
-        // make sure to initialize array if this is the first time
-        // a callback is added for this key
-        _callbacks[info.key] = _callbacks[info.key] || [];
-
-        // remove an existing match if there is one
-        _getMatches(info.key, info.modifiers, {type: info.action}, sequenceName, combination, level);
-
-        // add this call back to the array
-        // if it is a sequence put it at the beginning
-        // if not put it at the end
-        //
-        // this is important because the way these are processed expects
-        // the sequence ones to come first
-        _callbacks[info.key][sequenceName ? 'unshift' : 'push']({
-            callback: callback,
-            modifiers: info.modifiers,
-            action: info.action,
-            seq: sequenceName,
-            level: level,
-            combo: combination
-        });
-    }
-
-    /**
-     * binds multiple combinations to the same callback
-     *
-     * @param {Array} combinations
-     * @param {Function} callback
-     * @param {string|undefined} action
-     * @returns void
-     */
-    function _bindMultiple(combinations, callback, action) {
-        for (var i = 0; i < combinations.length; ++i) {
-            _bindSingle(combinations[i], callback, action);
-        }
-    }
-
-    // start!
-    _addEvent(document, 'keypress', _handleKeyEvent);
-    _addEvent(document, 'keydown', _handleKeyEvent);
-    _addEvent(document, 'keyup', _handleKeyEvent);
-
-    var Mousetrap = {
-
-        /**
-         * binds an event to mousetrap
-         *
-         * can be a single key, a combination of keys separated with +,
-         * an array of keys, or a sequence of keys separated by spaces
-         *
-         * be sure to list the modifier keys first to make sure that the
-         * correct key ends up getting bound (the last key in the pattern)
-         *
-         * @param {string|Array} keys
-         * @param {Function} callback
-         * @param {string=} action - 'keypress', 'keydown', or 'keyup'
-         * @returns void
-         */
-        bind: function(keys, callback, action) {
-            keys = keys instanceof Array ? keys : [keys];
-            _bindMultiple(keys, callback, action);
-            return this;
-        },
-
-        /**
-         * unbinds an event to mousetrap
-         *
-         * the unbinding sets the callback function of the specified key combo
-         * to an empty function and deletes the corresponding key in the
-         * _directMap dict.
-         *
-         * TODO: actually remove this from the _callbacks dictionary instead
-         * of binding an empty function
-         *
-         * the keycombo+action has to be exactly the same as
-         * it was defined in the bind method
-         *
-         * @param {string|Array} keys
-         * @param {string} action
-         * @returns void
-         */
-        unbind: function(keys, action) {
-            return Mousetrap.bind(keys, function() {}, action);
-        },
-
-        /**
-         * triggers an event that has already been bound
-         *
-         * @param {string} keys
-         * @param {string=} action
-         * @returns void
-         */
-        trigger: function(keys, action) {
-            if (_directMap[keys + ':' + action]) {
-                _directMap[keys + ':' + action]({}, keys);
-            }
-            return this;
-        },
-
-        /**
-         * resets the library back to its initial state.  this is useful
-         * if you want to clear out the current keyboard shortcuts and bind
-         * new ones - for example if you switch to another page
-         *
-         * @returns void
-         */
-        reset: function() {
-            _callbacks = {};
-            _directMap = {};
-            return this;
-        },
-
-       /**
-        * should we stop this event before firing off callbacks
-        *
-        * @param {Event} e
-        * @param {Element} element
-        * @return {boolean}
-        */
-        stopCallback: function(e, element) {
-
-            // if the element has the class "mousetrap" then no need to stop
-            if ((' ' + element.className + ' ').indexOf(' mousetrap ') > -1) {
-                return false;
-            }
-
-            // stop for input, select, and textarea
-            return element.tagName == 'INPUT' || element.tagName == 'SELECT' || element.tagName == 'TEXTAREA' || element.isContentEditable;
-        },
-
-        /**
-         * exposes _handleKey publicly so it can be overwritten by extensions
-         */
-        handleKey: _handleKey
-    };
-
-    // expose mousetrap to the global object
-    window.Mousetrap = Mousetrap;
-
-    // expose mousetrap as an AMD module
-    if (typeof define === 'function' && define.amd) {
-        define(Mousetrap);
-    }
-}) (window, document);

theme/stylesheets/book/body.less

@@ -1,6 +1,10 @@
 .book {
+    position: relative;
+    width: 100%;
+    height: 100%;
+
     .book-body {
-        position: fixed;
+        position: absolute;
         top: @header-height;
         right: 0px;
         left: 0px;
@@ -55,32 +59,10 @@
                 min-height: calc(~"100% - 57px")
             }
         }
-        &.font-size-0{
-            font-size:@s-font-size;
-        }
-        &.font-size-1{
-            font-size:@m-font-size;
-        }
-        &.font-size-2{
-            font-size:@l-font-size;
-        }
-        &.font-size-3{
-            font-size:@xl-font-size;
-        }
-        &.font-size-4{
-            font-size:@xxl-font-size;
-        }
-
-        &.font-family-0{
-            font-family: @font-family-serif;
-        }
-        &.font-family-1{
-            font-family: @font-family-sans;
-        }
     }
 
     &.with-summary {
-        @media (min-width: 800px) {
+        @media (min-width: @sidebar-breakpoint) {
             .book-body {
                 left: 250px;
             }
@@ -118,4 +100,37 @@
             }
         }
     }
+
+    &.font-size-0 {
+        .book-body {
+            font-size:@s-font-size;
+        }
+    }
+    &.font-size-1 {
+        .book-body {
+            font-size:@m-font-size;
+        }
+    }
+    &.font-size-2 {
+        .book-body {
+            font-size:@l-font-size;
+        }
+    }
+    &.font-size-3 {
+        .book-body {
+            font-size:@xl-font-size;
+        }
+    }
+    &.font-size-4 {
+        .book-body {
+            font-size:@xxl-font-size;
+        }
+    }
+
+    &.font-family-0{
+        font-family: @font-family-serif;
+    }
+    &.font-family-1{
+        font-family: @font-family-sans;
+    }
 }

theme/stylesheets/book/exercise.less

@@ -1,7 +1,7 @@
 .book .book-body .page-wrapper .page-inner {
     section.exercise {
         padding: 0px;
-        margin: 20px 0px;
+        margin: 20px 15px;
         border: 3px solid #2f8cde;
 
         .header {

theme/stylesheets/book/header.less

@@ -2,7 +2,7 @@
     .book-header {
         font-family: @font-family-sans;
 
-        position: fixed;
+        position: absolute;
         overflow: visible;
         top: 0px;
         right: 0px;

theme/stylesheets/book/markdown.less

@@ -21,9 +21,10 @@
     }
 }
 .book .book-body .page-wrapper .page-inner section.normal {
-    padding: 25px 0px;
+    padding-bottom: 25px;
     padding-top: 15px;
     color:@page-color;
+    letter-spacing: 0.01rem;
 
     & > *:first-child {
         margin-top: 0 !important; }
@@ -72,25 +73,25 @@
         font-size: inherit; }
 
     h1 {
-        font-size: 28px;
+        font-size: 2.5em;
     }
 
     h2 {
-        font-size: 24px;
+        font-size: 2em;
         border-bottom: 1px solid #eee;
     }
 
     h3 {
-        font-size: 18px; }
+        font-size: 1.5em; }
 
     h4 {
-        font-size: 16px; }
+        font-size: 1.2em; }
 
     h5 {
-        font-size: 14px; }
+        font-size: 1em; }
 
     h6 {
-        font-size: 14px; }
+        font-size: 1em; }
 
     p, blockquote, ul, ol, dl, table, pre {
         margin: 15px 0; }

theme/stylesheets/book/navigation.less

@@ -13,15 +13,15 @@
         flex-direction: column;
 
         font-size: 40px;
-        color: rgba(0,0,0,0.5);
+        color: rgba(0,0,0,0.4);
 
         text-align: center;
 
         .transition(all 350ms ease);
 
         &:hover {
-            background-color: @body-pagination-background;
             text-decoration: none;
+            color: rgba(0,0,0,0.6);
         }
 
         &.navigation-next {
@@ -40,16 +40,19 @@
             width: 50%;
             display: inline-block;
             float: left;
+
+            &.navigation-unique {
+                max-width: 100%;
+                width: 100%;
+            }
         }
     }
 }
 .book.color-theme-1 .book-body  {
     .navigation:hover{
-        background-color: @body-pagination-background-1;
     }
 }
 .book.color-theme-2 .book-body  {
     .navigation:hover{
-        background-color: @body-pagination-background-2;
     }
 }

theme/stylesheets/book/progress.less

@@ -16,7 +16,7 @@
         width: 100%;
         position: relative;
         background: #fff;
-        margin-bottom: 20px;
+        margin-bottom: 10px;
 
         .bar {
             height: @bar-height;

theme/stylesheets/book/quiz.less

@@ -1,7 +1,7 @@
 .book .book-body .page-wrapper .page-inner {
     section.quiz {
         padding: 0px;
-        margin: 20px 0px;
+        margin: 20px 15px;
         border: 3px solid #2f8cde;
 
         .header {

theme/stylesheets/book/summary.less

@@ -2,7 +2,7 @@
     .book-summary {
         font-family: @font-family-sans;
 
-        position: fixed;
+        position: absolute;
         top: @header-height;
         left: -@sidebar-width;
         bottom: 0px;
@@ -90,7 +90,6 @@
                     overflow: hidden;
                     white-space: nowrap;
                     position: relative;
-                    padding-left: 25px;
                 }
 
                 span {
@@ -110,7 +109,7 @@
             }
         }
 
-        @media (max-width: 600px) {
+        @media (max-width: @sidebar-breakpoint) {
             width: 100%;
             bottom: 0px;
             left: -100%;

theme/stylesheets/variables.less

@@ -13,14 +13,14 @@
 
 // Body
 @body-background:                     white;
-@body-pagination-background:          hsl(207, 15%, 95%);
 
 // Sidebar
 @sidebar-width:                       250px;
+@sidebar-breakpoint:                  600px;
 @sidebar-color:                       hsl(207, 15%, 80%);
 @sidebar-background:                  hsl(207, 15%, 95%);
 
-@sidebar-nested-padding:              10px;
+@sidebar-nested-padding:              20px;
 
 @sidebar-search-padding:              6px;
 @sidebar-search-background:           transparent;
@@ -90,12 +90,12 @@
 @xl-font-size:												2.2rem;
 @xxl-font-size:												4.0rem;
 
-/*                                                       
+/*
-,--------.,--.                                         
+,--------.,--.
-'--.  .--'|  ,---.  ,---. ,--,--,--. ,---.  ,---. .--. 
+'--.  .--'|  ,---.  ,---. ,--,--,--. ,---.  ,---. .--.
-   |  |   |  .-.  || .-. :|        || .-. :(  .-' '--' 
+   |  |   |  .-.  || .-. :|        || .-. :(  .-' '--'
-   |  |   |  | |  |\   --.|  |  |  |\   --..-'  `).--. 
+   |  |   |  | |  |\   --.|  |  |  |\   --..-'  `).--.
-   `--'   `--' `--' `----'`--`--`--' `----'`----' '--' 
+   `--'   `--' `--' `----'`--`--`--' `----'`----' '--'
 */
 // Header
 @header-color-1:                        #AFA790;
@@ -112,8 +112,6 @@
 // Body
 @body-background-1:                     #F3EACB;
 @body-background-2:                     #1d1f21;
-@body-pagination-background-1:          #FFFAEA;
-@body-pagination-background-2:          #33404D;
 
 // Sidebar
 @sidebar-color-1:                       #AFA790;

theme/templates/includes/book/font-settings.html

@@ -1,22 +1,22 @@
 <div class="dropdown-menu font-settings">
-	<div class="dropdown-caret">
+    <div class="dropdown-caret">
-  <span class="caret-outer"></span>
+        <span class="caret-outer"></span>
-  <span class="caret-inner"></span>
+        <span class="caret-inner"></span>
-</div>
+    </div>
-
+
-	<div class="btn-group btn-block">
+    <div class="btn-group btn-block">
-		<button id="reduce-font-size" class="btn btn-default">A</button>
+        <button id="reduce-font-size" class="btn btn-default">A</button>
-		<button id="enlarge-font-size" class="btn btn-default">A</button>
+        <button id="enlarge-font-size" class="btn btn-default">A</button>
-	</div>
+    </div>
-
+
-	<ul class="list-group font-family-list">
+    <ul class="list-group font-family-list">
-		<li class="list-group-item" data-font="0">Serif</li>
+        <li class="list-group-item" data-font="0">Serif</li>
-		<li class="list-group-item" data-font="1">Sans</li>
+        <li class="list-group-item" data-font="1">Sans</li>
-	</ul>
+    </ul>
-
+
-	<div class="btn-group btn-group-xs btn-block color-theme-list">
+    <div class="btn-group btn-group-xs btn-block color-theme-list">
-	  <button type="button" class="btn btn-default" id="color-theme-preview-0" data-theme="0">White</button>
+        <button type="button" class="btn btn-default" id="color-theme-preview-0" data-theme="0">White</button>
-	  <button type="button" class="btn btn-default" id="color-theme-preview-1" data-theme="1">Sepia</button>
+        <button type="button" class="btn btn-default" id="color-theme-preview-1" data-theme="1">Sepia</button>
-	  <button type="button" class="btn btn-default" id="color-theme-preview-2" data-theme="2">Night</button>
+        <button type="button" class="btn btn-default" id="color-theme-preview-2" data-theme="2">Night</button>
-	</div>
+    </div>
 </div>

theme/templates/includes/book/header.html

@@ -1,24 +1,30 @@
 <div class="book-header">
     <!-- Actions Left -->
-    {% if githubId %}
+    <a href="#" class="btn pull-left toggle-summary" aria-label="Toggle summary"><i class="fa fa-align-justify"></i></a>
-    <a href="{{ githubHost }}{{ githubId }}" target="_blank" class="btn pull-left"><i class="fa fa-github-alt"></i></a>
+    {% if options.links.home !== false and (options.links.home != null or githubId) %}
+    <a href="{{ options.links.home|default(githubHost+githubId) }}" target="_blank" class="btn pull-left home-bookmark" aria-label="GitHub home"><i class="fa fa-bookmark-o"></i></a>
     {% endif %}
-    <a href="#" class="btn pull-left toggle-summary"><i class="fa fa-align-justify"></i></a>
+    <a href="#" class="btn pull-left toggle-search" aria-label="Toggle search"><i class="fa fa-search"></i></a>
-    <a href="#" class="btn pull-left toggle-search"><i class="fa fa-search"></i></a>
     <span id="font-settings-wrapper">
-        <a href="#" class="btn pull-left toggle-font-settings"><i class="fa fa-font"></i>
+        <a href="#" class="btn pull-left toggle-font-settings" aria-label="Toggle font settings"><i class="fa fa-font"></i>
         </a>
         {% include "./font-settings.html" %}
     </span>
 
     <!-- Actions Right -->
-    <a href="#" target="_blank" class="btn pull-right" data-sharing="google-plus"><i class="fa fa-google-plus"></i></a>
+    {% if options.links.sharing.google !== false %}
-    <a href="#" target="_blank" class="btn pull-right" data-sharing="facebook"><i class="fa fa-facebook"></i></a>
+    <a href="#" target="_blank" class="btn pull-right google-plus-sharing-link sharing-link" data-sharing="google-plus" aria-label="Share on Google Plus"><i class="fa fa-google-plus"></i></a>
-    <a href="#" target="_blank" class="btn pull-right" data-sharing="twitter"><i class="fa fa-twitter"></i></a>
+    {% endif %}
+    {% if options.links.sharing.facebook !== false %}
+    <a href="#" target="_blank" class="btn pull-right facebook-sharing-link sharing-link" data-sharing="facebook" aria-label="Share on Facebook"><i class="fa fa-facebook"></i></a>
+    {% endif %}
+    {% if options.links.sharing.twitter !== false %}
+    <a href="#" target="_blank" class="btn pull-right twitter-sharing-link sharing-link" data-sharing="twitter" aria-label="Share on Twitter"><i class="fa fa-twitter"></i></a>
+    {% endif %}
 
     {% if githubId %}
-    <a href="{{ githubHost }}{{ githubId }}/stargazers" target="_blank" class="btn pull-right count-star"><i class="fa fa-star-o"></i> Star (<span>-</span>)</a>
+    <a href="{{ githubHost }}{{ githubId }}/stargazers" target="_blank" class="btn pull-right count-star hidden-xs"><i class="fa fa-star-o"></i> Star (<span>-</span>)</a>
-    <a href="{{ githubHost }}{{ githubId }}/watchers" target="_blank" class="btn pull-right count-watch"><i class="fa fa-eye"></i> Watch (<span>-</span>)</a>
+    <a href="{{ githubHost }}{{ githubId }}/watchers" target="_blank" class="btn pull-right count-watch hidden-xs"><i class="fa fa-eye"></i> Watch (<span>-</span>)</a>
     {% endif %}
 
     <!-- Title -->

theme/templates/includes/book/summary.html

@@ -1,48 +1,63 @@
+{% macro articles(_articles) %}
+    {% for item in _articles %}
+        <li class="chapter {% if item._path == _input %}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 }}
+            </a>
+            {% else %}
+            <span><b>{{ item.level }}.</b> {{ item.title }}</span>
+            {% endif %}
+            {% if item.articles.length > 0 %}
+            <ul class="articles">
+                {{ articles(item.articles) }}
+            </ul>
+            {% endif %}
+        </li>
+    {% endfor %}
+{% endmacro %}
+
 <div class="book-summary">
     <div class="book-search">
         <input type="text" placeholder="Search" class="form-control" />
     </div>
     <ul class="summary">
-        {% if githubId %}
+        {% set _divider = false %}
+        {% if options.links.about !== false && (options.links.about || githubId) %}
+        {% set _divider = true %}
         <li>
-            <a href="{{ githubHost }}{{ githubAuthor }}" target="blank">About the author</a>
+            <a href="{{ options.links.about|default(githubHost+githubAuthor) }}" target="blank" class="author-link">About the author</a>
         </li>
+        {% endif %}
+
+        {% if options.links.issues !== false && (options.links.issues || githubId) %}
+        {% set _divider = true %}
         <li>
-            <a href="{{ githubHost }}{{ githubId }}/issues" target="blank">Questions and Issues</a>
+            <a href="{{ options.links.issues|default(githubHost+githubId+"/issues") }}" target="blank"class="issues-link">Questions and Issues</a>
         </li>
+        {% endif %}
+
+        {% if options.links.contribute !== false && (options.links.contribute || githubId) %}
+        {% set _divider = true %}
         <li>
-            <a href="{{ githubHost }}{{ githubId }}/edit/master/{{ _input }}" target="blank">Edit and Contribute</a>
+            <a href="{{ options.links.contribute|default(githubHost+githubId+"/edit/master/"+_input) }}" target="blank" class="contribute-link">Edit and Contribute</a>
         </li>
+        {% endif %}
+
+        {% if _divider %}
         <li class="divider"></li>
         {% endif %}
+
         <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 %}
+        {{ articles(summary.chapters) }}
-            <li {% if item._path == _input %}class="active"{% endif %} data-level="{{ item.level }}" {% if item.path %}data-path="{{ item.path|mdLink }}"{% endif %}>
+
-                {% if item.path %}
+        {% if options.links.gitbook !== false %}
-                <a href="{{ basePath }}/{{ item.path|mdLink }}">
+        <li class="divider"></li>
-                    <i class="fa fa-check"></i> <b>{{ item.level }}.</b> {{ item.title }}
+        <li>
-                </a>
+            <a href="http://www.gitbook.io/" target="blank" class="gitbook-link">Generated using GitBook</a>
-                {% else %}
+        </li>
-                <span><b>{{ item.level }}.</b> {{ item.title }}</span>
+        {% endif %}
-                {% endif %}
-                {% 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 }}" {% 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 }}
-                            </a>
-                            {% else %}
-                            <span><b>{{ article.level }}.</b> {{ article.title }}</span>
-                            {% endif %}
-                        </li>
-                    {% endfor %}
-                </ul>
-                {% endif %}
-            </li>
-        {% endfor %}
     </ul>
 </div>

theme/templates/layout.html

@@ -1,6 +1,8 @@
 <!DOCTYPE HTML>
 <html lang="en-US" {% block htmlTag %}{% endblock %}>
+    {{ htmlSnippet("html:start")|default("") }}
     <head prefix="og: http://ogp.me/ns# book: http://ogp.me/ns/book#">
+        {{ htmlSnippet("head:start")|default("") }}
         {% block head %}
         <meta charset="UTF-8">
         <title>{% block title %} | {{ title }}{% endblock %}</title>
@@ -33,8 +35,10 @@
 
         <link rel="shortcut icon" href="{{ staticBase }}/images/favicon.ico" type="image/x-icon">
         {% endblock %}
+        {{ htmlSnippet("head:end")|default("") }}
     </head>
     <body>
+        {{ htmlSnippet("body:start")|default("") }}
         {% block style %}
         <link rel="stylesheet" href="{{ staticBase }}/style.css">
         {% endblock %}
@@ -45,5 +49,7 @@
         <script src="{{ staticBase }}/jsrepl/jsrepl.js" id="jsrepl-script"></script>
         <script src="{{ staticBase }}/app.js"></script>
         {% endblock %}
+        {{ htmlSnippet("body:end")|default("") }}
     </body>
+    {{ htmlSnippet("html:end")|default("") }}
 </html>

theme/templates/site.html

@@ -1,6 +1,6 @@
 {% extends "layout.html" %}
 
-{% block htmlTag %}manifest="{{ basePath }}/manifest.appcache"{% endblock %}
+{% block htmlTag %}{% if options.cache !== false %}manifest="{{ basePath }}/manifest.appcache"{% endif %}{% endblock %}
 {% block title %}{{ progress.current.title }}{% parent %}{% endblock %}
 {% block content %}
     <div class="book" {% if githubId %}data-github="{{ githubId }}"{% endif %} data-level="{{ progress.current.level }}" data-basepath="{{ basePath }}" data-revision="{{ revision }}">
@@ -28,10 +28,10 @@
         </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>
+        <a href="{{ basePath }}/{{ progress.current.prev.path|mdLink }}" class="navigation navigation-prev {% if !progress.current.next or !progress.current.next.path %}navigation-unique{% endif %}" aria-label="Previous page: {{ progress.current.prev.title }}"><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>
+        <a href="{{ basePath }}/{{ progress.current.next.path|mdLink }}" class="navigation navigation-next {% if !progress.current.prev or !progress.current.prev.path %}navigation-unique{% endif %}" aria-label="Next page: {{ progress.current.next.title }}"><i class="fa fa-angle-right"></i></a>
         {% endif %}
     </div>
 </div>