Bump version to 0.7.1

Fixes potential race condition on copies

.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

.travis.yml

@@ -2,4 +2,3 @@ language: node_js
 node_js:
   - "0.11"
   - "0.10"
-  - "0.8"

CHANGES.md

@@ -0,0 +1,22 @@
+# Release notes
+
+## 0.7.1
+- Update `fs-extra` to `0.10.0` (fixes potential race conditions)
+
+## 0.7.0
+- Add page break in ebook (pdf, epub, mobi) between chapters/articles
+- Start using kramed instead of marked
+- Fix display of inline math
+- Switch to graceful-fs to fix EMFILE errors
+- Add sharing to weibo.com
+
+## 0.6.2
+- Support generating a plugin's book info dynamically
+- Improve navigation on dark theme
+- Improve path normalization when parsing SUMMARY.md
+
+## 0.6.0
+- Generate header id the same as github
+- Custom links can be added at top of sidebar
+- Summary can now be transformed by plugins
+- Support importing code snippets

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: {
@@ -16,8 +24,8 @@ module.exports = function (grunt) {
                     optimization: 2
                 },
                 files: {
-                    "theme/assets/style.css": "theme/stylesheets/main.less",
-                    "theme/assets/print.css": "theme/stylesheets/print.less"
+                    "theme/assets/style.css": "theme/stylesheets/website.less",
+                    "theme/assets/print.css": "theme/stylesheets/ebook.less"
                 }
             }
         },
@@ -31,11 +39,13 @@ module.exports = function (grunt) {
                     optimize: "uglify", //"uglify",
                     include: ["requireLib"],
                     paths: {
-                        "jQuery": 'vendors/jquery',
-                        "lodash": 'vendors/lodash',
-                        "requireLib": 'vendors/require',
-                        "Mousetrap": 'vendors/mousetrap',
-                        "lunr": path.join(__dirname, "node_modules/lunr/lunr")
+                        "jQuery": 'vendors/jquery/dist/jquery',
+                        "lodash": 'vendors/lodash/dist/lodash',
+                        "requireLib": 'vendors/requirejs/require',
+                        "Mousetrap": 'vendors/mousetrap/mousetrap',
+                        "lunr": 'vendors/lunr.js/lunr',
+                        "URI": 'vendors/URIjs/src/URI',
+                        "ace": 'vendors/ace-builds/src-noconflict/'
                     },
                     shim: {
                         'jQuery': {
@@ -56,8 +66,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. Here is an example: [Learn Javascript](https://www.gitbook.io/book/GitBookIO/javascript). You can publish book easily online using [gitbook.io](https://www.gitbook.io) and 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)
 
@@ -31,27 +31,37 @@ Options for commands `build` and `serve` are:
 
 ```
 -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
---config <config file>    Configuration file to use, defaults to book.json
+-f, --format <name>       Change generation format, defaults to site, availables are: site, page, ebook, json
+--config <config file>    Configuration file to use, defaults to book.js or book.json
 ```
 
-GitBook load the default configuration from a `book.json` file in the repository if it exists.
+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:
 
-```
+```js
 {
-    // Folders to use for output (caution: it override the value from the command line)
+    // Folders to use for output
+    // Caution: it overrides the value from the command line
+    // It's not advised this option in the book.json
     "output": null,
 
-    // Generator to use for building (caution: it override the value from the command line)
+    // Generator to use for building
+    // Caution: it overrides the value from the command line
+    // It's not advised this option in the book.json
     "generator": "site",
 
     // Book title and description (defaults are extracted from the README)
     "title": null,
     "description": null,
 
-    // GitHub informations (defaults are extracted using git)
+    // For ebook format, the extension to use for generation (default is detected from output extension)
+    // "epub", "pdf", "mobi"
+    // Caution: it overrides the value from the command line
+    // It's not advised this option in the book.json
+    "extension": null,
+
+    // GitHub information (defaults are extracted using git)
     "github": null,
     "githubHost": "https://github.com/",
 
@@ -59,7 +69,18 @@ Here are the options that can be stored in this file:
     "plugins": [],
 
     // Global configuration for plugins
-    "pluginsConfig": {},
+    "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": {
@@ -69,7 +90,12 @@ Here are the options that can be stored in this file:
         // Links in top of sidebar
         "about": null,
         "issues": null,
-        "edit": null,
+        "contribute": null,
+
+    	// Custom links at top of sidebar
+    	"custom": {
+    	    "Custom link name": "https://customlink.com"
+    	},
 
         // Sharing links
         "sharing": {
@@ -77,6 +103,32 @@ Here are the options that can be stored in this file:
             "facebook": null,
             "twitter": null
         }
+    },
+
+
+    // Options for PDF generation
+    "pdf": {
+        // Add toc at the end of the file
+        "toc": true,
+
+        // Add page numbers to the bottom of every page
+        "pageNumbers": false,
+
+        // Font size for the fiel content
+        "fontSize": 12,
+
+        // Paper size for the pdf
+        // Choices are [u’a0’, u’a1’, u’a2’, u’a3’, u’a4’, u’a5’, u’a6’, u’b0’, u’b1’, u’b2’, u’b3’, u’b4’, u’b5’, u’b6’, u’legal’, u’letter’]
+        "paperSize": "a4",
+
+        // Margin (in pts)
+        // Note: 72 pts equals 1 inch
+        "margin": {
+            "right": 62,
+            "left": 62,
+            "top": 36,
+            "bottom": 36
+        }
     }
 }
 ```
@@ -87,19 +139,18 @@ 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.
-* **PDF**: A complete PDF book with exercise solutions at the end of the book. Generate to this format using: ```gitbook pdf ./myrepo```, you need to have [gitbook-pdf](https://github.com/GitbookIO/gitbook-pdf) installed.
-* **eBook**: A complete eBook with exercise solutions at the end of the book. Generate to this format using: ```gitbook ebook ./myrepo```, you need to have [ebook-convert](http://manual.calibre-ebook.com/cli/ebook-convert.html) installed.
-* **Single Page**: The book will be stored in a single printable HTML page, this format is used for conversion to PDF or eBook. Generate to this format using: ```gitbook build ./myrepo -f page```.
-* **JSON**: This format is used for debugging or extracting metadata from a book. Generate to this format using: ```gitbook build ./myrepo -f json```.
+* **Static Website**: This is the default format. It generates a complete interactive static website that can be, for example, hosted on GitHub Pages.
+* **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. The output format could be **PDF**, **ePub** or **MOBI**.
+* **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 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
 
@@ -119,11 +170,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:
 
@@ -132,7 +183,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).
 
     ---
 
@@ -174,11 +225,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's functionality. Read [GitbookIO/plugin](https://github.com/GitbookIO/plugin) for more information 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:
 
@@ -189,8 +251,21 @@ Plugins can used to extend your book's functionality. Read [GitbookIO/plugin](ht
 
 * [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
+* [Autocover](https://github.com/GitbookIO/plugin-autocover): Generate a cover for your book
 * [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 blockin the browser inspector's console
+* [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
+* [Piwik Open Analytics](https://github.com/emmanuel-keller/gitbook-plugin-piwik): Piwik Open Analytics tracking for your book
+* [Heading Anchors](https://github.com/rlmv/gitbook-plugin-anchors): Add linkable Github-style anchors to headings
+* [JSBin](https://github.com/jcouyang/gitbook-plugin-jsbin): Ebedded jsbin frame into your book
+
+#### Debugging
+
+You can use the environment variable `DEBUG=true` to get better error messages (with stack trace). For example:
+
+```
+$ export DEBUG=true
+$ gitbook build ./
+```

bin/build.js

@@ -10,17 +10,28 @@ var generators = require("../lib/generate").generators;
 
 var buildCommand = function(command) {
     return command
+    .option('-v, --verbose', 'Activate verbose mode, useful for debugging errors')
     .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('--config <config file>', 'Configuration file to use, defualt to book.json')
+    .option('--config <config file>', 'Configuration file to use, defaults to book.js or book.json');
 };
 
 
+var buildEbookCommand = function(command) {
+    return buildCommand(command)
+    .option('-c, --cover <path>', 'Cover image, default is cover.jpg if exists');
+};
+
 var makeBuildFunc = function(converter) {
     return  function(dir, options) {
         dir = dir || process.cwd();
         outputDir = options.output;
 
+        // Set debugging
+        if(options.verbose) {
+            process.env.DEBUG = "true";
+        }
+
         console.log('Starting build ...');
         return converter(
             _.extend({}, options || {}, {
@@ -31,14 +42,22 @@ var makeBuildFunc = function(converter) {
             })
         )
         .then(function(output) {
-            console.log("Successfuly built !");
+            console.log("Successfully built!");
             return output;
-        }, utils.logError);
-    };   
+        })
+        .fail(function(err) {
+            // Log error
+            utils.logError(err);
+
+            // Exit process with failure code
+            process.exit(-1);
+        });
+    };
 };
 
 module.exports = {
     folder: makeBuildFunc(generate.folder),
     file: makeBuildFunc(generate.file),
-    command: buildCommand
+    command: buildCommand,
+    commandEbook: buildEbookCommand
 };

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;
@@ -13,6 +14,7 @@ var fs = require('../lib/generate/fs');
 var utils = require('./utils');
 var build = require('./build');
 var Server = require('./server');
+var platform = require("./platform");
 
 // General options
 prog
@@ -29,12 +31,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,9 +57,16 @@ 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) {
+                    // set livereload path
+                    lrPath = filepath;
                     console.log("Restart after change in files");
                     console.log('');
                     return generate();
@@ -60,24 +81,29 @@ build.command(prog.command('serve [source_dir]'))
     generate();
 });
 
-build.command(prog.command('pdf [source_dir]'))
+build.commandEbook(prog.command('pdf [source_dir]'))
 .description('Build a gitbook as a PDF')
-.option('-pf, --paperformat <format>', 'PDF paper format (default is A4): "5in*7.5in", "10cm*20cm", "A4", "Letter"')
 .action(function(dir, options) {
     build.file(dir, _.extend(options, {
         extension: "pdf",
-        format: "pdf"
+        format: "ebook"
     }));
 });
 
-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')
+build.commandEbook(prog.command('epub [source_dir]'))
+.description('Build a gitbook as a ePub book')
 .action(function(dir, options) {
-    var ext = options.output ? path.extname(options.output) : "epub";
-
     build.file(dir, _.extend(options, {
-        extension: ext,
+        extension: "epub",
+        format: "ebook"
+    }));
+});
+
+build.commandEbook(prog.command('mobi [source_dir]'))
+.description('Build a gitbook as a Mobi book')
+.action(function(dir, options) {
+    build.file(dir, _.extend(options, {
+        extension: "mobi",
         format: "ebook"
     }));
 });
@@ -90,6 +116,22 @@ prog
     return initDir(dir);
 });
 
+prog
+.command('publish [source_dir]')
+.description('Publish content to the associated gitbook.io book')
+.action(function(dir) {
+    dir = dir || process.cwd();
+    return platform.publish(dir);
+});
+
+prog
+.command('git:remote [source_dir] [book_id]')
+.description('Adds a git remote to a book repository')
+.action(function(dir, bookId) {
+    dir = dir || process.cwd();
+    return platform.remote(dir, bookId);
+});
+
 // Parse and fallback to help if no args
 if(_.isEmpty(prog.parse(process.argv).args) && process.argv.length === 2) {
     prog.help();

bin/platform.js

@@ -0,0 +1,53 @@
+var Q = require("q");
+var utils = require("./utils");
+
+var publish = function(folder) {
+    if (!folder) {
+        console.log("Need a repository folder");
+        return process.exit(-1);
+    }
+
+    utils.gitCmd("push", ["gitbook", "master"])
+    .then(function(out) {
+        console.log(out.stdout);
+    }, function(err) {
+        if (err.code == 128) {
+            console.log("No book on gitbook.io is configured with this git repository.");
+            console.log("Run 'gitbook git:remote username/book' to intialize this repository.");
+        } else {
+            console.log(err.message);
+        }
+        process.exit(-1);
+    });
+};
+
+var remote = function(folder, bookId) {
+    if (!folder || !bookId) {
+        console.log("Need a repository folder and a book id");
+        return process.exit(-1);
+    }
+
+    var url = "https://push.gitbook.io/"+bookId+".git";
+    var addRemote = function() {
+        return utils.gitCmd("remote", ["add", "gitbook", url]);
+    }
+
+    addRemote()
+    .fail(function(err) {
+        if (err.code == 128) {
+            return utils.gitCmd("remote", ["rm", "gitbook"]).then(addRemote);
+        }
+        return Q.reject(err);
+    })
+    .then(function(out) {
+        console.log("Book remote '"+url+"' added to the folder");
+    }, function(err) {
+        console.log(err.message);
+        process.exit(-1);
+    });
+};
+
+module.exports = {
+    publish: publish,
+    remote: remote
+};

bin/utils.js

@@ -1,6 +1,7 @@
 var Q = require('q');
 var _ = require('lodash');
 
+var exec = require('child_process').exec;
 var http = require('http');
 var send = require('send');
 
@@ -30,13 +31,36 @@ 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);
 };
 
+function runGitCommand(command, args) {
+    var d = Q.defer(), child;
+    args = ["git", command].concat(args).join(" ");
+
+    child = exec(args, function (error, stdout, stderr) {
+        if (error !== null) {
+            error.stdout = stdout;
+            error.stderr = stderr;
+            d.reject(error);
+        } else {
+            d.resolve({
+                stdout: stdout,
+                stderr: stderr
+            })
+        }
+    });
+
+    return d.promise;
+};
+
 
 // Exports
 module.exports = {
     watch: watch,
-    logError: logError
+    logError: logError,
+    gitCmd: runGitCommand
 };

bower.json

@@ -0,0 +1,13 @@
+{
+    "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",
+        "ace-builds": "1.1.3"
+    }
+}

lib/generate/ebook/index.js

@@ -4,9 +4,10 @@ var Q = require("q");
 var _ = require("lodash");
 var exec = require('child_process').exec;
 
-var fs = require("fs");
+var fs = require('graceful-fs');
 var parse = require("../../parse");
 var BaseGenerator = require("../page");
+var stringUtils = require("../../utils/string");
 
 /*
  *  This generator inherits from the single page generator
@@ -14,15 +15,6 @@ var BaseGenerator = require("../page");
  */
 var Generator = function() {
     BaseGenerator.apply(this, arguments);
-
-    // Options for eBook generation
-    this.options = _.defaults(this.options, {
-        extension: "epub"
-    });
-
-    if (!this.options.cover && fs.existsSync(path.join(this.options.input, "cover.png"))) {
-        this.options.cover = path.join(this.options.input, "cover.png")
-    }
 };
 util.inherits(Generator, BaseGenerator);
 
@@ -32,23 +24,57 @@ Generator.prototype.finish = function() {
     return BaseGenerator.prototype.finish.apply(this)
     .then(function() {
         var d = Q.defer();
+        var format = that.options.extension || path.extname(that.options.output).replace("\.", "") || "pdf";
+
+        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
+            "--cover": that.options.cover,
+            "--title": that.options.title,
+            "--comments": that.options.description,
+            "--authors": that.options.author,
+            "--chapter": "descendant-or-self::*[contains(concat(' ', normalize-space(@class), ' '), ' book-chapter ')]",
+            "--chapter-mark": "pagebreak",
+            "--level1-toc": "descendant-or-self::*[contains(concat(' ', normalize-space(@class), ' '), ' book-chapter-1 ')]",
+            "--level2-toc": "descendant-or-self::*[contains(concat(' ', normalize-space(@class), ' '), ' book-chapter-2 ')]",
+            "--level3-toc": "descendant-or-self::*[contains(concat(' ', normalize-space(@class), ' '), ' book-chapter-3 ')]",
+            "--no-chapters-in-toc": true
         };
 
+        if (format == "pdf") {
+            var pdfOptions = _.defaults(that.options.pdf || {}, {
+                "fontSize": 12,
+                "toc": true,
+                "pageNumbers": false,
+                "paperSize": "a4",
+                "margin": {
+                    "right": 62,
+                    "left": 62,
+                    "top": 36,
+                    "bottom": 36
+                }
+            });
+
+            _.extend(_options, {
+                "--margin-left": String(pdfOptions.margin.left),
+                "--margin-right": String(pdfOptions.margin.right),
+                "--margin-top": String(pdfOptions.margin.top),
+                "--margin-bottom": String(pdfOptions.margin.bottom),
+                "--pdf-add-toc": Boolean(pdfOptions.toc),
+                "--pdf-default-font-size": String(pdfOptions.fontSize),
+                "--pdf-mono-font-size": String(pdfOptions.fontSize),
+                "--paper-size": String(pdfOptions.paperSize),
+                "--pdf-page-numbers": Boolean(pdfOptions.pageNumbers)
+            });
+        }
+
         var command = [
             "ebook-convert",
             path.join(that.options.output, "index.html"),
-            path.join(that.options.output, "index."+that.options.extension),
-            _.chain(_options)
-            .map(function(value, key) {
-                if (value == null) return null;
-                return key+"="+value;
-            })
-            .compact()
-            .value()
-            .join(" ")
+            path.join(that.options.output, "index."+format),
+            stringUtils.optionsToShellArgs(_options)
         ].join(" ");
 
         exec(command, function (error, stdout, stderr) {

lib/generate/fs.js

@@ -1,5 +1,5 @@
 var Q = require("q");
-var fs = require("fs");
+var fs = require('graceful-fs');
 var fsExtra = require("fs-extra");
 var Ignore = require("fstream-ignore");
 
@@ -16,9 +16,25 @@ var getFiles = function(path) {
 
     // Add extra rules to ignore common folders
     ig.addIgnoreRules([
+        // Skip Git stuff
         '.git/',
         '.gitignore',
-        '.DS_Store'
+
+        // Skip OS X meta data
+        '.DS_Store',
+
+        // Skip stuff installed by plugins
+        'node_modules',
+
+        // Skip book outputs
+        '*.pdf',
+        '*.epub',
+        '*.mobi',
+
+        // Skip config files
+        '.ignore',
+        '.bookignore',
+        'book.json',
     ], '__custom_stuff');
 
     // Push each file to our list

lib/generate/generator.js

@@ -9,17 +9,18 @@ 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, data) {
-    return this.plugins.hook(name, this, data);
+    return this.plugins.hook(name, data);
 };
 
 BaseGenerator.prototype.loadPlugins = function() {
     var that = this;
 
-    return Plugin.fromList(this.options.plugins, this.options.input)
+    return Plugin.fromList(this.options.plugins, this.options.input, this)
     .then(function(_plugins) {
         that.plugins = _plugins;
 
@@ -44,6 +45,27 @@ BaseGenerator.prototype.transferFolder = function(input) {
     );
 };
 
+BaseGenerator.prototype.copyCover = function() {
+    var that = this;
+
+    return Q.all([
+        fs.copy(path.join(this.options.input, "cover.jpg"), path.join(this.options.output, "cover.jpg")),
+        fs.copy(path.join(this.options.input, "cover_small.jpg"), path.join(this.options.output, "cover_small.jpg"))
+    ])
+    .fail(function() {
+        // If orignally from multi-lang, try copy from originalInput
+        if (!that.options.originalInput) return;
+
+        return Q.all([
+            fs.copy(path.join(that.options.originalInput, "cover.jpg"), path.join(that.options.output, "cover.jpg")),
+            fs.copy(path.join(that.options.originalInput, "cover_small.jpg"), path.join(that.options.output, "cover_small.jpg"))
+        ]);
+    })
+    .fail(function(err) {
+        return Q();
+    });
+};
+
 BaseGenerator.prototype.langsIndex = function(langs) {
     return Q.reject(new Error("Langs index is not supported in this generator"));
 };

lib/generate/index.js

@@ -1,9 +1,9 @@
 var Q = require("q");
 var _ = require("lodash");
 var path = require("path");
-var swig = require('swig');
 var tmp = require('tmp');
 
+var swig = require('./template');
 var fs = require("./fs");
 var parse = require("../parse");
 var Plugin = require("./plugin");
@@ -11,28 +11,50 @@ var Plugin = require("./plugin");
 var generators = {
     "site": require("./site"),
     "page": require("./page"),
-    "pdf": require("./pdf"),
     "ebook": require("./ebook"),
     "json": require("./json")
 };
 
 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);
+};
+
+// TEst if generator exists
+var checkGenerator = function(options) {
+    if (!generators[options.generator]) {
+        return Q.reject(new Error("Invalid generator (availables are: "+_.keys(generators).join(", ")+")"));
+    }
+    return Q();
+};
+
+// Create the generator and load plugins
+var loadGenerator = function(options) {
+    return checkGenerator(options)
+    .then(function() {
+        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,
         "output": null,
 
         // Config file (relative to input)
-        "configFile": "book.json",
+        "configFile": "book",
 
         // Output generator
         "generator": "site",
@@ -51,43 +73,169 @@ var generate = function(options) {
         // Plugins
         "plugins": [],
         "pluginsConfig": {},
+        "defaultsPlugins": [], // Default plugins that can't be set in book.json
 
         // Links
         "links": {
-            "about": null
+            "about": null,
+            "issues": null,
+            "contribue": null,
         }
     });
 
+    // Validate options
     if (!options.input) {
         return Q.reject(new Error("Need option input (book input directory)"));
     }
 
-    if (!generators[options.generator]) {
-        return Q.reject(new Error("Invalid generator (availables are: "+_.keys(generators).join(", ")));
-    }
-
-    options.output = options.output || path.join(options.input, "_book");
-
-    // Clean output folder
-    return fs.remove(options.output)
+    // Check files to get folder type (book, multilanguage book or neither)
+    return checkGenerator(options)
 
     // 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');
+        try {
+            var _config = require(path.resolve(options.input, options.configFile));
 
-            _.extend(options, _config);
-        }, function() {
+            _.extend(options, _.omit(_config, 'input', 'configFile', 'defaultsPlugins'));
+        }
+        catch(err) {
             // 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");
+
+    return checkGenerator(options)
+
+    // Multi-languages book
+    .then(function() {
+        return fs.readFile(path.join(options.input, "LANGS.md"), "utf-8")
+    })
+
+    // Clean output folder
+    .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),
+                    originalInput: options.input,
+                    originalOutput: options.output
+                }));
+            })
+        }, Q());
+    })
+
+    .then(function() {
+        return loadGenerator(options);
+    })
+
+    // Generate languages index
+    .then(function(generator) {
+        return generator.langsIndex(options.langsSummary);
+    })
+
+    // Copy cover file
+    .then(function() {
+        return Q.all([
+            fs.copy(path.join(options.input, "cover.jpg"), path.join(options.output, "cover.jpg")),
+            fs.copy(path.join(options.input, "cover_small.jpg"), path.join(options.output, "cover_small.jpg"))
+        ])
+        .fail(function() {
+            return Q();
         })
     })
 
+    // 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
+            options.github = (
+                // Support URLs in "github" entry of book.json
+                parse.git.githubID(options.github) ||
+
+                // Fallback
+                options.github
+            );
+            return;
+        }
+
+        // Try auto detecting
         return parse.git.url(options.input)
         .then(function(_url) {
             // Get ID of repo
@@ -96,7 +244,7 @@ var generate = function(options) {
             return null;
         })
         .then(function(repoId) {
-            options.github = options.github || repoId;
+            options.github = repoId;
         });
     })
 
@@ -109,108 +257,85 @@ var generate = function(options) {
         return fs.list(options.input)
         .then(function(_files) {
             files = _files;
-        })
+        });
     })
 
-    // Create the generator and load plugins
     .then(function() {
-        generator = new generators[options.generator](options);
-        return generator.loadPlugins();
+        return loadGenerator(options);
     })
 
-    // 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")
+    // Convert files
+    .then(function(generator) {
+        // Generate the book
+        return Q()
 
-            // Generate sub-books
-            .then(function(_langsSummary) {
-                options.langsSummary = parse.langs(_langsSummary);
+        // Get summary
+        .then(function() {
+            var summary = {
+                path: path.join(options.input, "SUMMARY.md")
+            };
 
-                // 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
-            .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;
-                });
-            })
-
-            // Get summary
-            .then(function() {
-                return fs.readFile(path.join(options.input, "SUMMARY.md"), "utf-8")
+            var _callHook = function(name) {
+                return generator.callHook(name, summary)
                 .then(function(_summary) {
-                    options.summary = parse.summary(_summary);
+                    summary = _summary;
+                    return summary;
+                });
+            };
 
-                    // Parse navigation
+            return fs.readFile(summary.path, "utf-8")
+                .then(function(_content) {
+                    summary.content = _content;
+                    return _callHook("summary:before");
+                })
+                .then(function() {
+                    summary.content = parse.summary(summary.content);
+                    return _callHook("summary:after");
+                })
+                .then(function() {
+                    options.summary = summary.content;
                     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()
+        // Skip processing some files
+        .then(function() {
+            files = _.filter(files, function (file) {
+                return !(
+                    file === 'SUMMARY.md'
                 );
-            })
-
-            // Finish generation
-            .then(function() {
-                return generator.finish();
-            })
-            .then(function() {
-                return generator.callHook("finish");
             });
-        }
+        })
+
+        // 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
@@ -281,5 +406,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/page/index.js

@@ -2,22 +2,12 @@ var _ = require("lodash");
 var util = require("util");
 var path = require("path");
 var Q = require("q");
-var swig = require('swig');
-var hljs = require('highlight.js');
+var swig = require("../template");
 
 var fs = require("../fs");
 var parse = require("../../parse");
 var BaseGenerator = require("../site");
 
-// Swig filter: highlight coloration
-swig.setFilter('code', function(code, lang) {
-    try {
-        return hljs.highlight(lang, code).value;
-    } catch(e) {
-        return hljs.highlightAuto(code).value;
-    }
-});
-
 
 /*
  *  This generator will generate a simple index.html which can be converted as a PDF
@@ -61,22 +51,35 @@ Generator.prototype.convertFile = function(content, input) {
     });
 };
 
+// Generate languages index
+Generator.prototype.langsIndex = function(langs) {
+    return Q();
+};
+
 Generator.prototype.finish = function() {
     var that = this;
     var basePath = ".";
     var output = path.join(this.options.output, "index.html");
 
+    var progress = parse.progress(this.options.navigation, "README.md");
+
     return Q()
     // Generate html
     .then(function(pages) {
         return that._writeTemplate(that.template, {
             pages: that.pages,
+            progress: progress,
 
             basePath: basePath,
             staticBase: path.join(basePath, "gitbook"),
         }, output);
     })
 
+    // Copy cover
+    .then(function() {
+        return that.copyCover();
+    })
+
     // Copy assets
     .then(function() {
         return fs.copy(

lib/generate/pdf/index.js

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

lib/generate/plugin.js

@@ -10,11 +10,15 @@ var pkg = require("../../package.json");
 
 var  RESOURCES = ["js", "css"];
 
-var Plugin = function(name, root) {
+var Plugin = function(name, root, generator) {
     this.name = name;
     this.root = root;
     this.packageInfos = {};
     this.infos = {};
+    this.generator = generator;
+
+    // Bind methods
+    _.bindAll(this);
 
     _.each([
         "gitbook-plugin-"+name,
@@ -43,28 +47,67 @@ Plugin.prototype.load = function(name, baseDir) {
     }
 };
 
-// Return resources
-Plugin.prototype.getResources = function(resource) {
-    if (!this.infos.book || !this.infos.book[resource]) {
-        return [];
+Plugin.prototype.normalizeResource = function(resource) {
+    // Parse the resource path
+    var parsed = url.parse(resource);
+
+    // This is a remote resource
+    // so we will simply link to using it's URL
+    if (parsed.protocol) {
+        return {
+            "url": resource
+        };
     }
-    return _.chain(this.infos.book[resource])
-    .map(function(resource) {
-        var parsed = url.parse(resource);
-        if (parsed.protocol) return {"url": resource}
-        else return { "path": this.name+"/"+resource };
-    }.bind(this))
-    .value();
+
+    // This will be copied over from disk
+    // and shipped with the book's build
+    return { "path": this.name+"/"+resource };
+};
+
+// Return resources
+Plugin.prototype._getResources = function() {
+    var book = this.infos.book;
+
+    // Nothing specified, fallback to default
+    if (!book) {
+        return Q({});
+    }
+
+    // Dynamic function
+    if(typeof book === "function") {
+        // Call giving it the context of our generator
+        return Q().then(book.bind(this.generator));
+    }
+
+    // Plain data object
+    return Q(_.cloneDeep(book));
+};
+
+// Normalize resources and return them
+Plugin.prototype.getResources = function() {
+    var that = this;
+
+
+
+    return this._getResources()
+    .then(function(resources) {
+
+        _.each(RESOURCES, function(resourceType) {
+            resources[resourceType] = (resources[resourceType] || []).map(that.normalizeResource);
+        });
+
+        return resources;
+    });
 };
 
 // Test if it's a valid plugin
 Plugin.prototype.isValid = function() {
     return (
-        this.packageInfos
-        && this.packageInfos.name
-        && this.packageInfos.engines
-        && this.packageInfos.engines.gitbook
-        && semver.satisfies(pkg.version, this.packageInfos.engines.gitbook)
+        this.packageInfos &&
+        this.packageInfos.name &&
+        this.packageInfos.engines &&
+        this.packageInfos.engines.gitbook &&
+        semver.satisfies(pkg.version, this.packageInfos.engines.gitbook)
     );
 };
 
@@ -74,7 +117,10 @@ Plugin.prototype.resolveFile = function(filename) {
 };
 
 // Resolve file path
-Plugin.prototype.callHook = function(name, context, data) {
+Plugin.prototype.callHook = function(name, data) {
+    // Our generator will be the context to apply
+    var context = this.generator;
+
     var hookFunc = this.infos.hooks? this.infos.hooks[name] : null;
     data = data || {};
 
@@ -86,18 +132,20 @@ Plugin.prototype.callHook = function(name, 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.hasAssets()) return Q();
-    return fs.copy(
-        this.resolveFile(this.infos.book.assets),
-        out
-    );
+    var that = this;
+
+    return this.getResources().get('assets')
+    .then(function(assets) {
+        // Assets are undefined
+        if(!assets) return false;
+
+        return fs.copy(
+            that.resolveFile(assets),
+            out
+        ).then(_.constant(true));
+    }, _.constant(false));
 };
 
 
@@ -114,7 +162,7 @@ Plugin.normalizeNames = function(names) {
         return name.length > 0 && name[0] == "-";
     })
     .map(function(name) {
-        return name.slice(1)
+        return name.slice(1);
     })
     .value();
 
@@ -133,60 +181,99 @@ Plugin.normalizeNames = function(names) {
 };
 
 // Extract data from a list of plugin
-Plugin.fromList = function(names, root) {
+Plugin.fromList = function(names, root, generator) {
     var failed = [];
 
     // Load plugins
     var plugins = _.map(names, function(name) {
-        var plugin = new Plugin(name, root);
+        var plugin = new Plugin(name, root, generator);
         if (!plugin.isValid()) failed.push(name);
         return plugin;
     });
 
     if (_.size(failed) > 0) return Q.reject(new Error("Error loading plugins: "+failed.join(",")));
 
-    // Get all resources
-    var resources = _.chain(RESOURCES)
-    .map(function(resource) {
-        return [
-            resource,
-            _.chain(plugins)
-            .map(function(plugin) {
-                return plugin.getResources(resource);
-            })
-            .flatten()
-            .value()
-        ];
-    })
-    .object()
-    .value();
+    // The raw resources extracted from each plugin
+    var pluginResources;
 
-    return Q({
-        'list': plugins,
-        'resources': resources,
-        'hook': function(name, context, data) {
-            return _.reduce(plugins, function(prev, plugin) {
-                return prev.then(function(ret) {
-                    return plugin.callHook(name, context, ret);
-                })
-            }, Q(data));
-        },
-        'template': function(name) {
-            var withTpl = _.find(plugins, function(plugin) {
-                return (plugin.infos.templates
-                    && plugin.infos.templates[name]);
+    // Get resources of plugins
+    return Q.all(_.map(plugins, function(plugin) {
+        return plugin.getResources();
+    }))
+    // Extract resources out
+    // css, js, etc ...
+    .then(function(resources) {
+        pluginResources = resources;
+        // Group by resource types
+        return _.chain(RESOURCES)
+        .map(function(resourceType) {
+            // Get resources from all the plugins for this current type
+            return [
+                // Key
+                resourceType,
+                // Value
+                _.chain(resources)
+                .pluck(resourceType)
+                .compact()
+                .flatten()
+                .value()
+            ];
+        })
+        .object()
+        .value();
+    })
+    // Extract html snippets
+    .then(function(resources) {
+        // Map of html resources by name added by each plugin
+        resources.html = pluginResources.reduce(function(accu, resource) {
+            var html = (resource && resource.html) || {};
+            _.each(html, function(code, key) {
+                // Turn into function if not one already
+                if (!_.isFunction(code)) code = _.constant(code);
+                // Append
+                accu[key] = (accu[key] || []).concat([code]);
             });
 
-            if (!withTpl) return null;
-            return withTpl.resolveFile(withTpl.infos.templates[name]);
-        }
+            return accu;
+        }, {});
+
+        return resources;
+    })
+    // Return big multi-plugin object
+    .then(function(resources) {
+        return {
+            'list': plugins,
+            'resources': resources,
+            'hook': function(name, data) {
+                return _.reduce(plugins, function(prev, plugin) {
+                    return prev.then(function(ret) {
+                        return plugin.callHook(name, ret);
+                    });
+                }, Q(data));
+            },
+            'template': function(name) {
+                var withTpl = _.find(plugins, function(plugin) {
+                    return (
+                        plugin.infos.templates &&
+                        plugin.infos.templates[name]
+                    );
+                });
+
+                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");
+            }
+        };
     });
 };
 
 // Default plugins
 Plugin.defaults = [
-    "mixpanel",
     "mathjax"
 ];
 
-module.exports = Plugin;
+module.exports = Plugin;

lib/generate/site/index.js

@@ -2,26 +2,16 @@ var util = require("util");
 var path = require("path");
 var Q = require("q");
 var _ = require("lodash");
-var swig = require('swig');
+var swig = require("../template");
 
 var fs = require("../fs");
 var parse = require("../../parse");
 var BaseGenerator = require("../generator");
-
+var links = require("../../utils/links");
 var indexer = require('./search_indexer');
 var Manifest = require('../manifest');
 
-// Swig filter for returning the count of lines in a code section
-swig.setFilter('lines', function(content) {
-    return content.split('\n').length;
-});
 
-// Swig filter for returning a link to the associated html file of a markdown file
-swig.setFilter('mdLink', function(link) {
-    var link = link.replace(".md", ".html");
-    if (link == "README.html") link = "index.html";
-    return link;
-});
 
 var Generator = function() {
     BaseGenerator.apply(this, arguments);
@@ -63,7 +53,6 @@ Generator.prototype._writeTemplate = function(tpl, options, output, interpolate)
     var that = this;
 
     interpolate = interpolate || _.identity;
-
     return Q()
     .then(function(sections) {
         return tpl(_.extend({
@@ -81,6 +70,7 @@ Generator.prototype._writeTemplate = function(tpl, options, output, interpolate)
 
             plugins: that.plugins,
             pluginsConfig: JSON.stringify(that.options.pluginsConfig),
+            htmlSnippet: _.partialRight(that.plugins.html, that, options),
 
             options: that.options
         }, options));
@@ -112,6 +102,7 @@ Generator.prototype.convertFile = function(content, _input) {
 
     var page = {
         path: _input,
+	rawPath: input, // path to raw md file
         content: content,
         progress: parse.progress(this.options.navigation, _input)
     };
@@ -162,7 +153,7 @@ Generator.prototype.convertFile = function(content, _input) {
             content: page.sections,
 
             basePath: basePath,
-            staticBase: path.join(basePath, "gitbook"),
+            staticBase: links.join(basePath, "gitbook"),
         }, output, function(html) {
             page.content = html;
 
@@ -198,7 +189,7 @@ Generator.prototype.copyAssets = function() {
         path.join(that.options.output, "gitbook")
     )
 
-    // Add to cach manifest
+    // Add to cache manifest
     .then(function() {
         return that.manifest.addFolder(path.join(that.options.output, "gitbook"), "gitbook");
     })
@@ -207,16 +198,16 @@ Generator.prototype.copyAssets = function() {
     .then(function() {
         return Q.all(
             _.map(that.plugins.list, function(plugin) {
-                if (!plugin.hasAssets()) return Q();
-
                 var pluginAssets = path.join(that.options.output, "gitbook/plugins/", plugin.name);
                 return plugin.copyAssets(pluginAssets)
-                .then(function() {
+                .then(function(copiedStuff) {
+                    // Nothing was copied
+                    if(!copiedStuff) { return; }
                     return that.manifest.addFolder(pluginAssets, "gitbook/plugins/"+plugin.name);
                 });
             })
         );
-    })
+    });
 };
 
 // Dump search index to disk
@@ -237,9 +228,15 @@ Generator.prototype.writeCacheManifest = function() {
 };
 
 Generator.prototype.finish = function() {
-    return this.copyAssets()
-    .then(this.writeSearchIndex)
-    .then(this.writeCacheManifest);
+    var deferred = this.copyAssets()
+    .then(this.copyCover)
+    .then(this.writeSearchIndex);
+
+    if (this.options.cache !== false) {
+        deferred = deferred.then(this.writeCacheManifest);
+    }
+
+    return deferred;
 };
 
 module.exports = Generator;

lib/generate/site/search_indexer.js

@@ -2,7 +2,7 @@ var Q = require("q");
 var _ = require("lodash");
 
 var lunr = require('lunr');
-var marked = require('marked');
+var kramed = require('kramed');
 var textRenderer = require('marked-text-renderer');
 
 
@@ -28,14 +28,14 @@ Indexer.prototype.text = function(nodes) {
     // Copy section
     var section = _.toArray(nodes);
 
-    // marked's Render expects this, we don't use it yet
+    // kramed's Render expects this, we don't use it yet
     section.links = {};
 
-    var options = _.extend({}, marked.defaults, {
+    var options = _.extend({}, kramed.defaults, {
         renderer: this.renderer
     });
 
-    return marked.parser(section, options);
+    return kramed.parser(section, options);
 };
 
 Indexer.prototype.addSection = function(path, section) {

lib/generate/template.js

@@ -0,0 +1,52 @@
+var path = require("path");
+var swig = require('swig');
+var hljs = require('highlight.js');
+
+var links = require('../utils/').links;
+var pkg = require('../../package.json');
+
+swig.setDefaults({
+    locals: {
+        gitbook: {
+            version: pkg.version
+        }
+    }
+});
+
+// Swig filter for returning the count of lines in a code section
+swig.setFilter('lines', function(content) {
+    return content.split('\n').length;
+});
+
+// Swig filter for returning a link to the associated html file of a markdown file
+swig.setFilter('mdLink', function(link) {
+    var link = link.replace(".md", ".html");
+    if (link == "README.html") link = "index.html";
+    return link;
+});
+
+// Swig filter: highlight coloration
+swig.setFilter('code', function(code, lang) {
+    try {
+        return hljs.highlight(lang, code).value;
+    } catch(e) {
+        return hljs.highlightAuto(code).value;
+    }
+});
+
+// Convert a level into a deep level
+swig.setFilter('lvl', function(lvl) {
+    return lvl.split(".").length;
+});
+
+// Join path
+swig.setFilter('pathJoin', function(base, _path) {
+    return path.join(base, _path);
+});
+
+// Is a link an absolute link
+swig.setFilter('isExternalLink', function(link) {
+    return links.isExternal(link);
+});
+
+module.exports = swig;

lib/parse/code_include.js

@@ -0,0 +1,20 @@
+var fs = require('graceful-fs');
+var path = require('path');
+
+module.exports = function(code, folder) {
+    folder = folder || '';
+
+    return code.replace(/{{([\s\S]+?)}}/g, function(match, filename) {
+        // Normalize filename
+        var fname = path.join(folder, filename.trim());
+
+        // Try including snippet from FS
+        try {
+            // Trim trailing newlines/space of imported snippets
+            return fs.readFileSync(fname, 'utf8').trimRight();
+        } catch(err) {}
+
+        // If fails leave content as is
+        return match;
+    });
+};

lib/parse/git.js

@@ -28,7 +28,7 @@ function gitURL(path) {
 // 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;
+    var sliceEnd = _url.slice(-4) === '.git' ? -4 : undefined;
 
     // Detect HTTPS repos
     var parsed = url.parse(_url);

lib/parse/langs.js

@@ -1,13 +1,14 @@
-var _ = require("lodash")
-var parseSummary = require("./summary");
+var _ = require("lodash");
+var parseEntries = require("./summary").entries;
+
 
 var parseLangs = function(content) {
-    var summary = parseSummary(content);
+    var entries = parseEntries(content);
 
     return {
-        list: _.chain(summary.chapters)
+        list: _.chain(entries)
             .filter(function(entry) {
-                return entry.path != null;
+                return Boolean(entry.path);
             })
             .map(function(entry) {
                 return {
@@ -17,7 +18,8 @@ var parseLangs = function(content) {
                 };
             })
             .value()
-    }
+    };
 };
 
+
 module.exports = parseLangs;

lib/parse/lex.js

@@ -1,5 +1,5 @@
 var _ = require('lodash');
-var marked = require('marked');
+var kramed = require('kramed');
 
 // Split a page up into sections (lesson, exercises, ...)
 function splitSections(nodes) {
@@ -88,7 +88,7 @@ function sectionId(section, idx) {
 
 function lexPage(src) {
     // Lex file
-    var nodes = marked.lexer(src);
+    var nodes = kramed.lexer(src);
 
     return _.chain(splitSections(nodes))
     .map(function(section, idx) {
@@ -118,6 +118,10 @@ function lexPage(src) {
 
         return sections;
     }, [])
+    .map(function(section) {
+        section.links = nodes.links;
+        return section;
+    })
     .value();
 }
 

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)));
     }, []);
 }
 
@@ -26,15 +26,9 @@ function navigation(summary, files) {
     // Support single files as well as list
     files = _.isArray(files) ? files : (_.isString(files) ? [files] : null);
 
-    // Special README nav
-    var README_NAV = {
-        path: 'README.md',
-        title: 'Introduction',
-        level: '0',
-    };
-
     // List of all navNodes
-    var navNodes = [README_NAV].concat(flattenChapters(summary.chapters));
+    // Flatten chapters, then add in default README node if ndeeded etc ...
+    var navNodes = flattenChapters(summary.chapters);
     var prevNodes = [null].concat(navNodes.slice(0, -1));
     var nextNodes = navNodes.slice(1).concat([null]);
 

lib/parse/page.js

@@ -1,10 +1,11 @@
 var _ = require('lodash');
-var marked = require('marked');
+var kramed = require('kramed');
 var hljs = require('highlight.js');
 
 var lex = require('./lex');
 var renderer = require('./renderer');
 
+var codeInclude = require('./code_include');
 var lnormalize = require('../utils/lang').normalize;
 
 
@@ -12,13 +13,12 @@ var lnormalize = require('../utils/lang').normalize;
 // Render a section using our custom renderer
 function render(section, _options) {
     // Copy section
+    var links = section.links || {};
     section = _.toArray(section);
-
-    // marked's Render expects this, we don't use it yet
-    section.links = {};
+    section.links = links;
 
     // Build options using defaults and our custom renderer
-    var options = _.extend({}, marked.defaults, {
+    var options = _.extend({}, kramed.defaults, {
         renderer: renderer(null, _options),
 
         // Synchronous highlighting with highlight.js
@@ -36,7 +36,7 @@ function render(section, _options) {
         }
     });
 
-    return marked.parser(section, options);
+    return kramed.parser(section, options);
 }
 
 function quizQuestion(node) {
@@ -74,15 +74,20 @@ function parsePage(src, options) {
             // Main language
             var lang = validLangs ? langs[0] : null;
 
+            // codeInclude shortcut
+            var ci = function(code) {
+                return codeInclude(code, options.dir);
+            };
+
             return {
                 id: section.id,
                 type: section.type,
                 content: render(nonCodeNodes),
                 lang: lang,
                 code: {
-                    base: codeNodes[0].text,
-                    solution: codeNodes[1].text,
-                    validation: codeNodes[2].text,
+                    base: ci(codeNodes[0].text),
+                    solution: ci(codeNodes[1].text),
+                    validation: ci(codeNodes[2].text),
                     // Context is optional
                     context: codeNodes[3] ? codeNodes[3].text : null,
                 }

lib/parse/progress.js

@@ -11,9 +11,6 @@ var calculProgress = function(navigation, current) {
         nav.path = path;
         return nav;
     })
-    .sortBy(function(nav) {
-        return nav.level;
-    })
     .map(function(nav, i) {
         // Calcul percent
         nav.percent = (i * 100) / Math.max((n - 1), 1);
@@ -27,7 +24,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 kramed = require('kramed');
+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");
-    var description = extractFirstNode(nodes, "paragraph");
+    nodes = kramed.lexer(src);
+
+    title = extractFirstNode(nodes, "heading") || '';
+    description = extractFirstNode(nodes, "paragraph") || '';
+
+    var convert = _.compose(
+        function(text) {
+            return _.unescape(text.replace(/(\r\n|\n|\r)/gm, ""));
+        },
+        function(text) {
+            return kramed.parse(text, _.extend({}, kramed.defaults, {
+                renderer: renderer
+            }));
+        }
+    );
 
     return {
-        title: title,
-        description: description
+        title: convert(title),
+        description: convert(description)
     };
 }
 

lib/parse/renderer.js

@@ -1,11 +1,12 @@
 var url = require('url');
 var inherits = require('util').inherits;
 var links = require('../utils').links;
+var codeInclude = require('./code_include');
 
 
 var path = require('path');
 
-var marked = require('marked');
+var kramed = require('kramed');
 
 var rendererId = 0;
 
@@ -20,7 +21,7 @@ function GitBookRenderer(options, extra_options) {
     this.id = rendererId++;
     this.quizIndex = 0;
 }
-inherits(GitBookRenderer, marked.Renderer);
+inherits(GitBookRenderer, kramed.Renderer);
 
 GitBookRenderer.prototype._unsanitized = function(href) {
     var prot = '';
@@ -56,7 +57,7 @@ GitBookRenderer.prototype.link = function(href, title, text) {
 
     // Relative link, rewrite it to point to github repo
     if(links.isRelative(_href)) {
-        if (path.extname(_href) == ".md") {
+        if (path.extname(parsed.path) == ".md") {
             _href = links.toAbsolute(_href, o.dir || "./", o.outdir || "./");
 
             if (o.singleFile) {
@@ -125,7 +126,7 @@ GitBookRenderer.prototype._createCheckboxAndRadios = function(text) {
     var length = splittedText.length;
     var label = '<label class="quiz-label" for="' + quizIdentifier + '">' + splittedText[length - 1] + '</label>';
     return text.replace(fieldRegex, field).replace(splittedText[length - 1], label);
-}
+};
 
 GitBookRenderer.prototype.tablecell = function(content, flags) {
     return GitBookRenderer.super_.prototype.tablecell(this._createCheckboxAndRadios(content), flags);
@@ -135,5 +136,20 @@ GitBookRenderer.prototype.listitem = function(text) {
     return GitBookRenderer.super_.prototype.listitem(this._createCheckboxAndRadios(text));
 };
 
+GitBookRenderer.prototype.code = function(code, lang, escaped) {
+    return GitBookRenderer.super_.prototype.code.call(
+        this,
+        // Import code snippets
+        codeInclude(code, this._extra_options.dir),
+        lang,
+        escaped
+    );
+};
+
+GitBookRenderer.prototype.heading = function(text, level, raw) {
+    var id = this.options.headerPrefix + raw.toLowerCase().replace(/[^\w -]+/g, '').replace(/ /g, '-');
+    return '<h' + level + ' id="' + id + '">' + text + '</h' + level + '>\n';
+};
+
 // Exports
 module.exports = GitBookRenderer;

lib/parse/summary.js

@@ -1,5 +1,5 @@
 var _ = require('lodash');
-var marked = require('marked');
+var kramed = require('kramed');
 
 
 // Utility function for splitting a list into groups
@@ -43,7 +43,7 @@ function listSplit(nodes, start_type, end_type) {
 }
 
 // Get the biggest list
-// out of a list of marked nodes
+// out of a list of kramed nodes
 function filterList(nodes) {
     return _.chain(nodes)
     .toArray()
@@ -64,7 +64,7 @@ function filterList(nodes) {
 // supports extracting links
 function parseTitle(src, nums) {
     // Check if it's a link
-    var matches = marked.InlineLexer.rules.link.exec(src);
+    var matches = kramed.InlineLexer.rules.link.exec(src);
 
     var level = nums.join('.');
 
@@ -81,37 +81,68 @@ function parseTitle(src, nums) {
         title: matches[1],
         level: level,
 
-        // Replace .md references with .html
-        path: matches[2],
+        // Normalize path
+        // 1. Convert Window's "\" to "/"
+        // 2. Remove leading "/" if exists
+        path: matches[2].replace(/\\/g, '/').replace(/^\/+/, ''),
     };
 }
 
-function parseArticle(chapterNum, nodes, idx) {
-    return parseTitle(_.first(nodes).text, [chapterNum, idx+1]);
-}
+function parseChapter(nodes, nums) {
+    // Convert single number to an array
+    nums = _.isArray(nums) ? nums : [nums];
 
-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))
+    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 defaultChapterList(chapterList) {
+    var first = _.first(chapterList);
+
+    // Check if introduction node was specified in SUMMARY.md
+    if (first) {
+        var chapter = parseChapter(first, [0]);
+
+        // Already have README node, we're good to go
+        if(chapter.path === 'README.md') {
+            return chapterList;
+        }
+    }
+
+    // It wasn't specified, so add in default
+    return [
+        [ { type: 'text', text: '[Introduction](README.md)' } ]
+    ].concat(chapterList);
+}
+
+function listGroups(src) {
+    var nodes = kramed.lexer(src);
+
+    // Get out groups of lists
+    return listSplit(
+        filterList(nodes),
+        'list_item_start', 'list_item_end'
+    );
+}
+
 function parseSummary(src) {
-    var nodes = marked.lexer(src);
-
-    // Get out list of chapters
-    var chapterList = filterList(nodes);
-
     // Split out chapter sections
-    var chapters = _.chain(listSplit(chapterList, 'list_item_start', 'list_item_end'))
-    .map(parseChapter)
-    .value();
+    var chapters = defaultChapterList(listGroups(src))
+    .map(parseChapter);
 
     return {
         chapters: chapters
     };
 }
 
+function parseEntries (src) {
+    return listGroups(src).map(parseChapter);
+}
+
 
 // Exports
 module.exports = parseSummary;
+module.exports.entries = parseEntries;

lib/utils/lang.js

@@ -2,6 +2,7 @@ var MAP = {
     'py': 'python',
     'js': 'javascript',
     'rb': 'ruby',
+    'csharp': 'cs',
 };
 
 function normalize(lang) {

lib/utils/links.js

@@ -1,11 +1,24 @@
 var url = require('url');
 var path = require('path');
 
+// Is the link an external link
+var isExternal = function(href) {
+    try {
+        return Boolean(url.parse(href).protocol);
+    } catch(err) { }
+
+    return false;
+};
+
 // Return true if the link is relative
 var isRelative = function(href) {
-    var parsed = url.parse(href);
+    try {
+        var parsed = url.parse(href);
 
-    return !parsed.protocol && parsed.path && parsed.path[0] != '/';
+        return !parsed.protocol && parsed.path && parsed.path[0] != '/';
+    } catch(err) {}
+
+    return true;
 };
 
 // Relative to absolute path
@@ -19,11 +32,29 @@ 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;
+};
+
+// Join links
+
+var join = function() {
+    var _href = path.join.apply(path, arguments);
+
+    if (process.platform === 'win32') {
+        _href = _href.replace(/\\/g, '/');
+    }
+
     return _href;
 };
 
 
 module.exports = {
     isRelative: isRelative,
-    toAbsolute: toAbsolute
-};
+    isExternal: isExternal,
+    toAbsolute: toAbsolute,
+    join: join
+};

lib/utils/string.js

@@ -0,0 +1,26 @@
+var _ = require("lodash");
+
+function escapeShellArg(arg) {
+    var ret = '';
+
+    ret = arg.replace(/"/g, '\\"');
+
+    return "\"" + ret + "\"";
+}
+
+function optionsToShellArgs(options) {
+    return _.chain(options)
+    .map(function(value, key) {
+        if (value == null || value == false) return null;
+        if (value == true) return key;
+        return key+"="+escapeShellArg(value);
+    })
+    .compact()
+    .value()
+    .join(" ");
+}
+
+module.exports = {
+    escapeShellArg: escapeShellArg,
+    optionsToShellArgs: optionsToShellArgs
+};

package.json

@@ -1,36 +1,38 @@
 {
     "name": "gitbook",
-    "version": "0.4.2",
+    "version": "0.7.1",
     "homepage": "http://www.gitbook.io/",
     "description": "Library and cmd utility to generate GitBooks",
     "main": "lib/index.js",
     "dependencies": {
         "q": "1.0.1",
         "lodash": "2.4.1",
-        "marked": "0.3.2",
-        "marked-text-renderer": "0.0.1",
+        "kramed": "0.4.0",
+        "marked-text-renderer": "0.1.0",
         "lunr": "0.5.2",
         "swig": "1.3.2",
         "send": "0.2.0",
         "fstream-ignore": "0.0.7",
         "commander": "2.2.0",
-        "fs-extra": "0.8.1",
+        "graceful-fs": "3.0.2",
+        "fs-extra": "0.10.0",
         "highlight.js": "8.0.0",
         "tmp": "0.0.23",
         "semver": "2.2.1",
         "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.4",
+        "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/ALTERNATIVE_SUMMARY.md

@@ -0,0 +1,13 @@
+# Summary
+
+* [Custom name for Introduction](README.md)
+* [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)
+    * Unfinished article
+* Unfinished Chapter

test/fixtures/INCLUDES.md

@@ -0,0 +1,29 @@
+# Beautiful chapter
+
+Here is a nice included snippet :
+
+```c
+{{ included.c }}
+```
+
+----
+
+An exercise using includes
+
+```c
+{{ included.c }}
+
+Remove this extra code at the end
+```
+
+```c
+{{ included.c }}
+```
+
+```c
+{{ included.c }}
+
+This validation code is wrong but who cares ?
+```
+
+----

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/fixtures/included.c

@@ -0,0 +1,7 @@
+#include <stdio.h>
+
+int main(int argc, char *argv[]) {
+    printf("All is well\n");
+
+    return 0;
+}

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/includes.js

@@ -0,0 +1,38 @@
+var fs = require('fs');
+var path = require('path');
+var assert = require('assert');
+
+var page = require('../').parse.page;
+
+var FIXTURES_DIR = path.join(__dirname, './fixtures/');
+
+function loadPage (name, options) {
+    var CONTENT = fs.readFileSync(FIXTURES_DIR + name + '.md', 'utf8');
+    return page(CONTENT, options);
+}
+
+
+describe('Code includes', function() {
+
+    var LEXED = loadPage('INCLUDES', {
+        'dir': FIXTURES_DIR,
+    });
+
+    var INCLUDED_C = fs.readFileSync(path.join(FIXTURES_DIR, 'included.c'), 'utf8');
+
+    it('should work for snippets', function() {
+        assert.equal(LEXED[0].type, 'normal');
+        // Has replaced include
+        assert.equal(
+            LEXED[0].content.indexOf('{{ included.c }}'),
+            -1
+        );
+    });
+
+    it('should work for exercises', function() {
+        assert.equal(LEXED[1].type, 'exercise');
+
+        // Solution is trimmed version of source
+        assert.equal(LEXED[1].code.solution, INCLUDED_C.trim());
+    });
+});

test/navigation.js

@@ -7,7 +7,9 @@ var navigation = require('../').parse.navigation;
 
 
 var CONTENT = fs.readFileSync(path.join(__dirname, './fixtures/SUMMARY.md'), 'utf8');
+var ALT_CONTENT = fs.readFileSync(path.join(__dirname, './fixtures/ALTERNATIVE_SUMMARY.md'), 'utf8');
 var LEXED = summary(CONTENT);
+var ALT_LEXED = summary(ALT_CONTENT);
 
 
 describe('Summary navigation', function() {
@@ -18,6 +20,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 +30,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 +44,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');
     });
 
@@ -66,6 +78,21 @@ describe('Summary navigation', function() {
         assert.equal(nav['chapter-3/README.md'].level, '3');
     });
 
+    it('should have a default README node', function() {
+        var nav = navigation(LEXED);
+
+        assert.equal(nav['README.md'].level, '0');
+        assert.equal(nav['README.md'].title, 'Introduction');
+    });
+
+    it('Should allow README node to be customized', function() {
+        var nav = navigation(ALT_LEXED);
+
+        assert(nav['README.md']);
+        assert.equal(nav['README.md'].level, '0');
+        assert.notEqual(nav['README.md'].title, 'Introduction');
+    });
+
     it('should not accept null paths', function() {
         var nav = navigation(LEXED);
 

test/summary.js

@@ -12,13 +12,13 @@ var LEXED = summary(CONTENT);
 describe('Summary parsing', function () {
 
     it('should detect chapters', function() {
-        assert.equal(LEXED.chapters.length, 5);
+        assert.equal(LEXED.chapters.length, 6);
     });
 
     it('should support articles', function() {
-        assert.equal(LEXED.chapters[0].articles.length, 2);
-        assert.equal(LEXED.chapters[1].articles.length, 0);
+        assert.equal(LEXED.chapters[1].articles.length, 2);
         assert.equal(LEXED.chapters[2].articles.length, 0);
+        assert.equal(LEXED.chapters[3].articles.length, 0);
     });
 
     it('should detect paths and titles', function() {
@@ -26,29 +26,34 @@ describe('Summary parsing', function () {
         assert(LEXED.chapters[1].path);
         assert(LEXED.chapters[2].path);
         assert(LEXED.chapters[3].path);
-        assert.equal(LEXED.chapters[4].path, null);
+        assert(LEXED.chapters[4].path);
+        assert.equal(LEXED.chapters[5].path, null);
 
         assert(LEXED.chapters[0].title);
         assert(LEXED.chapters[1].title);
         assert(LEXED.chapters[2].title);
         assert(LEXED.chapters[3].title);
         assert(LEXED.chapters[4].title);
+        assert(LEXED.chapters[5].title);
     });
 
     it('should normalize paths from .md to .html', function() {
-        assert.equal(LEXED.chapters[0].path,'chapter-1/README.md');
-        assert.equal(LEXED.chapters[1].path,'chapter-2/README.md');
-        assert.equal(LEXED.chapters[2].path,'chapter-3/README.md');
+        assert.equal(LEXED.chapters[0].path,'README.md');
+        assert.equal(LEXED.chapters[1].path,'chapter-1/README.md');
+        assert.equal(LEXED.chapters[2].path,'chapter-2/README.md');
+        assert.equal(LEXED.chapters[3].path,'chapter-3/README.md');
     });
 
     it('should detect levels correctly', function() {
         var c = LEXED.chapters;
 
-        assert.equal(c[0].level, '1');
-        assert.equal(c[1].level, '2');
-        assert.equal(c[2].level, '3');
+        assert.equal(c[0].level, '0');
+        assert.equal(c[1].level, '1');
+        assert.equal(c[2].level, '2');
+        assert.equal(c[3].level, '3');
 
-        assert.equal(c[0].articles[0].level, '1.1');
-        assert.equal(c[0].articles[1].level, '1.2');
+        assert.equal(c[1].articles[0].level, '1.1');
+        assert.equal(c[1].articles[1].level, '1.2');
+        assert.equal(c[1].articles[1].articles[0].level, '1.2.1');
     });
 });

theme/javascript/core/exercise.js

@@ -1,9 +1,13 @@
 define([
     "jQuery",
+    "ace/ace",
+    "ace/theme-tomorrow",
+    "ace/mode-javascript",
     "utils/execute",
     "core/events",
     "core/state"
-], function($, execute, events, state){
+], function($, _ace, _aceTheme, _aceMode, execute, events, state){
+
     // Bind an exercise
     var prepareExercise = function($exercise) {
         var codeSolution = $exercise.find(".code-solution").text();
@@ -14,6 +18,14 @@ define([
         editor.setTheme("ace/theme/tomorrow");
         editor.getSession().setUseWorker(false);
         editor.getSession().setMode("ace/mode/javascript");
+        
+        editor.commands.addCommand({
+            name: "submit",
+            bindKey: "Ctrl-Return|Cmd-Return",
+            exec: function() {
+                $exercise.find(".action-submit").click();
+            }
+        });
 
         // Submit: test code
         $exercise.find(".action-submit").click(function(e) {
@@ -48,4 +60,4 @@ define([
         init: init,
         prepare: prepareExercise
     };
-});
+});

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,
-            family:0,
-            theme:0
+            size: config.size || 2,
+            family: FAMILY[config.family || "sans"],
+            theme: THEMES[config.theme || "white"]
         });
         fontState.save = function(){
             storage.set("fontState",fontState);
+            update();
         };
 
-        $bookBody.addClass("font-size-"+fontState.size);
-        $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);
+        update();
 
         //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) {
+    "core/loading",
+    "core/search"
+], function($, URL, events, state, progress, exercises, quiz, loading, search) {
     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);
-        console.log("navigate to ", url, "baseurl="+relativeUrl);
+        var url = URL.join(window.location.pathname, 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
@@ -47,14 +46,18 @@ define([
             $("head").html(headContent);
 
             // Merge body
+            var bodyClass = $(".book").attr("class");
             var scrollPosition = $('.book-summary .summary').scrollTop();
             $pageBody.toggleClass("with-summary", $(".book").hasClass("with-summary"))
 
             $(".book").replaceWith($pageBody);
+            $(".book").attr("class", bodyClass);
             $('.book-summary .summary').scrollTop(scrollPosition);
 
             // Update state
             state.update($("html"));
+            // recover search keyword
+            search.recover();
             preparePage();
         })
         .fail(function (e) {
@@ -62,11 +65,6 @@ define([
         }));
     };
 
-    var updateGitHubCounts = function() {
-        $(".book-header .count-star span").text(githubCountStars);
-        $(".book-header .count-watch span").text(githubCountWatch);
-    };
-
     var updateNavigationPosition = function() {
         var bodyInnerWidth, pageWrapperWidth;
 
@@ -94,23 +92,6 @@ define([
         // Focus on content
         $pageWrapper.focus();
 
-        // Prepare search bar
-        search.prepare();
-
-        // Update GitHub count
-        if (state.githubId) {
-            if (githubCountStars) {
-                updateGitHubCounts();
-            } else {
-                $.getJSON("https://api.github.com/repos/"+state.githubId)
-                .done(function(repo) {
-                    githubCountStars = repo.stargazers_count;
-                    githubCountWatch = repo.subscribers_count;
-                    updateGitHubCounts();
-                });
-            }
-        }
-
         // Send to mixpanel
         events.trigger("page.change");
     };
@@ -168,4 +149,5 @@ define([
         goNext: goNext,
         goPrev: goPrev
     };
-});
+});
+

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();
 
@@ -83,19 +81,34 @@ define([
             }
             if (q.length == 0) {
                 sidebar.filter(null);
+                storage.remove("keyword");
             } else {
                 var results = search(q);
                 sidebar.filter(
                     _.pluck(results, "path")
                 );
+                storage.set("keyword", q);
             }
-        });
-    }
+        })
+
+    };
+
+    // filter sidebar menu with current search keyword
+    var recoverSearch = function() {
+        var keyword = storage.get("keyword", "");
+        if(keyword.length > 0) {
+            if(!isSearchOpen()){
+                toggleSearch();
+            }
+            sidebar.filter(_.pluck(search(keyword), "path"));
+        }
+        $(".book-search input").val(keyword);
+    };
 
     return {
         init: init,
         search: search,
         toggle: toggleSearch,
-        prepare: prepare
+        recover:recoverSearch
     };
-});
+});

theme/javascript/core/sidebar.js

@@ -1,11 +1,10 @@
 define([
+    "jQuery",
     "lodash",
     "utils/storage",
     "utils/platform",
     "core/state"
-], function(_, storage, platform, state) {
-    var $summary = state.$book.find(".book-summary");
-
+], function($, _, storage, platform, state) {
     // 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 
-        fontSettings.init();
+        //Init font settings
+        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/sharing.js

@@ -13,6 +13,9 @@ define([
         },
         "google-plus": function($el) {
             window.open("https://plus.google.com/share?url="+encodeURIComponent(url))
+        },
+        "weibo": function($el) {
+            window.open("http://service.weibo.com/share/share.php?content=utf-8&url="+encodeURIComponent(url)+"&title="+encodeURIComponent(title))
         }
     };
 
@@ -30,4 +33,4 @@ define([
     return {
         init: init
     };
-});
+});

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/ebook.less

@@ -0,0 +1,40 @@
+@import "mixins.less";
+
+@import "ebook/variables.less";
+@import "ebook/highlight.less";
+
+.book-chapter {
+    display: none;
+}
+
+
+pre, blockquote {
+    border: 1px solid #999;
+    page-break-inside: avoid;
+    background: #f1f1f1;
+    padding: 8px;
+}
+
+img {
+    max-width: 100% !important;
+    page-break-inside: avoid;
+    margin: 0px auto;
+}
+
+.exercise, .quiz {
+    margin: 1cm 0cm;
+    padding: 0.4cm;
+    page-break-inside: avoid;
+
+    border: 3px solid #ddd;
+
+    .exercise-header {
+        margin-bottom: 0.4cm;
+        padding-bottom: 0.2cm;
+        border-bottom: 1px solid #ddd;
+    }
+
+    .question {
+        margin-top: 0.4cm;
+    }
+}

theme/stylesheets/ebook/variables.less

@@ -0,0 +1 @@
+@font-size-base:          13px;

theme/stylesheets/mixins.less

@@ -4,4 +4,4 @@
     &:hover, &:focus {
         color: inherit;
     }
-}
+}

theme/stylesheets/print.less

@@ -1,115 +0,0 @@
-@import "vendors/bootstrap/bootstrap.less";
-@import "vendors/fontawesome/font-awesome.less";
-
-@import "mixins.less";
-@import "variables.less";
-@import "fonts.less";
-
-@import "page/highlight.less";
-
-
-@font-size-base:          13px;
-
-
-* {
-    -webkit-overflow-scrolling: touch;
-    -webkit-tap-highlight-color: transparent;
-    -webkit-text-size-adjust: none;
-    -webkit-touch-callout: none;
-    -webkit-font-smoothing: antialiased;
-}
-
-html, body {
-    height: 100%;
-}
-
-body {
-    text-rendering: optimizeLegibility;
-    font-smoothing: antialiased;
-    font-family: @font-family-base;
-}
-
-
-h1, h2, h3 {
-    page-break-after: avoid;
-    page-break-before: auto;
-}
-
-h1 { font-size: floor(@font-size-base * 2.15); }
-h2 { font-size: floor(@font-size-base * 1.70); }
-h3 { font-size: ceil(@font-size-base * 1.25); }
-h4 { font-size: ceil(@font-size-base * 1); }
-h5 { font-size:  ceil(@font-size-base * 0.85); }
-h6 { font-size: ceil(@font-size-base * 0.65); }
-
-pre, blockquote {
-    border: 1px solid #999;
-    page-break-inside: avoid;
-}
-
-img {
-    max-width: 100% !important;
-    page-break-inside: avoid;
-}
-
-section {
-    page-break-after: always;
-
-    &#cover {
-        padding: 3cm 0cm;
-        text-align: center;
-
-        h1 {
-            font-size: 1.5cm;
-        }
-    }
-
-    &#summary {
-        margin: 1.5cm;
-
-        h1 {
-            text-align: center;
-        }
-
-        ol {
-            list-style: none;
-            padding: 0px;
-            margin: 0px;
-            margin-left: 1cm;
-        }
-
-        > ol {
-            > li {
-            }
-        }
-    }
-
-    article {
-        margin-bottom: 1.5cm;
-        
-        &.new-chapter {
-            page-break-after: always;
-            font-size: 0.6cm;
-            text-align: center;
-            padding: 3cm 0cm;
-
-            h1 {
-                font-size: floor(@font-size-base * 2.7);
-            }
-        }
-
-        .exercise {
-            margin: 1cm 0cm;
-            padding: 0.4cm;
-            page-break-inside: avoid;
-
-            border: 3px solid #ddd;
-
-            .exercise-header {
-                margin-bottom: 0.4cm;
-                padding-bottom: 0.2cm;
-                border-bottom: 1px solid #ddd;
-            }
-        }
-    }
-}

theme/stylesheets/website.less

@@ -2,19 +2,19 @@
 @import "vendors/fontawesome/font-awesome.less";
 
 @import "mixins.less";
-@import "variables.less";
-@import "fonts.less";
 
-@import "book/languages.less";
-@import "book/header.less";
-@import "book/summary.less";
-@import "book/font-settings.less";
-@import "book/body.less";
-@import "book/exercise.less";
-@import "book/quiz.less";
-@import "book/markdown.less";
-@import "book/progress.less";
-@import "book/navigation.less";
+@import "website/fonts.less";
+@import "website/variables.less";
+@import "website/languages.less";
+@import "website/header.less";
+@import "website/summary.less";
+@import "website/font-settings.less";
+@import "website/body.less";
+@import "website/exercise.less";
+@import "website/quiz.less";
+@import "website/markdown.less";
+@import "website/progress.less";
+@import "website/navigation.less";
 
 * {
     -webkit-overflow-scrolling: touch;

theme/stylesheets/website/body.less

@@ -37,7 +37,8 @@
 
                     background: @page-background;
                     border-radius: 2px;
-                    line-height: 1.5em;
+                    line-height: @content-line-height;
+                    font-size: @default-font-size;
                 }
 
                 .btn-group {
@@ -59,32 +60,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;
             }
@@ -122,4 +101,37 @@
             }
         }
     }
+
+    &.font-size-0 {
+        .book-body .page-inner section {
+            font-size:@s-font-size;
+        }
+    }
+    &.font-size-1 {
+        .book-body .page-inner section {
+            font-size:@m-font-size;
+        }
+    }
+    &.font-size-2 {
+        .book-body .page-inner section {
+            font-size:@l-font-size;
+        }
+    }
+    &.font-size-3{
+        .book-body .page-inner section {
+            font-size:@xl-font-size;
+        }
+    }
+    &.font-size-4 {
+        .book-body .page-inner section {
+            font-size:@xxl-font-size;
+        }
+    }
+
+    &.font-family-0{
+        font-family: @font-family-serif;
+    }
+    &.font-family-1{
+        font-family: @font-family-sans;
+    }
 }

theme/stylesheets/website/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/website/fonts.less

@@ -1,15 +1,3 @@
-@font-face {
-    font-family: 'EB Garamond';
-    font-style: normal;
-    font-weight: 400;
-    src: local('EB Garamond 12 Regular'),url('@{FontPath}/ebgaramond/400.woff') format('woff');
-}
-@font-face {
-    font-family: 'EB Garamond';
-    font-style: italic;
-    font-weight: 400i;
-    src: local('EB Garamond 12 Italic'),url('@{FontPath}/ebgaramond/400i.woff') format('woff');
-}
 @font-face {
     font-family: 'Merriweather';
     font-style: normal;
@@ -19,7 +7,7 @@
 @font-face {
     font-family: 'Merriweather';
     font-style: italic;
-    font-weight: 250i;
+    font-weight: 250;
     src: local('Merriweather Light Italic'),url('@{FontPath}/merriweather/250i.woff') format('woff');
 }
 @font-face {
@@ -31,21 +19,9 @@
 @font-face {
     font-family: 'Merriweather';
     font-style: italic;
-    font-weight: 400i;
+    font-weight: 400;
     src: local('Merriweather Italic'),url('@{FontPath}/merriweather/400i.woff') format('woff');
 }
-@font-face {
-    font-family: 'Merriweather';
-    font-style: normal;
-    font-weight: 600;
-    src: local(''),url('@{FontPath}/merriweather/600.woff') format('woff');
-}
-/*@font-face {
-    font-family: 'Merriweather';
-    font-style: italic;
-    font-weight: 600i;
-    src: local(''),url('@{FontPath}/merriweather/600i.woff') format('woff');
-}*/
 @font-face {
     font-family: 'Merriweather';
     font-style: normal;
@@ -55,7 +31,7 @@
 @font-face {
     font-family: 'Merriweather';
     font-style: italic;
-    font-weight: 700i;
+    font-weight: 700;
     src: local('Merriweather Bold Italic'),url('@{FontPath}/merriweather/700i.woff') format('woff');
 }
 @font-face {
@@ -67,33 +43,9 @@
 @font-face {
     font-family: 'Merriweather';
     font-style: italic;
-    font-weight: 900i;
+    font-weight: 900;
     src: local('Merriweather Heavy Italic'),url('@{FontPath}/merriweather/900i.woff') format('woff');
 }
-@font-face {
-    font-family: 'Anonymous Pro';
-    font-style: normal;
-    font-weight: 400;
-    src: local('Anonymous Pro'),url('@{FontPath}/anonymouspro/400.woff') format('woff');
-}
-@font-face {
-    font-family: 'Anonymous Pro';
-    font-style: italic;
-    font-weight: 400i;
-    src: local('Anonymous Pro Italic'),url('@{FontPath}/anonymouspro/400i.woff') format('woff');
-}
-@font-face {
-    font-family: 'Anonymous Pro';
-    font-style: normal;
-    font-weight: 700;
-    src: local('Anonymous Pro Bold'),url('@{FontPath}/anonymouspro/700.woff') format('woff');
-}
-@font-face {
-    font-family: 'Anonymous Pro';
-    font-style: italic;
-    font-weight: 700i;
-    src: local('Anonymous Pro Bold Italic'),url('@{FontPath}/anonymouspro/700i.woff') format('woff');
-}
 @font-face {
     font-family: 'Open Sans';
     font-style: normal;
@@ -103,7 +55,7 @@
 @font-face {
     font-family: 'Open Sans';
     font-style: italic;
-    font-weight: 300i;
+    font-weight: 300;
     src: local('Open Sans Light Italic'),url('@{FontPath}/opensans/300i.woff') format('woff');
 }
 @font-face {
@@ -115,7 +67,7 @@
 @font-face {
     font-family: 'Open Sans';
     font-style: italic;
-    font-weight: 400i;
+    font-weight: 400;
     src: local('Open Sans Italic'),url('@{FontPath}/opensans/400i.woff') format('woff');
 }
 @font-face {
@@ -127,7 +79,7 @@
 @font-face {
     font-family: 'Open Sans';
     font-style: italic;
-    font-weight: 600i;
+    font-weight: 600;
     src: local('Open Sans Semibold Italic'),url('@{FontPath}/opensans/600i.woff') format('woff');
 }
 @font-face {
@@ -139,6 +91,6 @@
 @font-face {
     font-family: 'Open Sans';
     font-style: italic;
-    font-weight: 700i;
+    font-weight: 700;
     src: local('Open Sans Bold Italic'),url('@{FontPath}/opensans/700i.woff') format('woff');
 }

theme/stylesheets/website/header.less

@@ -13,7 +13,7 @@
         font-size: 0.85em;
         color: @header-color;
         background: @header-background;
-        box-shadow: 0 1px 2px hsla(200,10%,80%,0.6);
+        border-bottom: 1px solid @header-border;
 
         .btn {
             display: block;
@@ -44,12 +44,16 @@
             padding-right: 200px;
             .transition(margin-left 0.5s ease);
 
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+
             a, a:hover {
                 color: inherit;
                 text-decoration: none;
             }
 
-            @media (max-width: 800px) {
+            @media (max-width: 1000px) {
                 display: none;
             }
 

theme/stylesheets/website/markdown.less

@@ -24,6 +24,7 @@
     padding-bottom: 25px;
     padding-top: 15px;
     color:@page-color;
+    letter-spacing: 0.01rem;
 
     & > *:first-child {
         margin-top: 0 !important; }

theme/stylesheets/website/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.2);
 
         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 {
@@ -49,12 +49,14 @@
     }
 }
 .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;
+    .navigation {
+        color: rgba(255, 255, 255, 0.4);
+
+        &:hover {
+            color: rgba(255, 255, 255, 0.9);
+        }
     }
 }

theme/stylesheets/website/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/website/summary.less

@@ -11,7 +11,7 @@
         width: @sidebar-width;
         color: @sidebar-color;
         background: @sidebar-background;
-        box-shadow: inset -1px 0 5px hsla(0, 0%, 0%, 0.1);
+        border-right: 1px solid @sidebar-border;
 
         .transition(all 0.5s ease);
 
@@ -57,7 +57,6 @@
                     margin: 7px 0;
                     overflow: hidden;
                     background: @sidebar-divider-color;
-                    box-shadow: 0 1px rgba(255,255,255,0.7);
                 }
 
                 i.fa-check {
@@ -90,7 +89,6 @@
                     overflow: hidden;
                     white-space: nowrap;
                     position: relative;
-                    padding-left: 25px;
                 }
 
                 span {
@@ -110,7 +108,7 @@
             }
         }
 
-        @media (max-width: 600px) {
+        @media (max-width: @sidebar-breakpoint) {
             width: 100%;
             bottom: 0px;
             left: -100%;

theme/stylesheets/website/variables.less

@@ -7,39 +7,44 @@
 @header-height:                       50px;
 @header-color:                        hsl(194, 5%, 52%);
 @header-background:                   white;
+@header-border:                       rgba(0, 0, 0, 0.07);
 @header-button-color:                 hsl(194, 5%, 52%);
 @header-button-hover-color:           #151515;
 @header-button-hover-background:      hsl(207, 15%, 95%);
 
 // 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-background:                  @body-background;
+@sidebar-border:                      @header-border;
 
-@sidebar-nested-padding:              10px;
+@sidebar-nested-padding:              20px;
 
 @sidebar-search-padding:              6px;
 @sidebar-search-background:           transparent;
-@sidebar-search-input-border-color:   hsl(207, 15%, 80%);
+@sidebar-search-input-border-color:   @sidebar-border;
 
-@sidebar-divider-color:               hsl(207, 15%, 85%);
+@sidebar-divider-color:               @sidebar-border;
 
-@sidebar-link-color:                  hsl(207, 15%, 50%);
+@sidebar-link-color:                  hsl(207, 15%, 25%);
 @sidebar-link-background:             transparent;
 @sidebar-link-hover-color:            hsl(207, 100%, 50%);
 @sidebar-link-hover-background:       transparent;
 
 @sidebar-icon-color:                  @bar-progress-background;
-@sidebar-link-completed:              hsl(207, 15%, 25%);
+@sidebar-link-completed:              @sidebar-link-color;
 @sidebar-link-completed-weight:       normal;
 
 // Page
-@page-color:                     			black;
-@page-background:                     white;
+@page-color:                          black;
+@page-background:                     @body-background;
+
+// Content
+@content-line-height:                 1.6em;
 
 // Progress Bar
 @chapter-display:                     none;
@@ -76,26 +81,27 @@
 @border-radius-small:                 1px;
 
 // Fonts
-@font-family-serif:                   Merriweather, "EB Garamond", Georgia, serif;
+@font-family-serif:                   "Merriweather", Georgia, serif;
 @font-family-sans:                    "Open Sans", "Clear Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-@font-family-base:                    @font-family-serif;
-
+@font-family-base:                    @font-family-sans;
+@headings-font-family:                inherit;
 
 @FontPath:                            '@{staticPath}/fonts';
 @fa-font-path:                        "@{FontPath}/fontawesome";
 
-@s-font-size:													1.2rem;
-@m-font-size:													1.4rem;
-@l-font-size:													1.6rem;
-@xl-font-size:												2.2rem;
-@xxl-font-size:												4.0rem;
+@s-font-size:                                               1.2rem;
+@m-font-size:                                               1.4rem;
+@l-font-size:                                               1.6rem;
+@xl-font-size:                                              2.2rem;
+@xxl-font-size:                                             4.0rem;
+@default-font-size:                                         @l-font-size;
 
-/*                                                       
-,--------.,--.                                         
-'--.  .--'|  ,---.  ,---. ,--,--,--. ,---.  ,---. .--. 
-   |  |   |  .-.  || .-. :|        || .-. :(  .-' '--' 
-   |  |   |  | |  |\   --.|  |  |  |\   --..-'  `).--. 
-   `--'   `--' `--' `----'`--`--`--' `----'`----' '--' 
+/*
+,--------.,--.
+'--.  .--'|  ,---.  ,---. ,--,--,--. ,---.  ,---. .--.
+   |  |   |  .-.  || .-. :|        || .-. :(  .-' '--'
+   |  |   |  | |  |\   --.|  |  |  |\   --..-'  `).--.
+   `--'   `--' `--' `----'`--`--`--' `----'`----' '--'
 */
 // Header
 @header-color-1:                        #AFA790;
@@ -112,21 +118,19 @@
 // Body
 @body-background-1:                     #F3EACB;
 @body-background-2:                     #1d1f21;
-@body-pagination-background-1:          #FFFAEA;
-@body-pagination-background-2:          #33404D;
 
 // Sidebar
 @sidebar-color-1:                       #AFA790;
 @sidebar-color-2:                       hsl(207, 15%, 80%);
-@sidebar-background-1:                  #F3EACB;
-@sidebar-background-2:                  #111111;
+@sidebar-background-1:                  @body-background-1;
+@sidebar-background-2:                  @body-background-2;
 
 @sidebar-search-background-1:           transparent;
 @sidebar-search-background-2:           transparent;
 @sidebar-search-input-border-color-1:   #D6CFBA;
-@sidebar-search-input-border-color-2:   #c4cdd4;
+@sidebar-search-input-border-color-2:   #000;
 
-@sidebar-divider-color-1:               hsl(207, 15%, 85%);
+@sidebar-divider-color-1:               @sidebar-divider-color;
 @sidebar-divider-color-2:               #1d1f21;
 
 @sidebar-link-color-1:                  #877F6A;
@@ -140,14 +144,14 @@
 
 @sidebar-icon-color-1:                  @bar-progress-background;
 @sidebar-icon-color-2:                  @bar-progress-background;
-@sidebar-link-completed-1:              hsl(207, 15%, 25%);
-@sidebar-link-completed-2:              hsl(207, 15%, 25%);
+@sidebar-link-completed-1:              @sidebar-link-color-1;
+@sidebar-link-completed-2:              @sidebar-link-color-2;
 @sidebar-link-completed-weight-1:       normal;
 @sidebar-link-completed-weight-2:       normal;
 
 // Page
-@page-color-1:                     			#704214;
-@page-color-2:                     			#a4b1b1;
+@page-color-1:                              #704214;
+@page-color-2:                              #a4b1b1;
 @page-background-1:                     #F3EACB;
 @page-background-2:                     #1d1f21;
 

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

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

theme/templates/includes/book/header.html

@@ -1,30 +1,28 @@
 <div class="book-header">
     <!-- Actions Left -->
+    <a href="#" class="btn pull-left toggle-summary" aria-label="Toggle summary"><i class="fa fa-align-justify"></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"><i class="fa fa-bookmark-o"></i></a>
+    <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"><i class="fa fa-search"></i></a>
+    <a href="#" class="btn pull-left toggle-search" aria-label="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 -->
     {% if options.links.sharing.google !== false %}
-    <a href="#" target="_blank" class="btn pull-right" data-sharing="google-plus"><i class="fa fa-google-plus"></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>
     {% endif %}
     {% if options.links.sharing.facebook !== 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 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" data-sharing="twitter"><i class="fa fa-twitter"></i></a>
+    <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 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 hidden-xs"><i class="fa fa-eye"></i> Watch (<span>-</span>)</a>
+    {% if options.links.sharing.weibo === true %}
+    <a href="#" target="_blank" class="btn pull-right twitter-sharing-link sharing-link" data-sharing="weibo" aria-label="Share on Weibo"><i class="fa fa-weibo"></i></a>
     {% endif %}
 
     <!-- Title -->

theme/templates/includes/book/summary.html

@@ -1,64 +1,83 @@
+{% macro articles(_articles) %}
+    {% for item in _articles %}
+        {% set externalLink = item.path|isExternalLink %}
+        <li class="chapter {% if item.path == _input %}active{% endif %}" data-level="{{ item.level }}" {% if item.path && !externalLink %}data-path="{{ item.path|mdLink }}"{% endif %}>
+            {% if item.path %}
+                {% if !externalLink %}
+                    <a href="{{ basePath }}/{{ item.path|mdLink }}">
+                        <i class="fa fa-check"></i>
+                        {% if item.level !== "0" %}
+                            <b>{{ item.level }}.</b>
+                        {% endif %}
+                         {{ item.title }}
+                    </a>
+                {% else %}
+                    <a target="_blank" href="{{ item.path }}">
+                        <i class="fa fa-check"></i>
+                        {% if item.level !== "0" %}
+                            <b>{{ item.level }}.</b>
+                        {% endif %}
+                         {{ item.title }}
+                    </a>
+                {% endif %}
+            {% 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 options.links.about !== false && (options.links.about != null || githubId) %}
+        {% set _divider = false %}
+        {% if options.links.about !== false && (options.links.about || githubId) %}
+        {% set _divider = true %}
         <li>
-            <a href="{{ options.links.about|default(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 != null || githubId) %}
+        {% if options.links.issues !== false && (options.links.issues || githubId) %}
+        {% set _divider = true %}
         <li>
-            <a href="{{ options.links.issues|default(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 != null || githubId) %}
+        {% if options.links.contribute !== false && (options.links.contribute || githubId) %}
+        {% set _divider = true %}
         <li>
-            <a href="{{ options.links.contribute|default(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 options.links.contribute || options.links.issues || options.links.about || githubId %}
+	{% if options.links.custom %}
+	{% for link in options.links.custom %}
+	    {% set _divider = true %}
+	     <li> 
+	         <a href="{{ options.links.custom[loop.key] }}" target="blank" class="custom-link">{{ loop.key }}</a>
+             </li>
+	{% endfor %}
+	{% 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 %}
-            <li {% if item._path == _input %}class="active"{% endif %} data-level="{{ item.level }}" {% if item.path %}data-path="{{ item.path|mdLink }}"{% endif %}>
-                {% if item.path %}
-                <a href="{{ basePath }}/{{ item.path|mdLink }}">
-                    <i class="fa fa-check"></i> <b>{{ item.level }}.</b> {{ item.title }}
-                </a>
-                {% else %}
-                <span><b>{{ item.level }}.</b> {{ item.title }}</span>
-                {% 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 %}
+        {{ articles(summary.chapters) }}
 
         {% if options.links.gitbook !== false %}
         <li class="divider"></li>
         <li>
-            <a href="http://www.gitbook.io/" target="blank">Generated using GitBook</a>
+            <a href="http://www.gitbook.io/" target="blank" class="gitbook-link">Generated using GitBook</a>
         </li>
         {% endif %}
     </ul>

theme/templates/langs.html

@@ -2,6 +2,10 @@
 
 {% block title %}{{ title }}{% endblock %}
 
+{% block style %}
+<link rel="stylesheet" href="{{ staticBase }}/style.css">
+{% endblock %}
+
 {% block content %}
 <div class="book-langs-index">
     <div class="inner">
@@ -10,7 +14,7 @@
         <ul class="languages">
         {%  for lang in langs %}
             <li>
-                <a href="{{ basePath}}/{{ lang.path }}">{{ lang.title }}</a>
+                <a href="{{ basePath}}/{{ lang.path|pathJoin("/index.html") }}">{{ lang.title }}</a>
             </li>
         {% endfor %}
         </ul>

theme/templates/layout.html

@@ -1,49 +1,27 @@
 <!DOCTYPE HTML>
 <html lang="en-US" {% block htmlTag %}{% endblock %}>
-    <head prefix="og: http://ogp.me/ns# book: http://ogp.me/ns/book#">
-        {% block head %}
+    {{ htmlSnippet("html:start")|default("") }}
+    <head>
+        {{ htmlSnippet("head:start")|default("") }}
         <meta charset="UTF-8">
-        <title>{% block title %} | {{ title }}{% endblock %}</title>
-
+        <title>{% block title %}{% endblock %}</title>
         <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
-        <meta name="robots" content="index, follow">
-        <meta name="author" content="{{ githubAuthor }}">
-        <meta name="description" content="{{ description }}">
-        <meta name="keywords" content="gitbook,github" >
-        <meta name="generator" content="www.gitbook.io">
-
-        {% if progress.current.next and progress.current.next.path %}
-        <link rel="next" href="{{ basePath }}/{{ progress.current.next.path|mdLink }}" />
-        {% endif %}
-        {% if progress.current.prev and progress.current.prev.path %}
-        <link rel="prev" href="{{ basePath }}/{{ progress.current.prev.path|mdLink }}" />
-        {% endif %}
-
-        <meta property="og:title" content="{% block title %} | {{ title }}{% endblock %}">
-        <meta property="og:site_name" content="{{ title }}">
-        <meta property="og:type" content="book">
-        <meta property="og:locale" content="en_US">
-
-        <meta property="book:author" content="{{ githubHost }}{{ githubAuthor }}">
-        <meta property="book:tag" content="GitBook">
-
+        <meta name="description" content="{% block description %}{% endblock %}">
+        <meta name="generator" content="GitBook {{ gitbook.version }}">
+        <meta name="HandheldFriendly" content="true"/>
         <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
         <meta name="apple-mobile-web-app-capable" content="yes">
         <meta name="apple-mobile-web-app-status-bar-style" content="black">
-
         <link rel="shortcut icon" href="{{ staticBase }}/images/favicon.ico" type="image/x-icon">
-        {% endblock %}
+        {% block head %}{% endblock %}
+        {{ htmlSnippet("head:end")|default("") }}
     </head>
     <body>
-        {% block style %}
-        <link rel="stylesheet" href="{{ staticBase }}/style.css">
-        {% endblock %}
+        {{ htmlSnippet("body:start")|default("") }}
+        {% block style %}{% endblock %}
         {% block content %}{% endblock %}
-        {% block javascript %}
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.1.3/ace.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.1.3/mode-javascript.js"></script>
-        <script src="{{ staticBase }}/jsrepl/jsrepl.js" id="jsrepl-script"></script>
-        <script src="{{ staticBase }}/app.js"></script>
-        {% endblock %}
+        {% block javascript %}{% endblock %}
+        {{ htmlSnippet("body:end")|default("") }}
     </body>
+    {{ htmlSnippet("html:end")|default("") }}
 </html>

theme/templates/page.html

@@ -20,10 +20,15 @@
             </div>
         {% elif section.type == "quiz" %}
         <div class="quiz">
-          <div class="exercise-header">Exercise #{{ exercise }}</div>
-          {% autoescape false %}{{ section.content }}{% endautoescape %}
-          {% autoescape false %}{{ section.quiz.base }}{% endautoescape %}
-          {% set exercise = exercise + 1 %}
+            <div class="exercise-header">Quiz #{{ exercise }}</div>
+            {% autoescape false %}{{ section.content }}{% endautoescape %}
+            {% for quiz in section.quiz %}
+                <div class="question">
+                    <div class="question-header">Question {{ loop.index }} of {{ section.quiz.length }}</div>
+                    {% autoescape false %}{{ quiz.base }}{% endautoescape %}
+                </div>
+            {% endfor %}
+            {% set exercise = exercise + 1 %}
         </div>
         {% endif %}
     {% endfor %}
@@ -31,104 +36,51 @@
 
 {% set exercise = 1 %}
 {% block content %}
-    {# Cover #}
-    <section id="cover">
-        <h1>{{ title }}</h1>
-        {% if githubId %}
-        <h2>By <a href="{{ githubHost }}{{ githubAuthor }}">@{{ githubAuthor }}</a></h2>
-        {% endif %}
-    </section>
-
-    {# Summary #}
-    <section id="summary">
-        <h1>Table of Contents</h1>
-        <ol>
-            <li>
-                <a href="#README.md">
-                    <h2>Introduction</h2>
-                </a>
-            </li>
-            {% for item in summary.chapters %}
-                <li>
-                    <h2><span>{{ item.level }}.</span> <a href="#{{ item.path }}">{{ item.title }}</a></h2>
-                    {% if item.articles.length > 0 %}
-                    <ol>
-                        {% for article in item.articles %}
-                            <li>
-                                <span>{{ article.level }}</span> <a href="#{{ article.path }}">{{ article.title }}</a>
-                            </li>
-                        {% endfor %}
-                    </ol>
-                    {% endif %}
-                </li>
-            {% endfor %}
-        </ol>
-    </section>
-
     {# Pages content #}
-    <section>
-        <article id="README.md">
-        {{ articleContent(pages["README.md"].content) }}
-        </article>
-    </section>
-    {% for item in summary.chapters %}
-        <section>
-            <article id="{{ item.path }}" class="new-chapter">
-                <h1>{{ item.title }}</h1>
-            </article>
-
-            {% if pages[item.path] %}
-            <article>
-            {{ articleContent(pages[item.path].content) }}
-            </article>
-            {% endif %}
-
-            {% if item.articles.length > 0 %}
-                {% for article in item.articles %}
-                    {% if pages[article.path] %}
-                        <article id="{{ article.path }}">
-                            {{ articleContent(pages[article.path].content) }}
-                        </article>
-                    {% endif %}
-                {% endfor %}
-            {% endif %}
-        </section>
+    {% for item in progress.chapters %}
+    <article id="{{ article.path }}">
+        <h1 class="book-chapter book-chapter-{{ item.level|lvl }}">{{ item.title }}</h1>
+        {% if pages[item.path] %}
+        {{ articleContent(pages[item.path].content) }}
+        {% endif %}
+    </article>
     {% endfor %}
 
 
     {# Exercise solutions #}
     {% if exercise > 1 %}
         {% set exercise = 1 %}
-        <section>
-            <article class="new-chapter">
-                <h1>Exercise Solutions</h1>
-            </article>
-            <article>
-            {% for item in summary.chapters %}
-                {% for article in item.articles %}
-                    {% if pages[article.path] %}
-                        {% for section in pages[article.path].content %}
-                            {% if section.type == "exercise" %}
-                                <div class="exercise">
-                                    <div class="exercise-header">Exercise #{{ exercise }}</div>
-                                    {% autoescape false %}{{ section.content }}{% endautoescape %}
-                                    <pre><code>{% autoescape false %}{{ section.code.solution|code }}{% endautoescape %}</code></pre>
-                                    {% set exercise = exercise + 1 %}
-                                </div>
-                            {% elif section.type == "quiz" %}
-                                <div class="quiz">
-                                    <div class="exercise-header">Exercise #{{ exercise }}</div>
-                                    {% autoescape false %}{{ section.content }}{% endautoescape %}
-                                    {% autoescape false %}{{ section.quiz.solution }}{% endautoescape %}
-                                    {% set exercise = exercise + 1 %}
-                                </div>
-                            {% endif %}
-                        {% endfor %}
-                    {% endif %}
-                {% endfor %}
+        <article>
+            <h1 class="book-chapter book-chapter-1">Exercise Solutions</h1>
+            <h1>Exercise Solutions</h1>
+
+            {% for item in progress.chapters %}
+                {% if pages[item.path] %}
+                    {% for section in pages[item.path].content %}
+                        {% if section.type == "exercise" %}
+                            <div class="exercise">
+                                <div class="exercise-header">Exercise #{{ exercise }}</div>
+                                {% autoescape false %}{{ section.content }}{% endautoescape %}
+                                <pre><code>{% autoescape false %}{{ section.code.solution|code }}{% endautoescape %}</code></pre>
+                                {% set exercise = exercise + 1 %}
+                            </div>
+                        {% elif section.type == "quiz" %}
+                            <div class="quiz">
+                                <div class="exercise-header">Quiz #{{ exercise }}</div>
+                                {% autoescape false %}{{ section.content }}{% endautoescape %}
+                                {% for quiz in section.quiz %}
+                                    <div class="question">
+                                        <div class="question-header">Question {{ loop.index }} of {{ section.quiz.length }}</div>
+                                        {% autoescape false %}{{ quiz.solution }}{% endautoescape %}
+                                    </div>
+                                {% endfor %}
+                                {% set exercise = exercise + 1 %}
+                            </div>
+                        {% endif %}
+                    {% endfor %}
+                {% endif %}
             {% endfor %}
-            </article>
-        </section>
+        </article>
     {% endif %}
 {% endblock %}
 

theme/templates/site.html

@@ -1,7 +1,23 @@
 {% extends "layout.html" %}
 
-{% block htmlTag %}manifest="{{ basePath }}/manifest.appcache"{% endblock %}
-{% block title %}{{ progress.current.title }}{% parent %}{% endblock %}
+{% block htmlTag %}{% if options.cache !== false %}manifest="{{ basePath }}/manifest.appcache"{% endif %}{% endblock %}
+
+{% block head %}
+    {% parent %}
+    {% if githubAuthor %}
+    <meta name="author" content="{{ githubAuthor }}">
+    {% endif %}
+    {% if progress.current.next and progress.current.next.path %}
+    <link rel="next" href="{{ basePath }}/{{ progress.current.next.path|mdLink }}" />
+    {% endif %}
+    {% if progress.current.prev and progress.current.prev.path %}
+    <link rel="prev" href="{{ basePath }}/{{ progress.current.prev.path|mdLink }}" />
+    {% endif %}
+{% endblock %}
+
+{% block title %}{{ progress.current.title }} | {{ title }}{% endblock %}
+{% block description %}{% if progress.current.level == "0" %}{{ description }}{% endif %}{% endblock %}
+
 {% block content %}
     <div class="book" {% if githubId %}data-github="{{ githubId }}"{% endif %} data-level="{{ progress.current.level }}" data-basepath="{{ basePath }}" data-revision="{{ revision }}">
     {% include "includes/book/header.html" %}
@@ -28,17 +44,18 @@
         </div>
 
         {% if progress.current.prev and progress.current.prev.path %}
-        <a href="{{ basePath }}/{{ progress.current.prev.path|mdLink }}" class="navigation navigation-prev {% if !progress.current.next or !progress.current.next.path %}navigation-unique{% endif %}"><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 {% if !progress.current.prev or !progress.current.prev.path %}navigation-unique{% endif %}"><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>
 {% endblock %}
 
 {% block javascript %}
-{% parent %}
+<script src="{{ staticBase }}/jsrepl/jsrepl.js" id="jsrepl-script"></script>
+<script src="{{ staticBase }}/app.js"></script>
 {% for resource in plugins.resources.js %}
     {% if resource.url %}
     <script src="{{ resource.url }}"></script>
@@ -55,7 +72,7 @@ require(["gitbook"], function(gitbook) {
 {% endblock %}
 
 {% block style %}
-{% parent %}
+<link rel="stylesheet" href="{{ staticBase }}/style.css">
 {% for resource in plugins.resources.css %}
     {% if resource.url %}
     <link rel="stylesheet" href="{{ resource.url }}">