Bump version to 2.0.0-beta.4

Update default generator

.editorconfig

@@ -0,0 +1,10 @@
+# editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

AUTHORS.md

@@ -28,5 +28,15 @@ Translators
 	- Andrey Akinshin (@AndreyAkinshin)
 - Norwegian
 	- Knut Melvær (@kmelve)
+- Persian (Farsi)
+	- Mohammad Hossein Mojtahedi (@mhm5000)
+- Portuguese
+	- Ryan O'Mullan (@RyanOM)
+- Spanish
+	- Ryan O'Mullan (@RyanOM)
+- Simplifiled Chinese
+	- Hu Hao (@howiehu)
+- Traditional Chinese
+	- Hu Hao (@howiehu)
 - French
-	- Samy Pessé (@SamyPesse)
+	- Samy Pessé (@SamyPesse)

CHANGES.md

@@ -1,4 +1,79 @@
 # Release notes
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## 2.0.0-beta.4
+- Fix default generator for use programmatically
+- Add option "author" for html meta tags
+- Fix links normalization (content and hash)
+
+## 2.0.0-beta.3
+- Fix odd cases with code blocks escaping
+
+## 2.0.0-beta.2
+- Fix definition of entry point title using SUMMARY.md
+
+## 2.0.0-beta.1
+- Fix windows incompatibility
+- Add support for rtl (enabled by default for `ar` and `fa`)
+- Escape code blocks in markdown parser
+- Add Persian/Farsi translation (`fa`)
+- Add Arabic translation (`ar`)
+- Add Bengali translation (`bn`)
+- Provide generator name in template context
+
+## 2.0.0-alpha.9
+- Fix links in sidebar
+- Fix normalization of html link (README to index)
+- Fix html snippets escaping
+
+## 2.0.0-alpha.8
+- Improve locale detection for i18n
+- Fix chapter name for Glossary in pdf
+- Don't escape html in glossary items
+- Fix generation of multilingual book as ebook
+- Add "post" block attribute to post-process
+
+## 2.0.0-alpha.7
+- Fix display of glossary in ebook formats
+- Add default footer and header to pdf
+- Fix generation of json format compatible with 1.x.x
+- Add Simplifiled Chinese and Traditional Chinese translations
+
+## 2.0.0-alpha.6
+- Add es and pt translations
+- Fix replacement of glossary terms
+
+## 2.0.0-alpha.5
+- Fix copy of files/covers
+- Add back `finish:before` hook
+
+## 2.0.0-alpha.4
+- Fix copy of cover for multilingal books
+
+## 2.0.0-alpha.3
+- Norwegian translation
+- Load plugins from book in priority
+
+## 2.0.0-alpha.3
+- Fix init command
+- Update parsers to fix spaces in summary (`gitbook-parsers@0.3.1`)
+
+## 2.0.0-alpha.1
+- Externalize parsing into `gitbook-parsers` module
+- Supports AsciiDoc and reStructuredText
+- Hooks for page (`page:*`) are now deprecated, plugins should extend filters and blocks instead
+- Hooks `summary` and `glossary` (after and before) have been removed
+- Exercises and Quizzes are no longer parsed in the markdown parser
+- Support for more markdown extensions: `.markdown`, `.mdown`
+- Templates are rendered with nunjucks instead of swig, syntax is almost compatible, there is some changes with contexts and filters. `{{ super() }}` should be use instead of `{% parent %}`
+- Clean output folder on build without removing `.git` and `.svn`
+- MathJAX is no longer a default plugin
+- SVG images are converted to PNG during generation of ebooks
+- i18n in website and ebook (ru, it, de, fr)
+- New templating syntax
+- Content references (both internal and external)
+- Glossary terms are handled during generation (also in ebook format)
 
 ## 1.5.0
 - Fix `serve` command, broken by `1.4.2`

README.md

@@ -1,12 +1,17 @@
 GitBook
 =======
 
-:warning: This branch contains the version 2.0.
-
-[![Build Status](https://travis-ci.org/GitbookIO/gitbook.png?branch=master)](https://travis-ci.org/GitbookIO/gitbook)
 [![NPM version](https://badge.fury.io/js/gitbook.svg)](http://badge.fury.io/js/gitbook)
+[![Build Status](https://travis-ci.org/GitbookIO/gitbook.png?branch=master)](https://travis-ci.org/GitbookIO/gitbook)
+[![Windows Build Status](https://ci.appveyor.com/api/projects/status/github/GitbookIO/gitbook?branch=master&svg=true)](https://ci.appveyor.com/project/SamyPesse/gitbook)
 
-GitBook is a command line tool (and Node.js library) for building beautiful books using GitHub/Git and Markdown (or AsciiDoc). Here is an example: [Learn Javascript](https://www.gitbook.com/book/GitBookIO/javascript). You can publish and host book easily online using [gitbook.com](https://www.gitbook.com), a web-editor is [also available](https://www.gitbook.com/editor). You can follow [@GitBookIO](https://twitter.com/GitBookIO) on Twitter. Complete documentation is available at [help.gitbook.io](http://help.gitbook.io/).
+GitBook is a command line tool (and Node.js library) for building beautiful books using GitHub/Git and Markdown (or AsciiDoc). Here is an example: [Learn Javascript](https://www.gitbook.com/book/GitBookIO/javascript).
+
+You can publish and host book easily online using [gitbook.com](https://www.gitbook.com), a web-editor is [also available](https://www.gitbook.com/editor).
+
+Stay updated by following [@GitBookIO](https://twitter.com/GitBookIO) on Twitter or [GitBook](https://www.facebook.com/gitbookcom) on Facebook.
+
+Complete documentation is available at [help.gitbook.com](http://help.gitbook.com/).
 
 ![Image](https://raw.github.com/GitbookIO/gitbook/master/preview.png)
 
@@ -38,14 +43,14 @@ $ gitbook build ./repository ./outputFolder
 
 ## Features
 
-* [Output as a website or ebook (pdf, epub, mobi)](#output-formats)
-* [Multi-Languages](#multi-languages)
-* [Glossary](#glossary)
-* [Cover](#cover)
-* [AsciiDoc Support](#asciidoc)
-* [Variables and Templating](#variables-and-templating)
-* [Content References](#content-references)
-* [Plugins](#plugins)
+* [Output as a website or ebook (pdf, epub, mobi)](http://help.gitbook.com/format/output.html)
+* [Multi-Languages](http://help.gitbook.com/format/languages.html)
+* [Glossary](http://help.gitbook.com/format/glossary.html)
+* [Cover](http://help.gitbook.com/format/cover.html)
+* [AsciiDoc Support](http://help.gitbook.com/format/asciidoc.html)
+* [Variables and Templating](http://help.gitbook.com/format/templating.html)
+* [Content References](http://help.gitbook.com/format/conrefs.html)
+* [Plugins](http://help.gitbook.com/plugins/index.html)
 * Interractive reader website:
     * Search
     * Font Settings (Serif, Sans Serif)
@@ -199,7 +204,7 @@ The platform [GitBook.com](https://www.gitbook.com/) is like an "Heroku for book
 
 Plugins can be 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 needed to build a book can be installed using: `gitbook install ./`. You can find plugins at [plugins.gitbook.com](plugins.gitbook.com).
+Plugins needed to build a book can be installed using: `gitbook install ./`. You can find plugins at [plugins.gitbook.com](http://plugins.gitbook.com).
 
 
 ## Debugging
@@ -209,3 +214,16 @@ You can use the options `--log=debug` and `--debug` to get better error messages
 ```
 $ gitbook build ./ -- log=debug --debug
 ```
+
+#### How to use the latest commit from GitBook in gitbook-cli
+
+To use the latest commit from `GitBook/gitbook` with `gitbook-cli`:
+
+```
+$ git clone https://github.com/GitbookIO/gitbook.git ./gitbook
+$ gitbook versions:link 2.0.0 ./gitbook
+```
+
+Now the version tag `2.0.0` wil be associated with the `./gitbook` folder.
+
+You can uninstall it using: `gitbook versions:uninstall 2.0.0`.

appveyor.yml

@@ -0,0 +1,29 @@
+# Fix line endings in Windows. (runs before repo cloning)
+init:
+  - git config --global core.autocrlf input
+
+# Test against these versions of Node.js.
+environment:
+  matrix:
+    - nodejs_version: "0.10"
+    - nodejs_version: "0.11"
+
+# Install scripts. (runs after repo cloning)
+install:
+  # Get the latest stable version of Node.js or io.js
+  - ps: Install-Product node $env:nodejs_version
+  # install svgexport
+  - npm install svgexport -g
+  # install modules
+  - npm install
+
+# Post-install test scripts.
+test_script:
+  # Output useful info for debugging.
+  - node --version
+  - npm --version
+  # run tests
+  - npm test
+
+# Don't actually build.
+build: off

bin/gitbook.js

@@ -3,5 +3,5 @@
 var color = require('bash-color');
 
 console.log(color.red("You need to install 'gitbook-cli' to have access to the gitbook command anywhere on your system."));
-console.log(color.red("If you've installe this package globally, you need to uninstall it."));
+console.log(color.red("If you've installed this package globally, you need to uninstall it."));
 console.log(color.red(">> Run 'npm uninstall -g gitbook' then 'npm install -g gitbook-cli'"));

lib/book.js

@@ -10,6 +10,7 @@ var fs = require("./utils/fs");
 var parseNavigation = require("./utils/navigation");
 var parseProgress = require("./utils/progress");
 var pageUtil = require("./utils/page");
+var batch = require("./utils/batch");
 var links = require("./utils/links");
 var logger = require("./utils/logger");
 
@@ -21,68 +22,68 @@ var PluginsList = require("./pluginslist");
 var generators = require("./generators");
 
 var Book = function(root, context, parent) {
-	var that = this;
+    var that = this;
 
-	this.context = _.defaults(context || {}, {
-		// Extend book configuration
-		config: {},
+    this.context = _.defaults(context || {}, {
+        // Extend book configuration
+        config: {},
 
-		// Log function
-		log: function(msg) {
-			process.stdout.write(msg);
-		},
+        // Log function
+        log: function(msg) {
+            process.stdout.write(msg);
+        },
 
-		// Log level
-		logLevel: "info"
-	});
+        // Log level
+        logLevel: "info"
+    });
 
-	// Log
-	this.log = logger(this.context.log, this.context.logLevel);
+    // Log
+    this.log = logger(this.context.log, this.context.logLevel);
 
-	// Root folder of the book
-	this.root = path.resolve(root);
+    // Root folder of the book
+    this.root = path.resolve(root);
 
-	// Parent book
-	this.parent = parent;
+    // Parent book
+    this.parent = parent;
 
-	// Configuration
-	this.config = new Configuration(this, this.context.config);
-	Object.defineProperty(this, "options", {
-		get: function () {
-			return this.config.options;
-		}
-	});
+    // Configuration
+    this.config = new Configuration(this, this.context.config);
+    Object.defineProperty(this, "options", {
+        get: function () {
+            return this.config.options;
+        }
+    });
 
-	// Template
-	this.template = new TemplateEngine(this);
+    // Template
+    this.template = new TemplateEngine(this);
 
-	// Summary
-	this.summary = {};
-	this.navigation = [];
+    // Summary
+    this.summary = {};
+    this.navigation = [];
 
-	// Glossary
-	this.glossary = [];
+    // Glossary
+    this.glossary = [];
 
-	// Langs
-	this.langs = [];
+    // Langs
+    this.langs = [];
 
-	// Sub-books
-	this.books = [];
+    // Sub-books
+    this.books = [];
 
-	// Files in the book
-	this.files = [];
+    // Files in the book
+    this.files = [];
 
-	// List of plugins
-	this.plugins = new PluginsList(this);
+    // List of plugins
+    this.plugins = new PluginsList(this);
 
-	// Structure files
+    // Structure files
     this.summaryFile = null;
     this.glossaryFile = null;
-	this.readmeFile = null;
+    this.readmeFile = null;
     this.langsFile = null;
 
-	// Search Index
-	this.searchIndex = lunr(function () {
+    // Search Index
+    this.searchIndex = lunr(function () {
         this.ref('url');
 
         this.field('title', { boost: 10 });
@@ -90,151 +91,153 @@ var Book = function(root, context, parent) {
     });
 
     // Bind methods
-	_.bindAll(this);
+    _.bindAll(this);
 };
 
 // Initialize and parse the book: config, summary, glossary
 Book.prototype.parse = function() {
-	var that = this;
-	var multilingual = false;
+    var that = this;
+    var multilingual = false;
 
-	return this.parseConfig()
+    return this.parseConfig()
 
-	.then(function() {
-		return that.parsePlugins();
-	})
+    .then(function() {
+        return that.parsePlugins();
+    })
 
-	.then(function() {
-		return that.parseLangs()
-		.then(function() {
-			multilingual = that.langs.length > 0;
-			if (multilingual) that.log.info.ln("Parsing multilingual book, with", that.langs.length, "lanuages");
+    .then(function() {
+        return that.parseLangs()
+        .then(function() {
+            multilingual = that.langs.length > 0;
+            if (multilingual) that.log.info.ln("Parsing multilingual book, with", that.langs.length, "lanuages");
 
-			// Sub-books that inherit from the current book configuration
-			that.books = _.map(that.langs, function(lang) {
-				that.log.info.ln("Preparing language book", lang.lang);
-				return new Book(
-					path.join(that.root, lang.path),
-					_.merge({}, that.context, {
-						config: _.extend({}, that.options, {
-							'output': path.join(that.options.output, lang.lang),
-							'language': lang.lang
-						})
-					}),
-					that
-				)
-			});
-		});
-	})
+            // Sub-books that inherit from the current book configuration
+            that.books = _.map(that.langs, function(lang) {
+                that.log.info.ln("Preparing language book", lang.lang);
+                return new Book(
+                    path.join(that.root, lang.path),
+                    _.merge({}, that.context, {
+                        config: _.extend({}, that.options, {
+                            'output': path.join(that.options.output, lang.lang),
+                            'language': lang.lang
+                        })
+                    }),
+                    that
+                )
+            });
+        });
+    })
 
-	.then(function() {
-		if (multilingual) return;
-		return that.listAllFiles();
-	})
-	.then(function() {
-		if (multilingual) return;
-		return that.parseReadme();
-	})
-	.then(function() {
-		if (multilingual) return;
-		return that.parseSummary();
-	})
-	.then(function() {
-		if (multilingual) return;
-		return that.parseGlossary();
-	})
+    .then(function() {
+        if (multilingual) return;
+        return that.listAllFiles();
+    })
+    .then(function() {
+        if (multilingual) return;
+        return that.parseReadme();
+    })
+    .then(function() {
+        if (multilingual) return;
+        return that.parseSummary();
+    })
+    .then(function() {
+        if (multilingual) return;
+        return that.parseGlossary();
+    })
 
-	.then(function() {
-		// Init sub-books
-		return _.reduce(that.books, function(prev, book) {
-			return prev.then(function() {
-				return book.parse();
-			});
-		}, Q());
-	})
+    .then(function() {
+        // Init sub-books
+        return _.reduce(that.books, function(prev, book) {
+            return prev.then(function() {
+                return book.parse();
+            });
+        }, Q());
+    })
 
-	.thenResolve(this);
+    .thenResolve(this);
 };
 
 // Generate the output
 Book.prototype.generate = function(generator) {
-	var that = this;
-	that.options.generator = generator || that.options.generator;
+    var that = this;
+    that.options.generator = generator || that.options.generator;
 
-	that.log.info.ln("start generation with", that.options.generator, "generator");
-	return Q()
+    that.log.info.ln("start generation with", that.options.generator, "generator");
+    return Q()
 
-	// Clean output folder
-	.then(function() {
+    // Clean output folder
+    .then(function() {
         that.log.info("clean", that.options.generator, "generator");
-		return fs.clean(that.options.output)
+        return fs.clean(that.options.output)
         .progress(function(p) {
             that.log.debug.ln("remove", p.file, "("+p.i+"/"+p.count+")");
         })
         .then(function() {
             that.log.info.ok();
         });
-	})
+    })
 
-	// Create generator
-	.then(function() {
-		var Generator = generators[generator];
-		if (!Generator) throw "Generator '"+that.options.generator+"' doesn't exist";
-		generator = new Generator(that);
+    // Create generator
+    .then(function() {
+        var Generator = generators[generator];
+        if (!Generator) throw "Generator '"+that.options.generator+"' doesn't exist";
+        generator = new Generator(that);
 
-		return generator.prepare();
-	})
+        return generator.prepare();
+    })
 
-	// Generate content
-	.then(function() {
-		if (that.isMultilingual()) {
-			return that.generateMultiLingual(generator);
-		} else {
-			// Separate list of files into the different operations needed
-			var ops = _.groupBy(that.files, function(file) {
-				if (file[file.length -1] == "/") {
-                	return "directories";
+    // Generate content
+    .then(function() {
+        if (that.isMultilingual()) {
+            return that.generateMultiLingual(generator);
+        } else {
+            // Separate list of files into the different operations needed
+            var ops = _.groupBy(that.files, function(file) {
+                if (file[file.length -1] == "/") {
+                    return "directories";
                 } else if (_.contains(parsers.extensions, path.extname(file)) && that.navigation[file]) {
-                	return "content";
+                    return "content";
                 } else {
-                	return "files";
+                    return "files";
                 }
-			});
+            });
 
 
-			return Q()
+            return Q()
 
-			// First, let's create folder
-			.then(function() {
-				return _.reduce(ops["directories"] || [], function(prev, folder) {
-					return prev.then(function() {
-						that.log.debug.ln("transferring folder", folder);
-                    	return Q(generator.transferFolder(folder));
-					});
-				}, Q());
-			})
+            // First, let's create folder
+            .then(function() {
+                return _.reduce(ops["directories"] || [], function(prev, folder) {
+                    return prev.then(function() {
+                        that.log.debug.ln("transferring folder", folder);
+                        return Q(generator.transferFolder(folder));
+                    });
+                }, Q());
+            })
 
-			// Then, let's copy other files
-			.then(function() {
-				return Q.all(_.map(ops["files"] || [], function(file) {
-					that.log.debug.ln("transferring file", file);
+            // Then, let's copy other files
+            .then(function() {
+                return Q.all(_.map(ops["files"] || [], function(file) {
+                    that.log.debug.ln("transferring file", file);
                     return Q(generator.transferFile(file));
-				}));
-			})
+                }));
+            })
 
-			// Finally let's generate content
-			.then(function() {
-				return _.reduce(ops["content"] || [], function(prev, file) {
-					return prev.then(function() {
-						that.log.debug.ln("converting", file);
-	                    return Q(generator.convertFile(file));
-	                });
-				}, Q());
-			});
-		}
-	})
+            // Finally let's generate content
+            .then(function() {
+                var nFiles = (ops["content"] || []).length;
+                return _.reduce(ops["content"] || [], function(prev, file, i) {
+                    return prev.then(function() {
+                        var p = ((i*100)/nFiles).toFixed(0)+"%";
+                        that.log.info.ln("processing", file, p);
+                        return Q(generator.convertFile(file));
+                    });
+                }, Q());
+            });
+        }
+    })
 
-	// Finish generation
+    // Finish generation
     .then(function() {
         return generator.callHook("finish:before");
     })
@@ -245,31 +248,28 @@ Book.prototype.generate = function(generator) {
         return generator.callHook("finish");
     })
     .then(function() {
-    	that.log.info.ln("generation is finished");
+        that.log.info.ln("generation is finished");
     });
 };
 
 // Generate the output for a multilingual book
 Book.prototype.generateMultiLingual = function(generator) {
-	var that = this;
+    var that = this;
 
-	return Q()
-	.then(function() {
-		// Generate sub-books
-		return _.reduce(that.books, function(prev, book) {
-			return prev.then(function() {
-				return book.generate(that.options.generator);
-			});
-		}, Q());
-	})
-	.then(function() {
-		return generator.langsIndex(that.langs);
-	});
+    return Q()
+    .then(function() {
+        // Generate sub-books
+        return _.reduce(that.books, function(prev, book) {
+            return prev.then(function() {
+                return book.generate(that.options.generator);
+            });
+        }, Q());
+    });
 };
 
 // Extract files from ebook generated
 Book.prototype.generateFile = function(output, options) {
-	var book = this;
+    var book = this;
 
     options = _.defaults(options || {}, {
         ebookFormat: path.extname(output).slice(1)
@@ -278,7 +278,7 @@ Book.prototype.generateFile = function(output, options) {
 
     return fs.tmp.dir()
     .then(function(tmpDir) {
-    	book.setOutput(tmpDir);
+        book.setOutput(tmpDir);
 
         return book.generate(options.ebookFormat)
         .then(function(_options) {
@@ -313,7 +313,7 @@ Book.prototype.generateFile = function(output, options) {
                 }
             })
             .then(function(n) {
-            	book.log.info.ok(n+" file(s) generated");
+                book.log.info.ok(n+" file(s) generated");
 
                 return fs.remove(tmpDir);
             });
@@ -323,146 +323,147 @@ Book.prototype.generateFile = function(output, options) {
 
 // Parse configuration
 Book.prototype.parseConfig = function() {
-	var that = this;
+    var that = this;
 
-	that.log.info("loading book configuration....")
-	return that.config.load()
-	.then(function() {
-		that.log.info.ok();
-	});
+    that.log.info("loading book configuration....")
+    return that.config.load()
+    .then(function() {
+        that.log.info.ok();
+    });
 };
 
 // Parse list of plugins
 Book.prototype.parsePlugins = function() {
-	var that = this;
-	var failed = [];
+    var that = this;
+    var failed = [];
 
     // Load plugins
     return that.plugins.load(that.options.plugins)
     .then(function() {
-    	if (_.size(that.plugins.failed) > 0) return Q.reject(new Error("Error loading plugins: "+that.plugins.failed.join(",")+". Run 'gitbook install' to install plugins from NPM."));
+        if (_.size(that.plugins.failed) > 0) return Q.reject(new Error("Error loading plugins: "+that.plugins.failed.join(",")+". Run 'gitbook install' to install plugins from NPM."));
 
-	    that.log.info.ok(that.plugins.count()+" plugins loaded");
-	    that.log.debug.ln("normalize plugins list");
+        that.log.info.ok(that.plugins.count()+" plugins loaded");
+        that.log.debug.ln("normalize plugins list");
     });
 };
 
 // Parse readme to extract defaults title and description
 Book.prototype.parseReadme = function() {
-	var that = this;
-	var structure = that.config.getStructure("readme");
-	that.log.debug.ln("start parsing readme:", structure);
+    var that = this;
+    var structure = that.config.getStructure("readme");
+    that.log.debug.ln("start parsing readme:", structure);
 
-	return that.findFile(structure)
-	.then(function(readme) {
-		if (!readme) throw "No README file";
-		if (!_.contains(that.files, readme.path)) throw "README file is ignored";
+    return that.findFile(structure)
+    .then(function(readme) {
+        if (!readme) throw "No README file";
+        if (!_.contains(that.files, readme.path)) throw "README file is ignored";
 
-		that.readmeFile = readme.path;
+        that.readmeFile = readme.path;
         that._defaultsStructure(that.readmeFile);
 
-		that.log.debug.ln("readme located at", that.readmeFile);
-		return that.template.renderFile(that.readmeFile)
-		.then(function(content) {
-			return readme.parser.readme(content);
-		});
-	})
-	.then(function(readme) {
-		that.options.title = that.options.title || readme.title;
-		that.options.description = that.options.description || readme.description;
-	});
+        that.log.debug.ln("readme located at", that.readmeFile);
+        return that.template.renderFile(that.readmeFile)
+        .then(function(content) {
+            return readme.parser.readme(content);
+        });
+    })
+    .then(function(readme) {
+        that.options.title = that.options.title || readme.title;
+        that.options.description = that.options.description || readme.description;
+    });
 };
 
 
 // Parse langs to extract list of sub-books
 Book.prototype.parseLangs = function() {
-	var that = this;
+    var that = this;
 
-	var structure = that.config.getStructure("langs");
-	that.log.debug.ln("start parsing languages index:", structure);
+    var structure = that.config.getStructure("langs");
+    that.log.debug.ln("start parsing languages index:", structure);
 
-	return that.findFile(structure)
-	.then(function(langs) {
-		if (!langs) return [];
+    return that.findFile(structure)
+    .then(function(langs) {
+        if (!langs) return [];
 
         that.langsFile = langs.path;
         that._defaultsStructure(that.langsFile);
 
-		that.log.debug.ln("languages index located at", that.langsFile);
-		return that.template.renderFile(that.langsFile)
-		.then(function(content) {
-			return langs.parser.langs(content);
-		});
-	})
-	.then(function(langs) {
-		that.langs = langs;
-	});
+        that.log.debug.ln("languages index located at", that.langsFile);
+        return that.template.renderFile(that.langsFile)
+        .then(function(content) {
+            return langs.parser.langs(content);
+        });
+    })
+    .then(function(langs) {
+        that.langs = langs;
+    });
 };
 
 // Parse summary to extract list of chapters
 Book.prototype.parseSummary = function() {
-	var that = this;
+    var that = this;
 
-	var structure = that.config.getStructure("summary");
-	that.log.debug.ln("start parsing summary:", structure);
+    var structure = that.config.getStructure("summary");
+    that.log.debug.ln("start parsing summary:", structure);
 
-	return that.findFile(structure)
-	.then(function(summary) {
-		if (!summary) throw "No SUMMARY file";
+    return that.findFile(structure)
+    .then(function(summary) {
+        if (!summary) throw "No SUMMARY file";
 
-		// Remove the summary from the list of files to parse
+        // Remove the summary from the list of files to parse
         that.summaryFile = summary.path;
         that._defaultsStructure(that.summaryFile);
-		that.files = _.without(that.files, that.summaryFile);
+        that.files = _.without(that.files, that.summaryFile);
 
-		that.log.debug.ln("summary located at", that.summaryFile);
-		return that.template.renderFile(that.summaryFile)
-		.then(function(content) {
-			return summary.parser.summary(content, {
-				entryPoint: that.readmeFile,
-				files: that.files
-			});
-		});
-	})
-	.then(function(summary) {
-		that.summary = summary;
-		that.navigation = parseNavigation(that.summary, that.files);
-	});
+        that.log.debug.ln("summary located at", that.summaryFile);
+        return that.template.renderFile(that.summaryFile)
+        .then(function(content) {
+            return summary.parser.summary(content, {
+                entryPoint: that.readmeFile,
+                entryPointTitle: "",
+                files: that.files
+            });
+        });
+    })
+    .then(function(summary) {
+        that.summary = summary;
+        that.navigation = parseNavigation(that.summary, that.files);
+    });
 };
 
 // Parse glossary to extract terms
 Book.prototype.parseGlossary = function() {
-	var that = this;
+    var that = this;
 
-	var structure = that.config.getStructure("glossary");
-	that.log.debug.ln("start parsing glossary: ", structure);
+    var structure = that.config.getStructure("glossary");
+    that.log.debug.ln("start parsing glossary: ", structure);
 
-	return that.findFile(structure)
-	.then(function(glossary) {
-		if (!glossary) return [];
+    return that.findFile(structure)
+    .then(function(glossary) {
+        if (!glossary) return [];
 
-		// Remove the glossary from the list of files to parse
+        // Remove the glossary from the list of files to parse
         that.glossaryFile = glossary.path;
         that._defaultsStructure(that.glossaryFile);
-		that.files = _.without(that.files, that.glossaryFile);
+        that.files = _.without(that.files, that.glossaryFile);
 
-		that.log.debug.ln("glossary located at", that.glossaryFile);
-		return that.template.renderFile(that.glossaryFile)
-		.then(function(content) {
-			return glossary.parser.glossary(content);
-		});
-	})
-	.then(function(glossary) {
-		that.glossary = glossary;
-	});
+        that.log.debug.ln("glossary located at", that.glossaryFile);
+        return that.template.renderFile(that.glossaryFile)
+        .then(function(content) {
+            return glossary.parser.glossary(content);
+        });
+    })
+    .then(function(glossary) {
+        that.glossary = glossary;
+    });
 };
 
 // Parse a page
 Book.prototype.parsePage = function(filename, options) {
-	var that = this, page = {};
+    var that = this, page = {};
     options = _.defaults(options || {}, {
-    	// Transform svg images
-    	convertImages: false,
+        // Transform svg images
+        convertImages: false,
 
         // Interpolate before templating
         interpolateTemplate: _.identity,
@@ -478,12 +479,12 @@ Book.prototype.parsePage = function(filename, options) {
         });
     };
 
-	that.log.debug.ln("start parsing file", filename);
+    that.log.debug.ln("start parsing file", filename);
 
-	var extension = path.extname(filename);
-	var filetype = parsers.get(extension);
+    var extension = path.extname(filename);
+    var filetype = parsers.get(extension);
 
-	if (!filetype) return Q.reject(new Error("Can't parse file: "+filename));
+    if (!filetype) return Q.reject(new Error("Can't parse file: "+filename));
 
     // Type of parser used
     page.type = filetype.name;
@@ -497,7 +498,7 @@ Book.prototype.parsePage = function(filename, options) {
     // Progress in the book
     page.progress = parseProgress(that.navigation, filename);
 
-	that.log.debug.ln("render template", filename);
+    that.log.debug.ln("render template", filename);
 
     // Read file content
     return that.readFile(page.path)
@@ -507,103 +508,111 @@ Book.prototype.parsePage = function(filename, options) {
         return interpolate(options.interpolateTemplate);
     })
 
+    // Prepare page markup
+    .then(function() {
+        return filetype.page.prepare(page.content)
+        .then(function(content) {
+            page.content = content;
+        });
+    })
+
     // Generate template
     .then(function() {
         return that.template.renderPage(page);
     })
 
-    // Parse markup
+    // Prepare and Parse markup
     .then(function(content) {
         page.content = content;
 
         that.log.debug.ln("use file parser", filetype.name, "for", filename);
-        return filetype.parser.page(page.content);
+        return filetype.page(page.content);
     })
 
     // Post process sections
     .then(function(_page) {
-    	return _.reduce(_page.sections, function(prev, section) {
-    		return prev.then(function(_sections) {
-    			return that.template.postProcess(section.content || "")
-    			.then(function(content) {
-    				section.content = content;
-    				return _sections.concat([section]);
-    			})
-    		});
-    	}, Q([]));
+        return _.reduce(_page.sections, function(prev, section) {
+            return prev.then(function(_sections) {
+                return that.template.postProcess(section.content || "")
+                .then(function(content) {
+                    section.content = content;
+                    return _sections.concat([section]);
+                })
+            });
+        }, Q([]));
     })
 
     // Prepare html
-	.then(function(_sections) {
-		return pageUtil.normalize(_sections, {
-			book: that,
-			convertImages: options.convertImages,
-			input: filename,
+    .then(function(_sections) {
+        return pageUtil.normalize(_sections, {
+            book: that,
+            convertImages: options.convertImages,
+            input: filename,
             navigation: that.navigation,
             base: path.dirname(filename) || './',
             output: path.dirname(filename) || './',
             glossary: that.glossary
         });
-	})
+    })
 
-	// Interpolate output
-	.then(function(_sections) {
-		page.sections = _sections;
-		return interpolate(options.interpolateContent);
-	})
+    // Interpolate output
+    .then(function(_sections) {
+        page.sections = _sections;
+        return interpolate(options.interpolateContent);
+    })
 
-	.then(function() {
-		that.indexPage(page);
-		return page;
-	});
+    .then(function() {
+        that.indexPage(page);
+        return page;
+    });
 };
 
 // Find file that can be parsed with a specific filename
 Book.prototype.findFile = function(filename) {
-	var that = this;
+    var that = this;
 
-	return _.reduce(parsers.extensions, function(prev, ext) {
-		return prev.then(function(output) {
-			// Stop if already find a parser
-			if (output) return output;
+    return _.reduce(parsers.extensions, function(prev, ext) {
+        return prev.then(function(output) {
+            // Stop if already find a parser
+            if (output) return output;
 
-			var filepath = filename+ext;
+            var filepath = filename+ext;
 
-			return that.fileExists(filepath)
-			.then(function(exists) {
-				if (!exists) return null;
-				return {
-					parser: parsers.get(ext).parser,
-					path: filepath
-				};
-			})
-		});
-	}, Q(null));
+            return that.fileExists(filepath)
+            .then(function(exists) {
+                if (!exists) return null;
+                return {
+                    parser: parsers.get(ext),
+                    path: filepath
+                };
+            })
+        });
+    }, Q(null));
 };
 
 // Check if a file exists in the book
 Book.prototype.fileExists = function(filename) {
-	return fs.exists(
-		path.join(this.root, filename)
-	);
+    return fs.exists(
+        path.join(this.root, filename)
+    );
 };
 
 // Read a file
 Book.prototype.readFile = function(filename) {
-	return fs.readFile(
-		path.join(this.root, filename),
-		{ encoding: "utf8" }
-	);
+    return fs.readFile(
+        path.join(this.root, filename),
+        { encoding: "utf8" }
+    );
 };
 
 // Return stat for a file
 Book.prototype.statFile = function(filename) {
-	return fs.stat(path.join(this.root, filename));
+    return fs.stat(path.join(this.root, filename));
 };
 
 // List all files in the book
 Book.prototype.listAllFiles = function() {
-	var that = this;
+    var that = this;
 
     return fs.list(this.root, {
         ignoreFiles: ['.ignore', '.gitignore', '.bookignore'],
@@ -637,18 +646,23 @@ Book.prototype.listAllFiles = function() {
 
 // Return true if the book is a multilingual book
 Book.prototype.isMultilingual = function(filename) {
-	return this.books.length > 0;
+    return this.books.length > 0;
 };
 
 // Return root of the parent
 Book.prototype.parentRoot = function() {
-	if (this.parent) return this.parent.parentRoot();
-	return this.root;
+    if (this.parent) return this.parent.parentRoot();
+    return this.root;
 };
 
 // Return true if it's a sub-book
 Book.prototype.isSubBook = function() {
-	return !!this.parent;
+    return !!this.parent;
+};
+
+// Test if the file is the entry point
+Book.prototype.isEntryPoint = function(fp) {
+    return fp == this.readmeFile;
 };
 
 // Resolve a path in book
@@ -659,7 +673,7 @@ Book.prototype.resolve = function(p) {
 // Normalize a link to .html and convert README -> index
 Book.prototype.contentLink = function(link) {
     if (
-        path.basename(link) == "README"
+        path.basename(link, path.extname(link)) == "README"
         || link == this.readmeFile
     ) {
         link = path.join(path.dirname(link), "index"+path.extname(link));
@@ -671,11 +685,11 @@ Book.prototype.contentLink = function(link) {
 
 // Index a page into the search index
 Book.prototype.indexPage = function(page) {
-	var nav = this.navigation[page.path];
-	if (!nav) return;
+    var nav = this.navigation[page.path];
+    if (!nav) return;
 
-	this.log.debug.ln("index page", page.path);
-	this.searchIndex.add({
+    this.log.debug.ln("index page", page.path);
+    this.searchIndex.add({
         url: this.contentLink(page.path),
         title: nav.title,
         body: pageUtil.extractText(page.sections),
@@ -695,12 +709,12 @@ Book.prototype._defaultsStructure = function(filename) {
 
 // Change output path
 Book.prototype.setOutput = function(p) {
-	var that = this;
-	this.options.output = path.resolve(p);
+    var that = this;
+    this.options.output = path.resolve(p);
 
-	_.each(this.books, function(book) {
-		book.setOutput(path.join(that.options.output, book.options.language));
-	});
+    _.each(this.books, function(book) {
+        book.setOutput(path.join(that.options.output, book.options.language));
+    });
 };
 
 

lib/configuration.js

@@ -5,6 +5,7 @@ var semver = require('semver');
 
 var pkg = require('../package.json');
 var fs = require("./utils/fs");
+var i18n = require("./utils/i18n");
 
 // Default plugins added to each books
 var defaultsPlugins = [];
@@ -63,10 +64,10 @@ function normalizePluginsNames(plugins) {
 var Configuration = function(book, options) {
     var that = this;
 
-	this.book = book;
+    this.book = book;
 
     this.options = _.cloneDeep(Configuration.DEFAULT);
-	this.options = _.merge(this.options, options || {});
+    this.options = _.merge(this.options, options || {});
 
     // options.input == book.root
     Object.defineProperty(this.options, "input", {
@@ -78,15 +79,15 @@ var Configuration = function(book, options) {
 
 // Read and parse the configuration
 Configuration.prototype.load = function() {
-	var that = this;
+    var that = this;
 
-	return Q()
+    return Q()
     .then(function() {
         try {
             var _config = require(path.resolve(that.book.root, that.options.configFile));
             that.options = _.merge(
-            	that.options,
-            	_.omit(_config, 'configFile', 'defaultsPlugins', 'generator', 'extension')
+                that.options,
+                _.omit(_config, 'configFile', 'defaultsPlugins', 'generator', 'extension')
             );
         }
         catch(err) {
@@ -95,17 +96,23 @@ Configuration.prototype.load = function() {
         }
     })
     .then(function() {
+        if (!semver.satisfies(pkg.version, that.options.gitbook)) {
+            throw "GitBook version doesn't satisfy version required by the book: "+that.options.gitbook;
+        }
+        if (that.options.gitbook == "*") {
+            that.book.log.warn.ln("you should specify a gitbook version to use in your book.json, for example: "+(_.first(pkg.version.split("."))+".x.x"));
+        }
+
         that.options.output = path.resolve(that.options.output || path.join(that.book.root, "_book"));
         that.options.plugins = normalizePluginsList(that.options.plugins);
         that.options.defaultsPlugins = normalizePluginsList(that.options.defaultsPlugins || "");
         that.options.plugins = _.union(that.options.plugins, that.options.defaultsPlugins);
         that.options.plugins = _.uniq(that.options.plugins, "name");
 
-        if (!semver.satisfies(pkg.version, that.options.gitbook)) {
-            throw "GitBook version doesn't satisfy version required by the book: "+that.options.gitbook;
-        }
-        if (that.options.gitbook == "*") {
-            that.book.log.warn.ln("you should specify a gitbook version to use in your book.json, for example: "+(_.first(pkg.version.split("."))+".x.x"));
+        // Default value for text direction (from language)
+        if (!that.options.direction) {
+            var lang = i18n.getByLanguage(that.options.language);
+            if (lang) that.options.direction = lang.direction;
         }
 
         that.options.gitbook = pkg.version;
@@ -124,7 +131,7 @@ Configuration.prototype.getStructure = function(name) {
 
 // Return normalized language
 Configuration.prototype.normalizeLanguage = function() {
-    return _.first(this.options.language.split("-")).toLowerCase();
+    return i18n.normalizeLanguage(this.options.language);
 };
 
 
@@ -132,7 +139,7 @@ Configuration.prototype.normalizeLanguage = function() {
 Configuration.DEFAULT = {
     // Options that can't be extend
     "configFile": "book",
-    "generator": "site",
+    "generator": "website",
     "extension": null,
 
     // Book metadats (somes are extracted from the README by default)
@@ -140,6 +147,8 @@ Configuration.DEFAULT = {
     "description": null,
     "isbn": null,
     "language": "en",
+    "direction": null,
+    "author": null,
 
     // version of gitbook to use
     "gitbook": "*",
@@ -219,8 +228,8 @@ Configuration.DEFAULT = {
         "margin": {
             "right": 62,
             "left": 62,
-            "top": 36,
-            "bottom": 36
+            "top": 56,
+            "bottom": 56
         },
 
         //Header HTML template. Available variables: _PAGENUM_, _TITLE_, _AUTHOR_ and _SECTION_.

lib/generator.js

@@ -70,11 +70,6 @@ BaseGenerator.prototype.copyCover = function() {
     });
 };
 
-// Generate the langs index
-BaseGenerator.prototype.langsIndex = function(langs) {
-    return Q.reject(new Error("Langs index is not supported in this generator"));
-};
-
 // At teh end of the generation
 BaseGenerator.prototype.finish = function() {
     return Q.reject(new Error("Could not finish generation"));

lib/generators/ebook.js

@@ -30,7 +30,7 @@ Generator.prototype.prepareTemplates = function() {
     this.templates["summary"] = this.book.plugins.template("ebook:summary") || path.resolve(this.options.theme, 'templates/ebook/summary.html');
     this.templates["glossary"] = this.book.plugins.template("ebook:glossary") || path.resolve(this.options.theme, 'templates/ebook/glossary.html');
 
-	return Q();
+    return Q();
 };
 
 // Generate table of contents
@@ -41,18 +41,14 @@ Generator.prototype.writeSummary = function() {
     return this._writeTemplate(this.templates["summary"], {}, path.join(this.options.output, "SUMMARY.html"));
 };
 
-
-Generator.prototype.langsIndex = function(langs) {
-    return Q();
-};
-
 Generator.prototype.finish = function() {
     var that = this;
 
-    return BaseGenerator.prototype.finish.apply(this)
-    .then(function() {
-    	return that.writeSummary();
-    })
+    return Q()
+    .then(this.copyAssets)
+    .then(this.copyCover)
+    .then(this.writeGlossary)
+    .then(this.writeSummary)
     .then(function() {
         if (!that.ebookFormat) return Q();
 
@@ -68,6 +64,8 @@ Generator.prototype.finish = function() {
             "--comments": that.options.description,
             "--isbn": that.options.isbn,
             "--authors": that.options.author,
+            "--language": that.options.language,
+            "--book-producer": "GitBook",
             "--publisher": "GitBook",
             "--chapter": "descendant-or-self::*[contains(concat(' ', normalize-space(@class), ' '), ' book-chapter ')]",
             "--chapter-mark": "pagebreak",
@@ -92,8 +90,12 @@ Generator.prototype.finish = function() {
                 "--pdf-mono-font-size": String(pdfOptions.fontSize),
                 "--paper-size": String(pdfOptions.paperSize),
                 "--pdf-page-numbers": Boolean(pdfOptions.pageNumbers),
-                "--pdf-header-template": String(pdfOptions.headerTemplate),
-                "--pdf-footer-template": String(pdfOptions.footerTemplate)
+                "--pdf-header-template": String(pdfOptions.headerTemplate) || "<p class='header'><span>"+that.options.title+"</span></p>",
+                "--pdf-footer-template": String(pdfOptions.footerTemplate) || "<p class='footer'><span>_SECTION_</span> <span style='float:right;'>_PAGENUM_</span></p>"
+            });
+        } else if (that.ebookFormat == "epub") {
+            _.extend(_options, {
+                "--dont-split-on-page-breaks": true
             });
         }
 

lib/generators/index.js

@@ -2,10 +2,10 @@ var _ = require("lodash");
 var EbookGenerator = require("./ebook");
 
 module.exports = {
-	json: require("./json"),
-	website: require("./website"),
-	ebook: EbookGenerator,
-	pdf: _.partialRight(EbookGenerator, "pdf"),
-	mobi: _.partialRight(EbookGenerator, "mobi"),
-	epub: _.partialRight(EbookGenerator, "epub")
+    json: require("./json"),
+    website: require("./website"),
+    ebook: EbookGenerator,
+    pdf: _.partialRight(EbookGenerator, "pdf"),
+    mobi: _.partialRight(EbookGenerator, "mobi"),
+    epub: _.partialRight(EbookGenerator, "epub")
 };

lib/generators/json.js

@@ -14,7 +14,6 @@ util.inherits(Generator, BaseGenerator);
 
 // Ignore some methods
 Generator.prototype.transferFile = function(input) { };
-Generator.prototype.finish = function() { };
 
 // Convert an input file
 Generator.prototype.convertFile = function(input) {
@@ -37,21 +36,26 @@ Generator.prototype.convertFile = function(input) {
     });
 };
 
-// Generate languages index
-// Contains the first languages readme and langs infos
-Generator.prototype.langsIndex = function(langs) {
+// Finish generation
+Generator.prototype.finish = function() {
+    return this.writeReadme();
+};
+
+// Write README.json
+Generator.prototype.writeReadme = function() {
     var that = this;
-
-    if (langs.length == 0) return Q.reject("Need at least one language");
-
-    var mainLang = _.first(langs).lang;
-    var readme = links.changeExtension(that.book.readmeFile, ".json");
+    var mainlang, langs;
 
     return Q()
     .then(function() {
+        langs = that.book.langs;
+        mainLang = langs.length > 0? _.first(langs).lang : null;
+
+        readme = links.changeExtension(that.book.readmeFile, ".json");
+
         // Read readme from main language
         return fs.readFile(
-            path.join(that.options.output, mainLang, readme)
+            mainLang? path.join(that.options.output, mainLang, readme) : path.join(that.options.output, readme)
         );
     })
     .then(function(content) {

lib/generators/website.js

@@ -12,6 +12,7 @@ var fs = require("../utils/fs");
 var BaseGenerator = require("../generator");
 var links = require("../utils/links");
 var pageUtil = require("../utils/page");
+var i18n = require("../utils/i18n");
 
 var pkg = require("../../package.json");
 
@@ -63,31 +64,23 @@ Generator.prototype.prepareStyles = function() {
 
 // Prepare templates
 Generator.prototype.prepareTemplates = function() {
-	this.templates["page"] = this.book.plugins.template("site:page") || path.resolve(this.options.theme, 'templates/website/page.html');
+    this.templates["page"] = this.book.plugins.template("site:page") || path.resolve(this.options.theme, 'templates/website/page.html');
     this.templates["langs"] = this.book.plugins.template("site:langs") || path.resolve(this.options.theme, 'templates/website/langs.html');
     this.templates["glossary"] = this.book.plugins.template("site:glossary") || path.resolve(this.options.theme, 'templates/website/glossary.html');
 
-	return Q();
+    return Q();
 };
 
 // Prepare template engine
 Generator.prototype.prepareTemplateEngine = function() {
     var that = this;
 
-    return fs.readdir(path.resolve(__dirname, "../../theme/i18n"))
-    .then(function(locales) {
+    return Q()
+    .then(function() {
         var language = that.book.config.normalizeLanguage();
 
-        locales = _.chain(locales)
-            .map(function(local) {
-                local = path.basename(local, ".json");
-                return [local, require("../../theme/i18n/"+local)];
-            })
-            .object()
-            .value();
-
-        if (!_.contains(_.keys(locales), language) && language != "en") {
-            that.book.log.warn.ln("Language '"+language+"' is not available as a layout locales (en, "+_.keys(locales).join(", ")+")");
+        if (!i18n.getByLanguage(language) && language != "en") {
+            that.book.log.warn.ln("Language '"+language+"' is not available as a layout locales (en, "+i18n.getLanguages().join(", ")+")");
         }
 
         var folders = _.chain(that.templates)
@@ -114,7 +107,7 @@ Generator.prototype.prepareTemplateEngine = function() {
         that.env.addExtension('FilterExtension', new FilterExtension(that.env));
         that.env.addExtension('I18nExtension', new I18nExtension({
             env: that.env,
-            translations: locales,
+            translations: i18n.getLocales(),
             locale: "language"
         }));
     });
@@ -125,7 +118,8 @@ Generator.prototype.finish = function() {
     return this.copyAssets()
     .then(this.copyCover)
     .then(this.writeGlossary)
-    .then(this.writeSearchIndex);
+    .then(this.writeSearchIndex)
+    .then(this.writeLangsIndex)
 };
 
 // Convert an input file
@@ -148,7 +142,7 @@ Generator.prototype.convertFile = function(input) {
         var basePath = path.relative(path.dirname(output), that.options.output) || ".";
         if (process.platform === 'win32') basePath = basePath.replace(/\\/g, '/');
 
-        that.book.log.info.ln("write parsed file", page.path, "to", relativeOutput);
+        that.book.log.debug.ln("write parsed file", page.path, "to", relativeOutput);
 
         return that._writeTemplate(that.templates["page"], {
             progress: page.progress,
@@ -163,11 +157,11 @@ Generator.prototype.convertFile = function(input) {
 };
 
 // Write the index for langs
-Generator.prototype.langsIndex = function(langs) {
+Generator.prototype.writeLangsIndex = function() {
     var that = this;
-
+    if (!this.book.langs.length) return Q();
     return this._writeTemplate(this.templates["langs"], {
-        langs: langs
+        langs: this.book.langs
     }, path.join(this.options.output, "index.html"));
 };
 
@@ -219,38 +213,38 @@ Generator.prototype._writeTemplate = function(tpl, options, output, interpolate)
     interpolate = interpolate || _.identity;
     return Q()
     .then(function(sections) {
-    	return that.env.render(
-    		tpl,
-    		_.extend({
+        return that.env.render(
+            tpl,
+            _.extend({
                 gitbook: {
                     version: pkg.version
                 },
 
-	            styles: that.styles,
+                styles: that.styles,
 
-	            revision: that.revision,
+                revision: that.revision,
 
-	            title: that.options.title,
-	            description: that.options.description,
+                title: that.options.title,
+                description: that.options.description,
                 language: that.book.config.normalizeLanguage(),
 
-	            glossary: that.book.glossary,
+                glossary: that.book.glossary,
 
-	            summary: that.book.summary,
-	            allNavigation: that.book.navigation,
+                summary: that.book.summary,
+                allNavigation: that.book.navigation,
 
-	            plugins: {
+                plugins: {
                     resources: that.book.plugins.resources(that.namespace)
                 },
-	            pluginsConfig: JSON.stringify(that.options.pluginsConfig),
-	            htmlSnippet: _.partial(_.partialRight(that.book.plugins.html, that, options), that.namespace),
+                pluginsConfig: JSON.stringify(that.options.pluginsConfig),
+                htmlSnippet: _.partial(_.partialRight(that.book.plugins.html, that, options), that.namespace),
 
-	            options: that.options,
+                options: that.options,
 
                 basePath: ".",
                 staticBase: path.join(".", "gitbook"),
-	        }, options)
-	    );
+            }, options)
+        );
     })
     .then(interpolate)
     .then(function(html) {

lib/index.js

@@ -1,7 +1,7 @@
 var Q = require("q");
 var _ = require("lodash");
 var path = require("path");
-var tinylr = require('tiny-lr-fork');
+var tinylr = require('tiny-lr');
 var color = require('bash-color');
 
 var Book = require("./book");
@@ -12,199 +12,199 @@ var watch = require("./utils/watch");
 var logger = require("./utils/logger");
 
 var LOG_OPTION = {
-	name: "log",
-	description: "Minimum log level to display",
-	values: _.chain(logger.LEVELS).keys().map(stringUtils.toLowerCase).value(),
-	defaults: "info"
+    name: "log",
+    description: "Minimum log level to display",
+    values: _.chain(logger.LEVELS).keys().map(stringUtils.toLowerCase).value(),
+    defaults: "info"
 };
 
 var FORMAT_OPTION = {
-	name: "format",
-	description: "Format to build to",
-	values: ["website", "json", "ebook"],
-	defaults: "website"
+    name: "format",
+    description: "Format to build to",
+    values: ["website", "json", "ebook"],
+    defaults: "website"
 };
 
 module.exports = {
-	Book: Book,
-	LOG_LEVELS: logger.LEVELS,
+    Book: Book,
+    LOG_LEVELS: logger.LEVELS,
 
-	commands: _.flatten([
-		{
-			name: "build [book] [output]",
-			description: "build a book",
-			options: [
-				FORMAT_OPTION,
-				LOG_OPTION
-			],
-			exec: function(args, kwargs) {
-				var input = args[0] || process.cwd();
-				var output = args[1] || path.join(input, "_book");
+    commands: _.flatten([
+        {
+            name: "build [book] [output]",
+            description: "build a book",
+            options: [
+                FORMAT_OPTION,
+                LOG_OPTION
+            ],
+            exec: function(args, kwargs) {
+                var input = args[0] || process.cwd();
+                var output = args[1] || path.join(input, "_book");
 
-				var book = new Book(input, _.extend({}, {
-					'config': {
-						'output': output
-					},
-					'logLevel': kwargs.log
-				}));
+                var book = new Book(input, _.extend({}, {
+                    'config': {
+                        'output': output
+                    },
+                    'logLevel': kwargs.log
+                }));
 
-				return book.parse()
-				.then(function() {
-					return book.generate(kwargs.format);
-				})
-				.then(function(){
-					console.log("");
-					console.log(color.green("Done, without error"));
-				});
-			}
-		},
+                return book.parse()
+                .then(function() {
+                    return book.generate(kwargs.format);
+                })
+                .then(function(){
+                    console.log("");
+                    console.log(color.green("Done, without error"));
+                });
+            }
+        },
 
-		_.map(["pdf", "epub", "mobi"], function(ebookType) {
-			return {
-				name: ebookType+" [book] [output]",
-				description: "build a book to "+ebookType,
-				options: [
-					LOG_OPTION
-				],
-				exec: function(args, kwargs) {
-					var input = args[0] || process.cwd();
-					var output = args[1];
+        _.map(["pdf", "epub", "mobi"], function(ebookType) {
+            return {
+                name: ebookType+" [book] [output]",
+                description: "build a book to "+ebookType,
+                options: [
+                    LOG_OPTION
+                ],
+                exec: function(args, kwargs) {
+                    var input = args[0] || process.cwd();
+                    var output = args[1];
 
-					var book = new Book(input, _.extend({}, {
-						'logLevel': kwargs.log
-					}));
+                    var book = new Book(input, _.extend({}, {
+                        'logLevel': kwargs.log
+                    }));
 
-					return book.parse()
-					.then(function() {
-						return book.generateFile(output, {
-							ebookFormat: ebookType
-						});
-					})
-					.then(function(){
-						console.log("");
-						console.log(color.green("Done, without error"));
-					});
-				}
-			};
-		}),
+                    return book.parse()
+                    .then(function() {
+                        return book.generateFile(output, {
+                            ebookFormat: ebookType
+                        });
+                    })
+                    .then(function(){
+                        console.log("");
+                        console.log(color.green("Done, without error"));
+                    });
+                }
+            };
+        }),
 
-		{
-			name: "serve [book]",
-			description: "Build then serve a gitbook from a directory",
-			options: [
-				{
-					name: "port",
-					description: "Port for server to listen on",
-					defaults: 4000
-				},
-				{
-					name: "lrport",
-					description: "Port for livereload server to listen on",
-					defaults: 35729
-				},
-				{
-					name: "watch",
-					description: "Enable/disable file watcher",
-					defaults: true
-				},
-				FORMAT_OPTION,
-				LOG_OPTION
-			],
-			exec: function(args, kwargs) {
-				var input = args[0] || process.cwd();
-				var server = new Server();
+        {
+            name: "serve [book]",
+            description: "Build then serve a gitbook from a directory",
+            options: [
+                {
+                    name: "port",
+                    description: "Port for server to listen on",
+                    defaults: 4000
+                },
+                {
+                    name: "lrport",
+                    description: "Port for livereload server to listen on",
+                    defaults: 35729
+                },
+                {
+                    name: "watch",
+                    description: "Enable/disable file watcher",
+                    defaults: true
+                },
+                FORMAT_OPTION,
+                LOG_OPTION
+            ],
+            exec: function(args, kwargs) {
+                var input = args[0] || process.cwd();
+                var server = new Server();
 
-				// Init livereload server
-				var lrServer = tinylr({});
-				var lrPath = undefined;
+                // Init livereload server
+                var lrServer = tinylr({});
+                var lrPath = undefined;
 
-				var generate = function() {
-			        if (server.isRunning()) console.log("Stopping server");
+                var generate = function() {
+                    if (server.isRunning()) console.log("Stopping server");
 
-			        return server.stop()
-			        .then(function() {
-			        	var book = new Book(input, _.extend({}, {
-							'config': {
-								'defaultsPlugins': ["livereload"]
-							},
-							'logLevel': kwargs.log
-						}));
+                    return server.stop()
+                    .then(function() {
+                        var book = new Book(input, _.extend({}, {
+                            'config': {
+                                'defaultsPlugins': ["livereload"]
+                            },
+                            'logLevel': kwargs.log
+                        }));
 
-						return book.parse()
-						.then(function() {
-							return book.generate(kwargs.format);
-						})
-						.thenResolve(book);
-			        })
-			        .then(function(book) {
-			            console.log();
-			            console.log('Starting server ...');
-			            return server.start(book.options.output, kwargs.port)
-			            .then(function() {
-			                console.log('Serving book on http://localhost:'+kwargs.port);
+                        return book.parse()
+                        .then(function() {
+                            return book.generate(kwargs.format);
+                        })
+                        .thenResolve(book);
+                    })
+                    .then(function(book) {
+                        console.log();
+                        console.log('Starting server ...');
+                        return server.start(book.options.output, kwargs.port)
+                        .then(function() {
+                            console.log('Serving book on http://localhost:'+kwargs.port);
 
-			                if (lrPath) {
-			                	// trigger livereload
-			                	lrServer.changed({
-			                		body: {
-			                			files: [lrPath]
-			                		}
-			                	});
-			                }
+                            if (lrPath) {
+                                // trigger livereload
+                                lrServer.changed({
+                                    body: {
+                                        files: [lrPath]
+                                    }
+                                });
+                            }
 
-			                if (!kwargs.watch) return;
+                            if (!kwargs.watch) return;
 
-			                return watch(book.root)
-			                .then(function(filepath) {
-			                    // set livereload path
-			                    lrPath = filepath;
-			                    console.log("Restart after change in files");
-			                    console.log('');
-			                    return generate();
-			                })
-			            })
-			        });
-			    };
+                            return watch(book.root)
+                            .then(function(filepath) {
+                                // set livereload path
+                                lrPath = filepath;
+                                console.log("Restart after change in files");
+                                console.log('');
+                                return generate();
+                            })
+                        })
+                    });
+                };
 
-				return Q.nfcall(lrServer.listen.bind(lrServer), kwargs.lrport)
-				.then(function() {
-					console.log('Live reload server started on port:', kwargs.lrport);
-					console.log('Press CTRL+C to quit ...');
-    				console.log('')
-					return generate();
-				});
-			}
-		},
+                return Q.nfcall(lrServer.listen.bind(lrServer), kwargs.lrport)
+                .then(function() {
+                    console.log('Live reload server started on port:', kwargs.lrport);
+                    console.log('Press CTRL+C to quit ...');
+                    console.log('')
+                    return generate();
+                });
+            }
+        },
 
-		{
-			name: "install [book]",
-			description: "install plugins dependencies",
-			exec: function(args, kwargs) {
-				var input = args[0] || process.cwd();
+        {
+            name: "install [book]",
+            description: "install plugins dependencies",
+            exec: function(args, kwargs) {
+                var input = args[0] || process.cwd();
 
-				var book = new Book(input);
+                var book = new Book(input);
 
-				return book.config.load()
-				.then(function() {
-					return book.plugins.install();
-				})
-				.then(function(){
-					console.log("");
-					console.log(color.green("Done, without error"));
-				});
-			}
-		},
+                return book.config.load()
+                .then(function() {
+                    return book.plugins.install();
+                })
+                .then(function(){
+                    console.log("");
+                    console.log(color.green("Done, without error"));
+                });
+            }
+        },
 
-		{
-			name: "init [directory]",
-			description: "create files and folders based on contents of SUMMARY.md",
-			exec: function(args, kwargs) {
-				return Book.init(args[0] || process.cwd())
-				.then(function(){
-					console.log("");
-					console.log(color.green("Done, without error"));
-				});
-			}
-		}
-	])
+        {
+            name: "init [directory]",
+            description: "create files and folders based on contents of SUMMARY.md",
+            exec: function(args, kwargs) {
+                return Book.init(args[0] || process.cwd())
+                .then(function(){
+                    console.log("");
+                    console.log(color.green("Done, without error"));
+                });
+            }
+        }
+    ])
 };

lib/pluginslist.js

@@ -8,113 +8,113 @@ var Plugin = require("./plugin");
 var pkg = require("../package.json");
 
 var initNPM = _.memoize(function() {
-	return Q.nfcall(npm.load, { silent: true, loglevel: 'silent' });
+    return Q.nfcall(npm.load, { silent: true, loglevel: 'silent' });
 });
 
 
 var PluginsList = function(book, plugins) {
-	this.book = book;
-	this.log = this.book.log;
+    this.book = book;
+    this.log = this.book.log;
 
-	// List of Plugin objects
-	this.list = [];
+    // List of Plugin objects
+    this.list = [];
 
-	// List of names of failed plugins
-	this.failed = [];
+    // List of names of failed plugins
+    this.failed = [];
 
-	// Namespaces
-	this.namespaces = _.chain(["website", "ebook"])
-		.map(function(namespace) {
-			return [
-				namespace,
-				{
-					html: {},
-					resources: _.chain(Plugin.RESOURCES)
-						.map(function(type) {
-							return [type, []];
-						})
-						.object()
-						.value()
-				}
-			];
-		})
-		.object()
-		.value();
+    // Namespaces
+    this.namespaces = _.chain(["website", "ebook"])
+        .map(function(namespace) {
+            return [
+                namespace,
+                {
+                    html: {},
+                    resources: _.chain(Plugin.RESOURCES)
+                        .map(function(type) {
+                            return [type, []];
+                        })
+                        .object()
+                        .value()
+                }
+            ];
+        })
+        .object()
+        .value();
 
-	// Bind methods
-	_.bindAll(this);
+    // Bind methods
+    _.bindAll(this);
 
-	if (plugins) this.load(plugins);
+    if (plugins) this.load(plugins);
 };
 
 // return count of plugins
 PluginsList.prototype.count = function() {
-	return this.list.length;
+    return this.list.length;
 };
 
 // Add and load a plugin
 PluginsList.prototype.load = function(plugin, options) {
-	var that = this;
+    var that = this;
 
-	if (_.isArray(plugin)) {
-		return _.reduce(plugin, function(prev, p) {
-			return prev.then(function() {
-				return that.load(p);
-			});
-		}, Q());
-	}
-	if (_.isObject(plugin) && !(plugin instanceof Plugin)) plugin = plugin.name;
-	if (_.isString(plugin)) plugin = new Plugin(this.book, plugin);
+    if (_.isArray(plugin)) {
+        return _.reduce(plugin, function(prev, p) {
+            return prev.then(function() {
+                return that.load(p);
+            });
+        }, Q());
+    }
+    if (_.isObject(plugin) && !(plugin instanceof Plugin)) plugin = plugin.name;
+    if (_.isString(plugin)) plugin = new Plugin(this.book, plugin);
 
-	that.log.info("load plugin", plugin.name, "....");
-	if (!plugin.isValid()) {
-    	that.log.info.fail();
-    	that.failed.push(plugin.name);
-    	return Q();
+    that.log.info("load plugin", plugin.name, "....");
+    if (!plugin.isValid()) {
+        that.log.info.fail();
+        that.failed.push(plugin.name);
+        return Q();
     } else {
-    	that.log.info.ok();
+        that.log.info.ok();
 
-    	// Push in the list
-    	that.list.push(plugin);
+        // Push in the list
+        that.list.push(plugin);
     }
 
-	// Extract filters
-	_.each(plugin.getFilters(), function(filterFunc, filterName) {
+    // Extract filters
+    _.each(plugin.getFilters(), function(filterFunc, filterName) {
         that.book.template.addFilter(filterName, filterFunc);
     });
 
     // Extract blocks
-	_.each(plugin.getBlocks(), function(block, blockName) {
+    _.each(plugin.getBlocks(), function(block, blockName) {
         that.book.template.addBlock(blockName, block);
     });
 
-	return _.reduce(_.keys(that.namespaces), function(prev, namespaceName) {
-		return prev.then(function() {
-			return plugin.getResources(namespaceName)
-			.then(function(plResources) {
-				var namespace = that.namespaces[namespaceName];
+    return _.reduce(_.keys(that.namespaces), function(prev, namespaceName) {
+        return prev.then(function() {
+            return plugin.getResources(namespaceName)
+            .then(function(plResources) {
+                var namespace = that.namespaces[namespaceName];
 
-				// Extract js and css
-				_.each(Plugin.RESOURCES, function(resourceType) {
-					namespace.resources[resourceType] = (namespace.resources[resourceType] || []).concat(plResources[resourceType] || []);
-				});
+                // Extract js and css
+                _.each(Plugin.RESOURCES, function(resourceType) {
+                    namespace.resources[resourceType] = (namespace.resources[resourceType] || []).concat(plResources[resourceType] || []);
+                });
 
-		        // Map of html resources by name added by each plugin
-		        _.each(plResources.html || {}, function(value, tag) {
-		        	// Turn into function if not one already
-		           	if (!_.isFunction(value)) value = _.constant(value);
+                // Map of html resources by name added by each plugin
+                _.each(plResources.html || {}, function(value, tag) {
+                    // Turn into function if not one already
+                    if (!_.isFunction(value)) value = _.constant(value);
 
-		        	namespace.html[tag] = namespace.html[tag] || [];
-		        	namespace.html[tag].push(value);
-		        });
-			})
-		});
-	}, Q());
+                    namespace.html[tag] = namespace.html[tag] || [];
+                    namespace.html[tag].push(value);
+                });
+            })
+        });
+    }, Q());
 };
 
 // Call a hook
 PluginsList.prototype.hook = function(name, data) {
-	return _.reduce(this.list, function(prev, plugin) {
+    return _.reduce(this.list, function(prev, plugin) {
         return prev.then(function(ret) {
             return plugin.callHook(name, ret);
         });
@@ -123,7 +123,7 @@ PluginsList.prototype.hook = function(name, data) {
 
 // Return a template from a plugin
 PluginsList.prototype.template = function(name) {
-	var withTpl = _.find(this.list, function(plugin) {
+    var withTpl = _.find(this.list, function(plugin) {
         return (
             plugin.infos.templates &&
             plugin.infos.templates[name]
@@ -136,7 +136,7 @@ PluginsList.prototype.template = function(name) {
 
 // Return an html snippet
 PluginsList.prototype.html = function(namespace, tag, context, options) {
-	var htmlSnippets = this.namespaces[namespace].html[tag];
+    var htmlSnippets = this.namespaces[namespace].html[tag];
     return _.map(htmlSnippets || [], function(code) {
         return code.call(context, options);
     }).join("\n");
@@ -144,13 +144,13 @@ PluginsList.prototype.html = function(namespace, tag, context, options) {
 
 // Return a resources map for a namespace
 PluginsList.prototype.resources = function(namespace) {
-	return this.namespaces[namespace].resources;
+    return this.namespaces[namespace].resources;
 };
 
 // Install plugins from a book
 PluginsList.prototype.install = function() {
-	var that = this;
-	var defaultsPlugins = _.pluck(that.book.options.defaultsPlugins)
+    var that = this;
+    var defaultsPlugins = _.pluck(that.book.options.defaultsPlugins)
 
     // Remove defaults (no need to install)
     var plugins = _.filter(that.book.options.plugins, function(plugin) {
@@ -167,51 +167,51 @@ PluginsList.prototype.install = function() {
 
             // Resolve version if needed
             .then(function() {
-            	if (plugin.version) return plugin.version;
+                if (plugin.version) return plugin.version;
 
-            	that.book.log.info.ln("No version specified, resolve plugin", plugin.name);
-            	return initNPM()
-            	.then(function() {
-            		return Q.nfcall(npm.commands.view, [fullname+"@*", "engines"], true);
-            	})
-            	.then(function(versions) {
-            		return _.chain(versions)
-            			.pairs()
-            			.map(function(v) {
-            				return {
-            					version: v[0],
-            					gitbook: (v[1].engines || {})["gitbook"]
-            				}
-            			})
-            			.filter(function(v) {
-            				return v.gitbook && semver.satisfies(pkg.version, v.gitbook);
-            			})
-            			.sort(function(v1, v2) {
-            				return semver.lt(v1.version, v2.version)? 1 : -1;
-            			})
-            			.pluck("version")
-            			.first()
-            			.value();
-            	});
+                that.book.log.info.ln("No version specified, resolve plugin", plugin.name);
+                return initNPM()
+                .then(function() {
+                    return Q.nfcall(npm.commands.view, [fullname+"@*", "engines"], true);
+                })
+                .then(function(versions) {
+                    return _.chain(versions)
+                        .pairs()
+                        .map(function(v) {
+                            return {
+                                version: v[0],
+                                gitbook: (v[1].engines || {})["gitbook"]
+                            }
+                        })
+                        .filter(function(v) {
+                            return v.gitbook && semver.satisfies(pkg.version, v.gitbook);
+                        })
+                        .sort(function(v1, v2) {
+                            return semver.lt(v1.version, v2.version)? 1 : -1;
+                        })
+                        .pluck("version")
+                        .first()
+                        .value();
+                });
             })
 
             // Install the plugin with the resolved version
             .then(function(version) {
-            	if (!version) {
-            		throw "Found no satisfactory version for plugin "+plugin.name;
-            	}
+                if (!version) {
+                    throw "Found no satisfactory version for plugin "+plugin.name;
+                }
 
-            	that.book.log.info.ln("install plugin", plugin.name, "from npm ("+fullname+") with version", version);
-	            return Q.nfcall(npmi, {
-	                'name': fullname,
-	                'version': version,
-	                'path': that.book.root,
-	                'npmLoad': {
-	                    'loglevel': 'silent',
-	                    'loaded': true,
-	                    'prefix': that.book.root
-	                }
-	            });
+                that.book.log.info.ln("install plugin", plugin.name, "from npm ("+fullname+") with version", version);
+                return Q.nfcall(npmi, {
+                    'name': fullname,
+                    'version': version,
+                    'path': that.book.root,
+                    'npmLoad': {
+                        'loglevel': 'silent',
+                        'loaded': true,
+                        'prefix': that.book.root
+                    }
+                });
             })
             .then(function() {
                 that.book.log.info.ok("plugin", plugin.name, "installed with success");

lib/template.js

@@ -6,36 +6,37 @@ var nunjucks = require("nunjucks");
 var git = require("./utils/git");
 var stringUtils = require("./utils/string");
 var fs = require("./utils/fs");
+var batch = require("./utils/batch");
 var pkg = require("../package.json");
 
 
 // The loader should handle relative and git url
 var BookLoader = nunjucks.Loader.extend({
-	async: true,
+    async: true,
 
     init: function(book) {
-    	this.book = book;
+        this.book = book;
     },
 
     getSource: function(fileurl, callback) {
-    	var that = this;
+        var that = this;
 
-		git.resolveFile(fileurl)
-		.then(function(filepath) {
-			// Is local file
-			if (!filepath) filepath = path.resolve(that.book.root, fileurl);
-			else that.book.log.debug.ln("resolve from git", fileurl, "to", filepath)
+        git.resolveFile(fileurl)
+        .then(function(filepath) {
+            // Is local file
+            if (!filepath) filepath = path.resolve(that.book.root, fileurl);
+            else that.book.log.debug.ln("resolve from git", fileurl, "to", filepath)
 
-			//  Read file from absolute path
-			return fs.readFile(filepath)
-    		.then(function(source) {
-    			return {
-    				src: source.toString(),
-    				path: filepath
-    			}
-    		});
-		})
-		.nodeify(callback);
+            //  Read file from absolute path
+            return fs.readFile(filepath)
+            .then(function(source) {
+                return {
+                    src: source.toString(),
+                    path: filepath
+                }
+            });
+        })
+        .nodeify(callback);
     },
 
     resolve: function(from, to) {
@@ -45,27 +46,27 @@ var BookLoader = nunjucks.Loader.extend({
 
 
 var TemplateEngine = function(book) {
-	this.book = book;
+    this.book = book;
     this.log = this.book.log;
 
-	// Nunjucks env
-	this.env = new nunjucks.Environment(
-		new BookLoader(book),
-		{
-			// Escaping is done after by the markdown parser
-			autoescape: false,
+    // Nunjucks env
+    this.env = new nunjucks.Environment(
+        new BookLoader(book),
+        {
+            // Escaping is done after by the markdown parser
+            autoescape: false,
 
-			// Tags
-			tags: {
-				blockStart: '{%',
-				blockEnd: '%}',
-				variableStart: '{{',
-				variableEnd: '}}',
-				commentStart: '{###',
-				commentEnd: '###}'
-			}
-		}
-	);
+            // Tags
+            tags: {
+                blockStart: '{%',
+                blockEnd: '%}',
+                variableStart: '{{',
+                variableEnd: '}}',
+                commentStart: '{###',
+                commentEnd: '###}'
+            }
+        }
+    );
 
     // List of tags shortcuts
     this.shortcuts = [];
@@ -87,18 +88,21 @@ TemplateEngine.prototype.processBlock = function(blk) {
     if (_.isString(blk)) blk = { body: blk };
 
     blk = _.defaults(blk, {
-        parse: false
+        parse: false,
+        post: undefined
     });
     blk.id = _.uniqueId("blk");
 
+    var toAdd = (!blk.parse) || (blk.post != undefined);
+
+    // Add to global map
+    if (toAdd) this.blocks[blk.id] = blk;
+
     //Parsable block, just return it
     if (blk.parse) {
         return blk.body;
     }
 
-    // Add to global map
-    this.blocks[blk.id] = blk;
-
     // Return it as a macro
     return "%+%"+blk.id+"%+%";
 };
@@ -114,9 +118,6 @@ TemplateEngine.prototype.replaceBlocks = function(content) {
 
         var body = blk.body;
 
-        // Remove it from map
-        delete that.blocks[key];
-
         return body;
     });
 };
@@ -239,21 +240,25 @@ TemplateEngine.prototype.addBlock = function(name, block) {
             var args = Array.prototype.slice.call(arguments, 1);
             var callback = args.pop();
 
-            // Extract blocks body
-            var _blocks =  _.chain(block.blocks)
-                .reverse()
-                .map(function(blockName){
-                    return {
-                        name: blockName,
-                        body: args.pop()()
-                    };
-                })
-                .reverse()
-                .value();
+            // Extract blocks
+            var blocks = args
+                .concat([])
+                .slice(-block.blocks.length);
 
+            // Eliminate blocks from list
+            if (block.blocks.length > 0) args = args.slice(0, -block.blocks.length);
+
+            // Extract main body and kwargs
             var body = args.pop();
             var kwargs = args.pop() || {};
 
+            // Extract blocks body
+            var _blocks =  _.map(block.blocks, function(blockName, i){
+                return {
+                    name: blockName,
+                    body: blocks[i]()
+                };
+            });
 
             var func = that.bindContext(block.process);
 
@@ -313,7 +318,8 @@ TemplateEngine.prototype.renderString = function(content, context, options) {
 
         // infos about gitbook
         gitbook: {
-            version: pkg.version
+            version: pkg.version,
+            generator: this.book.options.generator
         }
     });
     options = _.defaults(options || {}, {
@@ -330,7 +336,7 @@ TemplateEngine.prototype.renderString = function(content, context, options) {
 
 // Render a file from the book
 TemplateEngine.prototype.renderFile = function(filename, options) {
-	var that = this, context;
+    var that = this, context;
 
     return that.book.readFile(filename)
     .then(function(content) {
@@ -363,8 +369,26 @@ TemplateEngine.prototype.renderPage = function(page) {
 
 // Post process content
 TemplateEngine.prototype.postProcess = function(content) {
+    var that = this;
+
     return Q(content)
-    .then(this.replaceBlocks);
+    .then(that.replaceBlocks)
+    .then(function(_content) {
+        return batch.execEach(that.blocks, {
+            max: 20,
+            fn: function(blk, blkId) {
+                return Q()
+                .then(function() {
+                    if (!blk.post) return Q();
+                    return blk.post();
+                })
+                .then(function() {
+                    delete that.blocks[blkId];
+                });
+            }
+        })
+        .thenResolve(_content);
+    });
 };
 
 module.exports = TemplateEngine;

lib/utils/batch.js

@@ -0,0 +1,52 @@
+var Q = require("q");
+var _ = require("lodash");
+
+// Execute a method for all element
+function execEach(items, options) {
+    if (_.size(items) == 0) return Q();
+    var concurrents = 0, d = Q.defer(), pending = [];
+
+    options = _.defaults(options || {}, {
+        max: 100,
+        fn: function(item) {}
+    });
+
+
+    function startItem(item, i) {
+        if (concurrents >= options.max) {
+            pending.push([item, i]);
+            return;
+        }
+
+        concurrents++;
+        Q()
+        .then(function() {
+            return options.fn(item, i);
+        })
+        .then(function() {
+            concurrents--;
+
+            // Next pending
+            var next = pending.shift();
+
+            if (concurrents == 0 && !next) {
+                d.resolve();
+            } else if (next) {
+                startItem.apply(null, next);
+            }
+        })
+        .fail(function(err) {
+            pending = [];
+            d.reject(err);
+        })
+    }
+
+    _.each(items, startItem);
+
+    return d.promise;
+}
+
+module.exports = {
+    execEach: execEach
+};
+

lib/utils/git.js

@@ -15,7 +15,7 @@ var GIT_TMP = null;
 
 // Check if an url is a git dependency url
 function checkGitUrl(giturl) {
-	return (giturl.indexOf(GIT_PREFIX) === 0);
+    return (giturl.indexOf(GIT_PREFIX) === 0);
 }
 
 // Validates a SHA in hexadecimal
@@ -25,88 +25,88 @@ function validateSha(str) {
 
 // Parse and extract infos
 function parseGitUrl(giturl) {
-	var ref, uri, fileParts, filepath;
+    var ref, uri, fileParts, filepath;
 
-	if (!checkGitUrl(giturl)) return null;
-	giturl = giturl.slice(GIT_PREFIX.length);
+    if (!checkGitUrl(giturl)) return null;
+    giturl = giturl.slice(GIT_PREFIX.length);
 
-	uri = new URI(giturl);
-	ref = uri.fragment() || "master";
-	uri.fragment(null);
+    uri = new URI(giturl);
+    ref = uri.fragment() || "master";
+    uri.fragment(null);
 
-	// Extract file inside the repo (after the .git)
-	fileParts =uri.path().split(".git");
-	filepath = fileParts.length > 1? fileParts.slice(1).join(".git") : "";
-	if (filepath[0] == "/") filepath = filepath.slice(1);
+    // Extract file inside the repo (after the .git)
+    fileParts =uri.path().split(".git");
+    filepath = fileParts.length > 1? fileParts.slice(1).join(".git") : "";
+    if (filepath[0] == "/") filepath = filepath.slice(1);
 
-	// Recreate pathname without the real filename
-	uri.path(_.first(fileParts)+".git");
+    // Recreate pathname without the real filename
+    uri.path(_.first(fileParts)+".git");
 
-	return {
-		host: uri.toString(),
-		ref: ref || "master",
-		filepath: filepath
-	};
+    return {
+        host: uri.toString(),
+        ref: ref || "master",
+        filepath: filepath
+    };
 }
 
 // Clone a git repo from a specific ref
 function cloneGitRepo(host, ref) {
-	var isBranch = false;
+    var isBranch = false;
 
-	ref = ref || "master";
-	if (!validateSha(ref)) isBranch = true;
+    ref = ref || "master";
+    if (!validateSha(ref)) isBranch = true;
 
-	return Q()
+    return Q()
 
-	// Create temporary folder to store git repos
-	.then(function() {
-		if (GIT_TMP) return;
-		return fs.tmp.dir()
-			.then(function(_tmp) {
-				GIT_TMP = _tmp;
-			});
-	})
+    // Create temporary folder to store git repos
+    .then(function() {
+        if (GIT_TMP) return;
+        return fs.tmp.dir()
+            .then(function(_tmp) {
+                GIT_TMP = _tmp;
+            });
+    })
 
-	// Return or clone the git repo
-	.then(function() {
-		// Unique ID for repo/ref combinaison
-		var repoId = crc.crc32(host+"#"+ref).toString(16);
+    // Return or clone the git repo
+    .then(function() {
+        // Unique ID for repo/ref combinaison
+        var repoId = crc.crc32(host+"#"+ref).toString(16);
 
-		// Absolute path to the folder
-		var repoPath = path.resolve(GIT_TMP, repoId);
+        // Absolute path to the folder
+        var repoPath = path.resolve(GIT_TMP, repoId);
 
-		return fs.exists(repoPath)
-			.then(function(doExists) {
-				if (doExists) return;
+        return fs.exists(repoPath)
+            .then(function(doExists) {
+                if (doExists) return;
 
-				// Clone repo
-				return exec("git clone "+host+" "+repoPath)
-				.then(function() {
-					return exec("git checkout "+ref, { cwd: repoPath });
-				})
-			})
-			.thenResolve(repoPath);
-	});
+                // Clone repo
+                return exec("git clone "+host+" "+repoPath)
+                .then(function() {
+                    return exec("git checkout "+ref, { cwd: repoPath });
+                })
+            })
+            .thenResolve(repoPath);
+    });
 }
 
 
 // Get file from a git repo
 function resolveFileFromGit(giturl) {
-	if (_.isString(giturl)) giturl = parseGitUrl(giturl);
-	if (!giturl) return Q(null);
+    if (_.isString(giturl)) giturl = parseGitUrl(giturl);
+    if (!giturl) return Q(null);
 
-	// Clone or get from cache
-	return cloneGitRepo(giturl.host, giturl.ref)
-	.then(function(repo) {
+    // Clone or get from cache
+    return cloneGitRepo(giturl.host, giturl.ref)
+    .then(function(repo) {
 
-		// Resolve relative path
-		return path.resolve(repo, giturl.filepath);
-	});
+        // Resolve relative path
+        return path.resolve(repo, giturl.filepath);
+    });
 };
 
 
 module.exports = {
-	checkUrl: checkGitUrl,
-	parseUrl: parseGitUrl,
-	resolveFile: resolveFileFromGit
+    checkUrl: checkGitUrl,
+    parseUrl: parseGitUrl,
+    resolveFile: resolveFileFromGit
 };

lib/utils/i18n.js

@@ -0,0 +1,72 @@
+var _ = require("lodash");
+var path = require("path");
+var fs = require("fs");
+
+var I18N_PATH = path.resolve(__dirname, "../../theme/i18n/")
+
+var getLocales = _.memoize(function() {
+    var locales = fs.readdirSync(I18N_PATH);
+    return _.chain(locales)
+        .map(function(local) {
+            local = path.basename(local, ".json");
+            return [local, _.extend({
+                direction: "ltr"
+            }, require(path.join(I18N_PATH, local)), {
+                id: local
+            })];
+        })
+        .object()
+        .value();
+});
+
+var getLanguages = function() {
+    return _.keys(getLocales());
+};
+
+var getByLanguage = function(lang) {
+    lang = normalizeLanguage(lang);
+    var locales = getLocales();
+    return locales[lang];
+};
+
+var compareLocales = function(lang, locale) {
+    var langMain = _.first(lang.split("-"));
+    var langSecond = _.last(lang.split("-"));
+
+    var localeMain = _.first(locale.split("-"));
+    var localeSecond = _.last(locale.split("-"));
+
+    if (locale == lang) return 100;
+    if (localeMain == langMain) return 50;
+    if (localeSecond == langSecond) return 20;
+    return 0;
+};
+
+var normalizeLanguage = _.memoize(function(lang) {
+    var locales = getLocales();
+    var language = _.chain(locales)
+        .values()
+        .map(function(locale) {
+            locale = locale.id;
+
+            return {
+                locale: locale,
+                score: compareLocales(lang, locale)
+            }
+        })
+        .filter(function(lang) {
+            return lang.score > 0;
+        })
+        .sortBy("score")
+        .pluck("locale")
+        .last()
+        .value();
+    return language || lang;
+});
+
+module.exports = {
+    getLocales: getLocales,
+    getLanguages: getLanguages,
+    getByLanguage: getByLanguage,
+    normalizeLanguage: normalizeLanguage
+};

lib/utils/images.js

@@ -1,34 +1,39 @@
 var _ = require("lodash");
 var Q = require("q");
 var fs = require("./fs");
-var exec = require('child_process').exec;
+var spawn = require('spawn-cmd').spawn;
 
 var links = require("./links");
 
 // Convert a svg file
 var convertSVG = function(source, dest, options) {
-	if (!fs.existsSync(source)) return Q.reject(new Error("File doesn't exist: "+source));
+    if (!fs.existsSync(source)) return Q.reject(new Error("File doesn't exist: "+source));
+    var d = Q.defer();
 
-	var d = Q.defer();
+    options = _.defaults(options || {}, {
 
-	options = _.defaults(options || {}, {
-
-	});
-
-	var command = "svgexport "+source+" "+dest;
-
-    var child = exec(command, function (error, stdout, stderr) {
-        if (error) {
-        	if (error.code == 127) error = new Error("Need to install 'svgexport' using 'npm install svgexport -g'");
-        	return d.reject(error);
-        }
-        d.resolve();
     });
 
-	return d.promise;
+    //var command = shellescape(['svgexport', source, dest]);
+    var child = spawn('svgexport', [source, dest]);
+
+    child.on("error", function(error) {
+        if (error.code == "ENOENT") error = new Error("Need to install 'svgexport' using 'npm install svgexport -g'");
+        return d.reject(error);
+    });
+
+    child.on("close", function(code) {
+        if (code == 0 && fs.existsSync(dest)) {
+            d.resolve();
+        } else {
+            d.reject(new Error("Error converting "+source+" into "+dest));
+        }
+    });
+
+    return d.promise;
 };
 
 module.exports = {
-	convertSVG: convertSVG,
-	INVALID: [".svg"]
+    convertSVG: convertSVG,
+    INVALID: [".svg"]
 };

lib/utils/links.js

@@ -15,12 +15,27 @@ var isRelative = function(href) {
     try {
         var parsed = url.parse(href);
 
-        return !!(!parsed.protocol && parsed.path);// && parsed.path[0] != '/';
+        return !!(!parsed.protocol && parsed.path);
     } catch(err) {}
 
     return true;
 };
 
+// Return true if the link is an achor
+var isAnchor = function(href) {
+    try {
+        var parsed = url.parse(href);
+        return !!(!parsed.protocol && !parsed.path && parsed.hash);
+    } catch(err) {}
+
+    return false;
+};
+
+// Normalize a path to be a link
+var normalizeLink = function(s) {
+    return s.replace(/\\/g, '/');
+};
+
 // Relative to absolute path
 // dir: directory parent of the file currently in rendering process
 // outdir: directory parent from the html output
@@ -36,7 +51,7 @@ var toAbsolute = function(_href, dir, outdir) {
     _href = path.relative(outdir, hrefInRoot);
 
     // Normalize windows paths
-    _href = _href.replace(/\\/g, '/');
+    _href = normalizeLink(_href);
 
     return _href;
 };
@@ -45,11 +60,7 @@ var toAbsolute = function(_href, dir, outdir) {
 var join = function() {
     var _href = path.join.apply(path, arguments);
 
-    if (process.platform === 'win32') {
-        _href = _href.replace(/\\/g, '/');
-    }
-
-    return _href;
+    return normalizeLink(_href);
 };
 
 // Change extension
@@ -61,9 +72,11 @@ var changeExtension = function(filename, newext) {
 };
 
 module.exports = {
+    isAnchor: isAnchor,
     isRelative: isRelative,
     isExternal: isExternal,
     toAbsolute: toAbsolute,
     join: join,
-    changeExtension: changeExtension
+    changeExtension: changeExtension,
+    normalize: normalizeLink
 };

lib/utils/logger.js

@@ -3,100 +3,100 @@ var util = require('util');
 var color = require('bash-color');
 
 var LEVELS = {
-	DEBUG: 0,
-	INFO: 1,
-	WARN: 2,
-	ERROR: 3,
-	DISABLED: 10
+    DEBUG: 0,
+    INFO: 1,
+    WARN: 2,
+    ERROR: 3,
+    DISABLED: 10
 };
 
 var COLORS = {
-	DEBUG: color.purple,
-	INFO: color.cyan,
-	WARN: color.yellow,
-	ERROR: color.red
+    DEBUG: color.purple,
+    INFO: color.cyan,
+    WARN: color.yellow,
+    ERROR: color.red
 };
 
 module.exports = function(_write, logLevel) {
-	var logger = {};
-	var lastChar = '\n';
-	if (_.isString(logLevel)) logLevel = LEVELS[logLevel.toUpperCase()];
+    var logger = {};
+    var lastChar = '\n';
+    if (_.isString(logLevel)) logLevel = LEVELS[logLevel.toUpperCase()];
 
-	// Write a simple message
-	logger.write = function(msg) {
-		msg = msg.toString();
-		lastChar = _.last(msg);
-		return _write(msg);
-	};
+    // Write a simple message
+    logger.write = function(msg) {
+        msg = msg.toString();
+        lastChar = _.last(msg);
+        return _write(msg);
+    };
 
-	// Format a message
-	logger.format = function() {
-		return util.format.apply(util, arguments);
-	};
+    // Format a message
+    logger.format = function() {
+        return util.format.apply(util, arguments);
+    };
 
-	// Write a line
-	logger.writeLn = function(msg) {
-		return this.write((msg || "")+"\n");
-	};
+    // Write a line
+    logger.writeLn = function(msg) {
+        return this.write((msg || "")+"\n");
+    };
 
-	// Write a message with a certain level
-	logger.log = function(level) {
-		if (level < logLevel) return;
+    // Write a message with a certain level
+    logger.log = function(level) {
+        if (level < logLevel) return;
 
-		var levelKey = _.findKey(LEVELS, function(v) { return v == level; });
-		var args = Array.prototype.slice.apply(arguments, [1]);
-		var msg = logger.format.apply(logger, args);
+        var levelKey = _.findKey(LEVELS, function(v) { return v == level; });
+        var args = Array.prototype.slice.apply(arguments, [1]);
+        var msg = logger.format.apply(logger, args);
 
-		if (lastChar == '\n') {
-			msg = COLORS[levelKey](levelKey.toLowerCase()+":")+" "+msg;
-		}
+        if (lastChar == '\n') {
+            msg = COLORS[levelKey](levelKey.toLowerCase()+":")+" "+msg;
+        }
 
-		return logger.write(msg);
-	};
-	logger.logLn = function() {
-		if (lastChar != '\n') logger.write("\n");
+        return logger.write(msg);
+    };
+    logger.logLn = function() {
+        if (lastChar != '\n') logger.write("\n");
 
-		var args = Array.prototype.slice.apply(arguments);
-		args.push("\n");
-		logger.log.apply(logger, args);
-	};
+        var args = Array.prototype.slice.apply(arguments);
+        args.push("\n");
+        logger.log.apply(logger, args);
+    };
 
-	// Write a OK
-	logger.ok = function(level) {
-		var args = Array.prototype.slice.apply(arguments, [1]);
-		var msg = logger.format.apply(logger, args);
-		if (arguments.length > 1) {
-			logger.logLn(level, color.green('>> ') + msg.trim().replace(/\n/g, color.green('\n>> ')));
-		} else {
-			logger.log(level, color.green("OK"), "\n");
-		}
-	};
+    // Write a OK
+    logger.ok = function(level) {
+        var args = Array.prototype.slice.apply(arguments, [1]);
+        var msg = logger.format.apply(logger, args);
+        if (arguments.length > 1) {
+            logger.logLn(level, color.green('>> ') + msg.trim().replace(/\n/g, color.green('\n>> ')));
+        } else {
+            logger.log(level, color.green("OK"), "\n");
+        }
+    };
 
-	// Write an "FAIL"
-	logger.fail = function(level) {
-		return logger.log(level, color.red("ERROR")+"\n");
-	};
+    // Write an "FAIL"
+    logger.fail = function(level) {
+        return logger.log(level, color.red("ERROR")+"\n");
+    };
 
-	_.each(_.omit(LEVELS, 'DISABLED'), function(level, levelKey) {
-		levelKey = levelKey.toLowerCase();
+    _.each(_.omit(LEVELS, 'DISABLED'), function(level, levelKey) {
+        levelKey = levelKey.toLowerCase();
 
-		logger[levelKey] = _.partial(logger.log, level);
-		logger[levelKey].ln = _.partial(logger.logLn, level);
-		logger[levelKey].ok = _.partial(logger.ok, level);
-		logger[levelKey].fail = _.partial(logger.fail, level);
-		logger[levelKey].promise = function(p) {
-			return p.
-			then(function(st) {
-				logger[levelKey].ok();
-				return st;
-			}, function(err) {
-				logger[levelKey].fail();
-				throw err;
-			});
-		}
-	});
+        logger[levelKey] = _.partial(logger.log, level);
+        logger[levelKey].ln = _.partial(logger.logLn, level);
+        logger[levelKey].ok = _.partial(logger.ok, level);
+        logger[levelKey].fail = _.partial(logger.fail, level);
+        logger[levelKey].promise = function(p) {
+            return p.
+            then(function(st) {
+                logger[levelKey].ok();
+                return st;
+            }, function(err) {
+                logger[levelKey].fail();
+                throw err;
+            });
+        }
+    });
 
-	return logger;
+    return logger;
 };
 module.exports.LEVELS = LEVELS;
 module.exports.COLORS = COLORS;

lib/utils/page.js

@@ -1,13 +1,16 @@
 var Q = require('q');
 var _ = require('lodash');
+var url = require('url');
 var path = require('path');
 var cheerio = require('cheerio');
 var domSerializer = require('dom-serializer');
 var request = require('request');
+var crc = require("crc");
 
 var links = require('./links');
 var imgUtils = require('./images');
 var fs = require('./fs');
+var batch = require('./batch');
 
 // Render a cheerio dom as html
 var renderDom = function($, dom, options) {
@@ -78,7 +81,14 @@ function pregQuote( str ) {
 
 // Adapt an html snippet to be relative to a base folder
 function normalizeHtml(src, options) {
-    var $ = cheerio.load(src, { xmlMode: false});
+    var $ = cheerio.load(src, {
+        // We should parse html without trying to normalize too much
+        xmlMode: false,
+
+        // SVG need some attributes to use uppercases
+        lowerCaseAttributeNames: false,
+        lowerCaseTags: false
+    });
     var toConvert = [];
     var svgContent = {};
     var outputRoot = options.book.options.output;
@@ -95,7 +105,7 @@ function normalizeHtml(src, options) {
             // Generate filename
             dest = "/"+fs.getUniqueFilename(outputRoot, dest);
 
-            svgContent[dest] = content;
+            svgContent[dest] = '<?xml version="1.0" encoding="UTF-8"?>'+content;
             $(this).replaceWith($("<img>").attr("src", dest));
         });
     }
@@ -104,6 +114,7 @@ function normalizeHtml(src, options) {
     $("img").each(function() {
         var origin = undefined;
         var src = $(this).attr("src");
+        if (!src) return;
         var isExternal = links.isExternal(src);
 
         // Transform as relative to the bases
@@ -116,13 +127,13 @@ function normalizeHtml(src, options) {
             // If image is external and ebook, then downlaod the images
             if (isExternal) {
                 origin = src;
-                src = "/"+fs.getUniqueFilename(outputRoot,  path.basename(src));
+                src = "/"+crc.crc32(origin).toString(16)+path.extname(origin);
                 src = links.toAbsolute(src, options.base, options.output);
                 isExternal = false;
             }
 
             var ext = path.extname(src);
-            var srcAbs = path.join("/", options.base, src);
+            var srcAbs = links.join("/", options.base, src);
 
             // Test image extension
             if (_.contains(imgUtils.INVALID, ext)) {
@@ -134,7 +145,7 @@ function normalizeHtml(src, options) {
                     var dest = "";
 
                     // Replace extension
-                    dest = path.join(path.dirname(srcAbs), path.basename(srcAbs, ext)+".png");
+                    dest = links.join(path.dirname(srcAbs), path.basename(srcAbs, ext)+".png");
                     dest = dest[0] == "/"? dest.slice(1) : dest;
 
                     // Get a name that doesn't exists
@@ -153,7 +164,7 @@ function normalizeHtml(src, options) {
                         dest: path.join("./", dest)
                     });
 
-                    src = path.join("/", dest);
+                    src = links.join("/", dest);
                 }
 
                 // Reset as relative to output
@@ -174,16 +185,24 @@ function normalizeHtml(src, options) {
 
     $("a").each(function() {
         var href = $(this).attr("href");
+        if (!href) return;
 
-        if (links.isRelative(href)) {
-            var absolutePath = path.join(options.base, href);
+        if (links.isAnchor(href)) {
+            // Keep it as it is
+        } else if (links.isRelative(href)) {
+            var parts = url.parse(href);
+            var absolutePath = path.join(options.base, parts.pathname);
+            var anchor = parts.hash || "";
 
-            // If is in navigation relative: change extsnio nto be .html
-            if (options.navigation[absolutePath]) href = links.changeExtension(href, ".html");
+            // If is in navigation relative: transform as content
+            if (options.navigation[absolutePath]) {
+                absolutePath = options.book.contentLink(absolutePath);
+            }
 
             // Transform as absolute
-            href = links.toAbsolute(href, options.base, options.output);
+            href = links.toAbsolute("/"+absolutePath, options.base, options.output)+anchor;
         } else {
+            // External links
             $(this).attr("target", "_blank");
         }
 
@@ -198,12 +217,13 @@ function normalizeHtml(src, options) {
 
         $("*").each(function() {
             replaceText($, this, r, function(match) {
+                // Add to files index in glossary
                 if (!includedInFiles) {
                     includedInFiles = true;
                     term.files = term.files || [];
                     term.files.push(options.navigation[options.input]);
                 }
-                return "<a href='"+links.toAbsolute("GLOSSARY.html", options.base, options.output)+"#"+term.id+"' class='glossary-term' title='"+term.description+"'>"+match+"</span>";
+                return "<a href='"+links.toAbsolute("/GLOSSARY.html", options.base, options.output)+"#"+term.id+"' class='glossary-term' title='"+_.escape(term.description)+"'>"+match+"</a>";
             });
         });
     });
@@ -218,34 +238,39 @@ function normalizeHtml(src, options) {
 function convertImages(images, options) {
     if (!options.convertImages) return Q();
 
+    var downloaded = [];
     options.book.log.debug.ln("convert ", images.length, "images to png");
 
-    return _.reduce(images, function(prev, image) {
-        var imgin = path.resolve(options.book.options.output, image.source);
+    return batch.execEach(images, {
+        max: 100,
+        fn: function(image) {
+            var imgin = path.resolve(options.book.options.output, image.source);
 
-        return prev
+            return Q()
 
-        // Write image if need to be download
-        .then(function() {
-            if (!image.origin) return;
-            options.book.log.debug("download image", image.origin, "...");
-            return options.book.log.debug.promise(fs.writeStream(imgin, request(image.origin)));
-        })
+            // Write image if need to be download
+            .then(function() {
+                if (!image.origin && !_.contains(downloaded, image.origin)) return;
+                options.book.log.debug("download image", image.origin, "...");
+                downloaded.push(image.origin);
+                return options.book.log.debug.promise(fs.writeStream(imgin, request(image.origin)));
+            })
 
-        // Write svg if content
-        .then(function() {
-            if (!image.content) return;
-            return fs.writeFile(imgin, image.content);
-        })
+            // Write svg if content
+            .then(function() {
+                if (!image.content) return;
+                return fs.writeFile(imgin, image.content);
+            })
 
-        // Convert
-        .then(function(){
-            if (!image.dest) return;
-            var imgout = path.resolve(options.book.options.output, image.dest);
-            options.book.log.debug("convert image", image.source, "to", image.dest, "...");
-            return options.book.log.debug.promise(imgUtils.convertSVG(imgin, imgout));
-        });
-    }, Q())
+            // Convert
+            .then(function() {
+                if (!image.dest) return;
+                var imgout = path.resolve(options.book.options.output, image.dest);
+                options.book.log.debug("convert image", image.source, "to", image.dest, "...");
+                return options.book.log.debug.promise(imgUtils.convertSVG(imgin, imgout));
+            });
+        }
+    })
     .then(function() {
         options.book.log.debug.ok(images.length+" images converted with success");
     });

package.json

@@ -1,20 +1,20 @@
 {
     "name": "gitbook",
-    "version": "2.0.0-alpha.5",
+    "version": "2.0.0-beta.4",
     "homepage": "https://www.gitbook.com",
     "description": "Library and cmd utility to generate GitBooks",
     "main": "lib/index.js",
     "dependencies": {
         "q": "1.0.1",
         "lunr": "0.5.7",
-        "lodash": "2.4.1",
+        "lodash": "3.5.0",
         "graceful-fs": "3.0.5",
         "resolve": "0.6.3",
-        "fs-extra": "0.16.3",
+        "fs-extra": "0.16.5",
         "fstream-ignore": "1.0.2",
-        "gitbook-parsers": "0.3.1",
-        "nunjucks": "git+https://github.com/SamyPesse/nunjucks.git#4019d1b7379372336b86ce1b0bf84352a2029747",
-        "nunjucks-autoescape": "0.1.0",
+        "gitbook-parsers": "0.5.4",
+        "nunjucks": "git+https://github.com/mozilla/nunjucks.git#0f8b21b8df7e8e852b2e1889388653b7075f0d09",
+        "nunjucks-autoescape": "0.1.1",
         "nunjucks-filter": "0.1.0",
         "nunjucks-i18n": "1.0.0",
         "semver": "2.2.1",
@@ -23,17 +23,18 @@
         "gitbook-plugin-livereload": "0.0.1",
         "gaze": "~0.5.1",
         "send": "0.2.0",
-        "tiny-lr-fork": "0.0.5",
+        "tiny-lr": "0.1.5",
         "tmp": "0.0.24",
         "crc": "3.2.1",
         "bash-color": "0.0.3",
         "URIjs": "1.14.1",
         "request": "2.51.0",
         "npm": "2.4.1",
-        "dom-serializer": "git+https://github.com/SamyPesse/dom-serializer.git#58d8ea24b9b7b4137ee5f30a41abce4d7c4a922a"
+        "dom-serializer": "0.1.0",
+        "spawn-cmd": "0.0.2"
     },
     "devDependencies": {
-        "mocha": "1.18.2",
+        "mocha": "2.2.1",
         "grunt": "~0.4.2",
         "grunt-cli": "0.1.11",
         "grunt-contrib-copy": "0.5.0",
@@ -42,7 +43,7 @@
         "grunt-bower-install-simple": "0.9.2"
     },
     "scripts": {
-        "test": "export TESTING=true; mocha --reporter list --timeout 15000"
+        "test": "node_modules/.bin/mocha --reporter list --timeout 15000"
     },
     "repository": {
         "type": "git",

test/ebook.js

@@ -1,6 +1,7 @@
 var path = require('path');
 var _ = require('lodash');
 var assert = require('assert');
+var cheerio = require('cheerio');
 
 var fs = require("fs");
 var fsUtil = require("../lib/utils/fs");
@@ -15,26 +16,21 @@ describe('eBook Generator', function () {
 
     it('should correctly convert svg images to png', function(done) {
         testGeneration(books[4], "ebook", function(output) {
-            var readmeContent = fs.readFileSync(path.join(output, "index.html"), {encoding: "utf8"});
-            var pageContent = fs.readFileSync(path.join(output, "sub/PAGE.html"), {encoding: "utf8"});
+            // Check that all images exists
+            _.each([
+                "index.html",
+                "sub/PAGE.html"
+            ], function(pageName) {
+                var pageFile = path.join(output, pageName);
+                var pageFolder = path.dirname(pageFile);
+                var pageContent = fs.readFileSync(pageFile, {encoding: "utf8"});
+                var $ = cheerio.load(pageContent);
 
-            // Remote image
-            assert(pageContent.indexOf('src="../Tux.png"') >= 0);
-            assert(fs.existsSync(path.join(output, "Tux.png")));
-
-            assert(fs.existsSync(path.join(output, "test.png")));
-            assert(fs.existsSync(path.join(output, "NewTux.png")));
-
-            assert(!fs.existsSync(path.join(output, "test_0.png")));
-            assert(!fs.existsSync(path.join(output, "sub/test.png")));
-            assert(!fs.existsSync(path.join(output, "sub/NewTux.png")));
-
-            assert(pageContent.indexOf('src="../test.png"') >= 0);
-            assert(pageContent.indexOf('src="../NewTux.png"') >= 0);
-            assert(pageContent.indexOf('<svg') < 0);
-
-            assert(readmeContent.indexOf('src="test.png"') >= 0);
-            assert(readmeContent.indexOf('src="NewTux.png"') >= 0);
+                $("img").each(function() {
+                    var src = $(this).attr("src");
+                    assert(fs.existsSync(path.resolve(pageFolder, src)), src+" not found for page "+pageName);
+                })
+            });
         }, done);
     });
 });

test/fixtures/test0/README.md

@@ -1,3 +1,3 @@
 # Other Title
 
-A description
+This is a description, it's simple, no ?

test/fixtures/test0/book.json

@@ -1,3 +1,3 @@
 {
-	"title": "Test"
+    "title": "Test"
 }

test/fixtures/test0/styles/website.css

@@ -1,3 +1,3 @@
 body {
-	background: red;
+    background: red;
 }

test/fixtures/test1/book.json

@@ -1,5 +1,5 @@
 {
-	"structure": {
-		"readme": "intro.md"
-	}
+    "structure": {
+        "readme": "intro.md"
+    }
 }

test/fixtures/test1/sub/test1.md

@@ -4,3 +4,5 @@ This is a relative link [test](../intro.md).
 
 ![image](../image.png)
 
+This is a glossary link.
+

test/fixtures/test4/README.md

@@ -5,3 +5,7 @@ A description
 ![test image to be converted](./test.svg)
 ![test url](http://upload.wikimedia.org/wikipedia/commons/b/b0/NewTux.svg)
 ![test image to be converted, second use](./test.svg)
+
+# Test with youtube videos that have the same filename:
+![youtube1](http://img.youtube.com/vi/9bZkp7q19f0/0.jpg)
+![youtube2](http://img.youtube.com/vi/IkV2HQLAKHY/0.jpg)

test/fixtures/test4/book.js

@@ -1,3 +1,3 @@
 module.exports = {
-	title: "Test 2"
+    title: "Test 2"
 };

test/fixtures/test4/sub/PAGE.md

@@ -8,8 +8,8 @@
 ## Inline svg
 
 {% html %}
-<svg width="400" height="110">
-  <rect width="300" height="100" style="fill:rgb(0,0,255);stroke-width:3;stroke:rgb(0,0,0)">
+<svg xmlns="http://www.w3.org/2000/svg">
+    <path d="M97.008198003228,6.103238498249268A97.2,97.2 0 0,1 87.9491894996971,41.385747140125076L54.289623147961166,25.546757493904366A60,60 0 0,0 59.88160370569629,3.7674311717588074Z"></path>
 </svg>
 {% endhtml %}
 

test/fixtures/test4/test.svg

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg version="1.1" baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="svg-root" width="100%" height="100%" viewBox="0 0 480 360">
-	<title id="test-title">basic SVG tiny doc</title>
-	<g id="test-body-content">
-		<text font-family="Arial" font-size="14" text-anchor="middle" x="225" y="25">hello world</text>
-	</g>
-	<text id="revision" x="10" y="340" font-size="40" stroke="none" fill="black">Revision: 1.1</text>
-	<rect id="test-frame" x="1" y="1" width="478" height="358" fill="none" stroke="#000000"/>
+    <title id="test-title">basic SVG tiny doc</title>
+    <g id="test-body-content">
+        <text font-family="Arial" font-size="14" text-anchor="middle" x="225" y="25">hello world</text>
+    </g>
+    <text id="revision" x="10" y="340" font-size="40" stroke="none" fill="black">Revision: 1.1</text>
+    <rect id="test-frame" x="1" y="1" width="478" height="358" fill="none" stroke="#000000"/>
 </svg>
 

test/glossary.js

@@ -0,0 +1,35 @@
+var path = require('path');
+var _ = require('lodash');
+var assert = require('assert');
+var cheerio = require('cheerio');
+
+var fs = require("fs");
+var fsUtil = require("../lib/utils/fs");
+
+
+describe('Glossary Generation', function () {
+    it('should correctly replace glossary terms', function(done) {
+        testGeneration(books[0], "website", function(output) {
+            var content = fs.readFileSync(path.join(output, "index.html"), { encoding: "utf8" });
+            var $ = cheerio.load(content);
+
+            var $body = $(".page-inner");
+            var $a = $("a[href='GLOSSARY.html#description']");
+            assert($a.length == 1);
+            assert($a.text() == "description");
+        }, done);
+    });
+
+    it('should correctly replace glossary terms in sub pages', function(done) {
+        testGeneration(books[1], "website", function(output) {
+            var content = fs.readFileSync(path.join(output, "sub/test1.html"), { encoding: "utf8" });
+            var $ = cheerio.load(content);
+
+            var $body = $(".page-inner");
+            var $a = $("a[href='../GLOSSARY.html#test']");
+            assert($a.length == 1);
+            assert($a.text() == "test");
+            assert($a.attr("title") == "a test text");
+        }, done);
+    });
+});

test/helper.js

@@ -49,7 +49,7 @@ global.books = _.chain(books)
 before(function(done) {
 
     qdone(
-	    _.reduce(global.books, function(prev, book) {
+        _.reduce(global.books, function(prev, book) {
             return prev.then(function() {
                 return fsUtil.remove(path.join(book.root, "_book"));
             })
@@ -57,6 +57,6 @@ before(function(done) {
                 return book.parse();
             });
         }, Q()),
-	    done
-	);
+        done
+    );
 });

test/json.js

@@ -15,18 +15,18 @@ describe('JSON generator', function () {
     });
 
     it('should correctly generate a book to json with sub folders', function(done) {
-    	testGeneration(books[1], "json", function(output) {
-            assert(!fs.existsSync(path.join(output, "README.json")));
+        testGeneration(books[1], "json", function(output) {
+            assert(fs.existsSync(path.join(output, "README.json")));
             assert(fs.existsSync(path.join(output, "intro.json")));
             assert(fs.existsSync(path.join(output, "sub/test1.json")));
 
             var test1 = JSON.parse(fs.readFileSync(path.join(output, "sub/test1.json")));
-            assert(test1.sections[0].content.indexOf("intro.html") > 0);
+            assert(test1.sections[0].content.indexOf("index.html") > 0);
         }, done);
     });
 
     it('should correctly generate a multilingual book to json', function(done) {
-    	testGeneration(books[2], "json", function(output) {
+        testGeneration(books[2], "json", function(output) {
             assert(fs.existsSync(path.join(output, "README.json")));
             assert(fs.existsSync(path.join(output, "en/README.json")));
             assert(fs.existsSync(path.join(output, "fr/README.json")));

test/links.js

@@ -13,6 +13,13 @@ describe('Links', function () {
         assert(!links.isExternal("/folder/test.md"));
     });
 
+    it('should correctly test anchor links', function() {
+        assert(links.isAnchor("#test"));
+        assert(links.isAnchor(" #test"));
+        assert(!links.isAnchor("https://google.fr#test"));
+        assert(!links.isAnchor("test.md#test"));
+    });
+
     describe('toAbsolute', function() {
         it('should correctly transform as absolute', function() {
             assert.equal(links.toAbsolute("http://google.fr"), "http://google.fr");

test/parsing.js

@@ -5,7 +5,7 @@ var assert = require('assert');
 describe('Book parsing', function () {
     it('should correctly parse the readme', function() {
         assert.equal(books[1].options.title, 'My Book');
-    	assert.equal(books[1].options.description, 'Test description');
+        assert.equal(books[1].options.description, 'Test description');
     });
 
     it('should correctly parse the readme with asciidoc', function() {
@@ -21,7 +21,7 @@ describe('Book parsing', function () {
         assert.equal(LEXED.chapters[0].introduction, true);
         assert.equal(LEXED.chapters[0].external, false);
 
-    	assert.equal(LEXED.chapters[1].path, 'test.md');
+        assert.equal(LEXED.chapters[1].path, 'test.md');
         assert.equal(LEXED.chapters[1].exists, false);
         assert.equal(LEXED.chapters[1].introduction, false);
         assert.equal(LEXED.chapters[1].external, false);
@@ -71,12 +71,12 @@ describe('Book parsing', function () {
 
         assert.equal(_.size(NAVIGATION), 2);
         assert(NAVIGATION["intro.md"])
-        assert.equal(NAVIGATION["intro.md"].title, "Introduction");
+        assert.equal(NAVIGATION["intro.md"].title, "");
         assert.equal(NAVIGATION["intro.md"].prev, null);
         assert.equal(NAVIGATION["intro.md"].next.title, "Article 1");
 
         assert.equal(NAVIGATION["sub/test1.md"].title, "Article 1");
-        assert.equal(NAVIGATION["sub/test1.md"].prev.title, "Introduction");
+        assert.equal(NAVIGATION["sub/test1.md"].prev.title, "");
         assert.equal(NAVIGATION["sub/test1.md"].next, null);
     });
 });

test/plugins/blocks/index.js

@@ -2,22 +2,22 @@ var assert = require("assert");
 
 module.exports = {
     blocks: {
-    	"test": {
+        "test": {
             shortcuts: {
                 parsers:  ["markdown"],
                 start: "$$",
                 end: "$$"
             },
-    		process: function(blk) {
-    			return "test"+blk.body+"test";
-    		}
-    	},
-    	"test2": {
-    		end: "endtest2end",
-    		process: function(blk) {
-    			return "test2"+blk.body+"test2";
-    		}
-    	},
+            process: function(blk) {
+                return "test"+blk.body+"test";
+            }
+        },
+        "test2": {
+            end: "endtest2end",
+            process: function(blk) {
+                return "test2"+blk.body+"test2";
+            }
+        },
         "test3join": {
             blocks: [
                 "also"

test/plugins/filters/index.js

@@ -4,7 +4,7 @@ module.exports = {
             return "Hello "+text;
         },
         helloCtx: function(text) {
-        	return text+":"+this.book.root;
+            return text+":"+this.book.root;
         }
     }
 };

test/plugins/resources/index.js

@@ -1,12 +1,12 @@
 module.exports = {
-	website: {
+    website: {
         js: [
             "https://cdn.mathjax.org/mathjax/2.4-latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"
         ]
     },
     ebook: {
-    	css: [
-    		"test"
-    	]
+        css: [
+            "test"
+        ]
     }
 };

test/templating.js

@@ -0,0 +1,37 @@
+var path = require('path');
+var _ = require('lodash');
+var assert = require('assert');
+var fs = require("fs");
+
+var pkg = require("../package.json");
+
+describe('Templating', function () {
+    before(function(done) {
+        testGeneration(books[0], "website", function(output) {}, done);
+    });
+
+    var testTpl = function(str, args, options) {
+        return books[0].template.renderString(str, args, options)
+        .then(books[0].template.postProcess)
+    };
+
+    it('should correctly have access to generator', function(done) {
+        qdone(
+            testTpl('{{ gitbook.generator }}')
+            .then(function(content) {
+                assert.equal(content, "website");
+            }),
+            done
+        );
+    });
+
+    it('should correctly have access to gitbook version', function(done) {
+        qdone(
+            testTpl('{{ gitbook.version }}')
+            .then(function(content) {
+                assert.equal(content, pkg.version.toString());
+            }),
+            done
+        );
+    });
+});

theme/i18n/ar.json

@@ -0,0 +1,21 @@
+{
+    "direction": "rtl",
+    "LANGS_CHOOSE": "اختيار اللغة",
+    "GLOSSARY": "قاموس مصطلحات",
+    "GLOSSARY_INDEX": "مؤشر المصطلحات",
+    "GLOSSARY_OPEN": "قاموس مصطلحات",
+    "GITBOOK_LINK": "نشرت مع GitBook",
+    "SUMMARY": "جدول المحتويات",
+    "SUMMARY_INTRODUCTION": "مقدمة",
+    "SUMMARY_TOGGLE": "جدول المحتويات",
+    "SEARCH_TOGGLE": "بحث",
+    "SEARCH_PLACEHOLDER": "اكتب للبحث",
+    "FONTSETTINGS_TOGGLE": "إعدادات الخط",
+    "SHARE_TOGGLE": "حصة",
+    "SHARE_ON": "على __platform__ حصة",
+    "FONTSETTINGS_WHITE": "أبيض",
+    "FONTSETTINGS_SEPIA": "بني داكن",
+    "FONTSETTINGS_NIGHT": "ليل",
+    "FONTSETTINGS_SANS": "بلا",
+    "FONTSETTINGS_SERIF": "الرقيق"
+}

theme/i18n/bn.json

@@ -0,0 +1,20 @@
+{
+    "LANGS_CHOOSE": "ভাষা নির্বাচন করুন",
+    "GLOSSARY": "গ্লোসারি",
+    "GLOSSARY_INDEX": "ইন্ডেক্স",
+    "GLOSSARY_OPEN": "গ্লোসারি",
+    "GITBOOK_LINK": "গিটবুকের মাধ্যমে প্রকাশিত",
+    "SUMMARY": "সূচিপত্র",
+    "SUMMARY_INTRODUCTION": "সূচনা",
+    "SUMMARY_TOGGLE": "সূচিপত্র",
+    "SEARCH_TOGGLE": "অনুসন্ধান",
+    "SEARCH_PLACEHOLDER": "অনুসন্ধান",
+    "FONTSETTINGS_TOGGLE": "ফন্ট সেটিংস",
+    "SHARE_TOGGLE": "শেয়ার",
+    "SHARE_ON": "__platform__-এ শেয়ার",
+    "FONTSETTINGS_WHITE": "সাদা",
+    "FONTSETTINGS_SEPIA": "সেপিয়া",
+    "FONTSETTINGS_NIGHT": "রাত",
+    "FONTSETTINGS_SANS": "স্যান্স",
+    "FONTSETTINGS_SERIF": "শেরিফ"
+}

theme/i18n/de.json

@@ -1,18 +1,20 @@
 {
-	"LANGS_CHOOSE": "Sprache auswählen",
-	"GLOSSARY": "Glossar",
-	"GLOSSARY_INDEX": "Index",
-	"GLOSSARY_OPEN": "Glossar",
-	"GITBOOK_LINK": "Veröffentlicht mit GitBook",
-	"SUMMARY": "Inhaltsverzeichnis",
-	"SUMMARY_INTRODUCTION": "Einleitung",
-	"SUMMARY_TOGGLE": "Inhaltsverzeichnis",
-	"SEARCH_TOGGLE": "Suche",
-	"SEARCH_PLACEHOLDER": "Suchbegriff eingeben",
-	"FONTSETTINGS_TOGGLE": "Schrifteinstellungen",
-	"SHARE_TOGGLE": "Teilen",
-	"SHARE_ON": "auf __platform__ teilen",
-	"FONTSETTINGS_WHITE": "Hell",
-	"FONTSETTINGS_SEPIA": "Sepia",
-	"FONTSETTINGS_NIGHT": "Nacht"
+    "LANGS_CHOOSE": "Sprache auswählen",
+    "GLOSSARY": "Glossar",
+    "GLOSSARY_INDEX": "Index",
+    "GLOSSARY_OPEN": "Glossar",
+    "GITBOOK_LINK": "Veröffentlicht mit GitBook",
+    "SUMMARY": "Inhaltsverzeichnis",
+    "SUMMARY_INTRODUCTION": "Einleitung",
+    "SUMMARY_TOGGLE": "Inhaltsverzeichnis",
+    "SEARCH_TOGGLE": "Suche",
+    "SEARCH_PLACEHOLDER": "Suchbegriff eingeben",
+    "FONTSETTINGS_TOGGLE": "Schrifteinstellungen",
+    "SHARE_TOGGLE": "Teilen",
+    "SHARE_ON": "Auf __platform__ teilen",
+    "FONTSETTINGS_WHITE": "Hell",
+    "FONTSETTINGS_SEPIA": "Sepia",
+    "FONTSETTINGS_NIGHT": "Nacht",
+    "FONTSETTINGS_SANS": "Sans",
+    "FONTSETTINGS_SERIF": "Serif"
 }

theme/i18n/en.json

@@ -0,0 +1,20 @@
+{
+    "LANGS_CHOOSE": "Choose a language",
+    "GLOSSARY": "Glossary",
+    "GLOSSARY_INDEX": "Index",
+    "GLOSSARY_OPEN": "Glossary",
+    "GITBOOK_LINK": "Published with GitBook",
+    "SUMMARY": "Table of Contents",
+    "SUMMARY_INTRODUCTION": "Introduction",
+    "SUMMARY_TOGGLE": "Table of Contents",
+    "SEARCH_TOGGLE": "Search",
+    "SEARCH_PLACEHOLDER": "Type to search",
+    "FONTSETTINGS_TOGGLE": "Font Settings",
+    "SHARE_TOGGLE": "Share",
+    "SHARE_ON": "Share on __platform__",
+    "FONTSETTINGS_WHITE": "White",
+    "FONTSETTINGS_SEPIA": "Sepia",
+    "FONTSETTINGS_NIGHT": "Night",
+    "FONTSETTINGS_SANS": "Sans",
+    "FONTSETTINGS_SERIF": "Serif"
+}

theme/i18n/es.json

@@ -0,0 +1,20 @@
+{
+    "LANGS_CHOOSE": "Seleccione un idioma",
+    "GLOSSARY": "Glosario",
+    "GLOSSARY_INDEX": "Índice",
+    "GLOSSARY_OPEN": "Glosario",
+    "GITBOOK_LINK": "Publicado con GitBook",
+    "SUMMARY": "Tabla de contenido",
+    "SUMMARY_INTRODUCTION": "Introducción",
+    "SUMMARY_TOGGLE": "Tabla de contenido",
+    "SEARCH_TOGGLE": "Busca",
+    "SEARCH_PLACEHOLDER": "Escribe para buscar",
+    "FONTSETTINGS_TOGGLE": "Configuración de fuente",
+    "SHARE_TOGGLE": "Comparte",
+    "SHARE_ON": "Comparte en __platform__",
+    "FONTSETTINGS_WHITE": "Claro",
+    "FONTSETTINGS_SEPIA": "Sépia",
+    "FONTSETTINGS_NIGHT": "Noche",
+    "FONTSETTINGS_SANS": "Sans",
+    "FONTSETTINGS_SERIF": "Serif"
+}

theme/i18n/fa.json

@@ -0,0 +1,21 @@
+{
+    "direction": "rtl",
+    "LANGS_CHOOSE": "انتخاب زبان",
+    "GLOSSARY": "واژه‌نامه",
+    "GLOSSARY_INDEX": "فهرست واژه‌ها",
+    "GLOSSARY_OPEN": "واژه‌نامه",
+    "GITBOOK_LINK": "انتشار یافته توسط GitBook",
+    "SUMMARY": "فهرست مطالب",
+    "SUMMARY_INTRODUCTION": "مقدمه",
+    "SUMMARY_TOGGLE": "فهرست مطالب",
+    "SEARCH_TOGGLE": "جستجو",
+    "SEARCH_PLACEHOLDER": "چیزی برای جستجو بنویسید",
+    "FONTSETTINGS_TOGGLE": "تنظیمات فونت",
+    "SHARE_TOGGLE": "اشتراک",
+    "SHARE_ON": "در __platform__ به اشتراک بگذارید",
+    "FONTSETTINGS_WHITE": "سفید",
+    "FONTSETTINGS_SEPIA": "سپیا",
+    "FONTSETTINGS_NIGHT": "شب",
+    "FONTSETTINGS_SANS": "سنس",
+    "FONTSETTINGS_SERIF": "سریف"
+}

theme/i18n/fr.json

@@ -1,18 +1,20 @@
 {
-	"LANGS_CHOOSE": "Choisissez une langue",
-	"GLOSSARY": "Glossaire",
-	"GLOSSARY_INDEX": "Index",
-	"GLOSSARY_OPEN": "Glossaire",
-	"GITBOOK_LINK": "Publié avec GitBook",
-	"SUMMARY": "Table des matières",
-	"SUMMARY_INTRODUCTION": "Introduction",
-	"SUMMARY_TOGGLE": "Table des matières",
-	"SEARCH_TOGGLE": "Recherche",
-	"SEARCH_PLACEHOLDER": "Tapez pour rechercher",
-	"FONTSETTINGS_TOGGLE": "Paramètres de Police",
-	"SHARE_TOGGLE": "Partage",
-	"SHARE_ON": "Partager sur __platform__",
-	"FONTSETTINGS_WHITE": "Clair",
-	"FONTSETTINGS_SEPIA": "Sépia",
-	"FONTSETTINGS_NIGHT": "Nuit"
+    "LANGS_CHOOSE": "Choisissez une langue",
+    "GLOSSARY": "Glossaire",
+    "GLOSSARY_INDEX": "Index",
+    "GLOSSARY_OPEN": "Glossaire",
+    "GITBOOK_LINK": "Publié avec GitBook",
+    "SUMMARY": "Table des matières",
+    "SUMMARY_INTRODUCTION": "Introduction",
+    "SUMMARY_TOGGLE": "Table des matières",
+    "SEARCH_TOGGLE": "Recherche",
+    "SEARCH_PLACEHOLDER": "Tapez pour rechercher",
+    "FONTSETTINGS_TOGGLE": "Paramètres de Police",
+    "SHARE_TOGGLE": "Partage",
+    "SHARE_ON": "Partager sur __platform__",
+    "FONTSETTINGS_WHITE": "Clair",
+    "FONTSETTINGS_SEPIA": "Sépia",
+    "FONTSETTINGS_NIGHT": "Nuit",
+    "FONTSETTINGS_SANS": "Sans",
+    "FONTSETTINGS_SERIF": "Serif"
 }

theme/i18n/it.json

@@ -1,18 +1,20 @@
 {
-	"LANGS_CHOOSE": "Scegli una lingua",
-	"GLOSSARY": "Glossario",
-	"GLOSSARY_INDEX": "Indice",
-	"GLOSSARY_OPEN": "Glossario",
-	"GITBOOK_LINK": "Pubblicato con GitBook",
-	"SUMMARY": "Sommario",
-	"SUMMARY_INTRODUCTION": "Introduzione",
-	"SUMMARY_TOGGLE": "Sommario",
-	"SEARCH_TOGGLE": "Cerca",
-	"SEARCH_PLACEHOLDER": "Scrivi per cercare",
-	"FONTSETTINGS_TOGGLE": "Impostazioni dei caratteri",
-	"SHARE_TOGGLE": "Condividi",
-	"SHARE_ON": "Condividi su __platform__",
-	"FONTSETTINGS_WHITE": "Bianco",
-	"FONTSETTINGS_SEPIA": "Seppia",
-	"FONTSETTINGS_NIGHT": "Notte"
+    "LANGS_CHOOSE": "Scegli una lingua",
+    "GLOSSARY": "Glossario",
+    "GLOSSARY_INDEX": "Indice",
+    "GLOSSARY_OPEN": "Glossario",
+    "GITBOOK_LINK": "Pubblicato con GitBook",
+    "SUMMARY": "Sommario",
+    "SUMMARY_INTRODUCTION": "Introduzione",
+    "SUMMARY_TOGGLE": "Sommario",
+    "SEARCH_TOGGLE": "Cerca",
+    "SEARCH_PLACEHOLDER": "Scrivi per cercare",
+    "FONTSETTINGS_TOGGLE": "Impostazioni dei caratteri",
+    "SHARE_TOGGLE": "Condividi",
+    "SHARE_ON": "Condividi su __platform__",
+    "FONTSETTINGS_WHITE": "Bianco",
+    "FONTSETTINGS_SEPIA": "Seppia",
+    "FONTSETTINGS_NIGHT": "Notte",
+    "FONTSETTINGS_SANS": "Sans",
+    "FONTSETTINGS_SERIF": "Serif"
 }

theme/i18n/no.json

@@ -14,5 +14,7 @@
     "SHARE_ON": "Del på __platform__",
     "FONTSETTINGS_WHITE": "Lys",
     "FONTSETTINGS_SEPIA": "Sepia",
-    "FONTSETTINGS_NIGHT": "Mørk"
+    "FONTSETTINGS_NIGHT": "Mørk",
+    "FONTSETTINGS_SANS": "Sans",
+    "FONTSETTINGS_SERIF": "Serif"
 }

theme/i18n/pt.json

@@ -0,0 +1,20 @@
+{
+    "LANGS_CHOOSE": "Escolher sua língua",
+    "GLOSSARY": "Glossário",
+    "GLOSSARY_INDEX": "Índice",
+    "GLOSSARY_OPEN": "Glossário",
+    "GITBOOK_LINK": "Publicado com GitBook",
+    "SUMMARY": "Tabela de conteúdos",
+    "SUMMARY_INTRODUCTION": "Introdução",
+    "SUMMARY_TOGGLE": "Tabela de conteúdos",
+    "SEARCH_TOGGLE": "Pesquise",
+    "SEARCH_PLACEHOLDER": "Escreva para pesquisar",
+    "FONTSETTINGS_TOGGLE": "Configurações de fonte",
+    "SHARE_TOGGLE": "Compartilhar",
+    "SHARE_ON": "Compartilhar no __platform__",
+    "FONTSETTINGS_WHITE": "Claro",
+    "FONTSETTINGS_SEPIA": "Sépia",
+    "FONTSETTINGS_NIGHT": "Noite",
+    "FONTSETTINGS_SANS": "Sans",
+    "FONTSETTINGS_SERIF": "Serif"
+}

theme/i18n/ru.json

@@ -1,18 +1,20 @@
 {
-	"LANGS_CHOOSE": "Выберите язык",
-	"GLOSSARY": "Алфавитный указатель",
-	"GLOSSARY_INDEX": "Алфавитный указатель",
-	"GLOSSARY_OPEN": "Алфавитный указатель",
-	"GITBOOK_LINK": "Опубликовано с помощью GitBook",
-	"SUMMARY": "Содержание",
-	"SUMMARY_INTRODUCTION": "Введение",
-	"SUMMARY_TOGGLE": "Содержание",
-	"SEARCH_TOGGLE": "Поиск",
-	"SEARCH_PLACEHOLDER": "Введите условия поиска",
-	"FONTSETTINGS_TOGGLE": "Шрифт",
-	"SHARE_TOGGLE": "Поделиться",
-	"SHARE_ON": "Поделиться в __platform__",
-	"FONTSETTINGS_WHITE": "Светлый",
-	"FONTSETTINGS_SEPIA": "Сепия",
-	"FONTSETTINGS_NIGHT": "Тёмный"
+    "LANGS_CHOOSE": "Выберите язык",
+    "GLOSSARY": "Алфавитный указатель",
+    "GLOSSARY_INDEX": "Алфавитный указатель",
+    "GLOSSARY_OPEN": "Алфавитный указатель",
+    "GITBOOK_LINK": "Опубликовано с помощью GitBook",
+    "SUMMARY": "Содержание",
+    "SUMMARY_INTRODUCTION": "Введение",
+    "SUMMARY_TOGGLE": "Содержание",
+    "SEARCH_TOGGLE": "Поиск",
+    "SEARCH_PLACEHOLDER": "Введите условия поиска",
+    "FONTSETTINGS_TOGGLE": "Шрифт",
+    "SHARE_TOGGLE": "Поделиться",
+    "SHARE_ON": "Поделиться в __platform__",
+    "FONTSETTINGS_WHITE": "Светлый",
+    "FONTSETTINGS_SEPIA": "Сепия",
+    "FONTSETTINGS_NIGHT": "Тёмный",
+    "FONTSETTINGS_SANS": "Sans",
+    "FONTSETTINGS_SERIF": "Serif"
 }

theme/i18n/zh-cn.json

@@ -0,0 +1,20 @@
+{
+    "LANGS_CHOOSE": "选择一种语言",
+    "GLOSSARY": "术语表",
+    "GLOSSARY_INDEX": "索引",
+    "GLOSSARY_OPEN": "术语表",
+    "GITBOOK_LINK": "本书使用 GitBook 发布",
+    "SUMMARY": "目录",
+    "SUMMARY_INTRODUCTION": "介绍",
+    "SUMMARY_TOGGLE": "目录",
+    "SEARCH_TOGGLE": "搜索",
+    "SEARCH_PLACEHOLDER": "输入并搜索",
+    "FONTSETTINGS_TOGGLE": "字体设置",
+    "SHARE_TOGGLE": "分享",
+    "SHARE_ON": "分享到 __platform__",
+    "FONTSETTINGS_WHITE": "白色",
+    "FONTSETTINGS_SEPIA": "棕褐色",
+    "FONTSETTINGS_NIGHT": "夜间",
+    "FONTSETTINGS_SANS": "无衬线体",
+    "FONTSETTINGS_SERIF": "衬线体"
+}

theme/i18n/zh-tw.json

@@ -0,0 +1,20 @@
+{
+    "LANGS_CHOOSE": "選擇一種語言",
+    "GLOSSARY": "術語表",
+    "GLOSSARY_INDEX": "索引",
+    "GLOSSARY_OPEN": "術語表",
+    "GITBOOK_LINK": "本書使用 GitBook 釋出",
+    "SUMMARY": "目錄",
+    "SUMMARY_INTRODUCTION": "介紹",
+    "SUMMARY_TOGGLE": "目錄",
+    "SEARCH_TOGGLE": "搜尋",
+    "SEARCH_PLACEHOLDER": "輸入並搜尋",
+    "FONTSETTINGS_TOGGLE": "字型設定",
+    "SHARE_TOGGLE": "分享",
+    "SHARE_ON": "分享到 __platform__",
+    "FONTSETTINGS_WHITE": "白色",
+    "FONTSETTINGS_SEPIA": "棕褐色",
+    "FONTSETTINGS_NIGHT": "夜間",
+    "FONTSETTINGS_SANS": "無襯線體",
+    "FONTSETTINGS_SERIF": "襯線體"
+}

theme/stylesheets/ebook.less

@@ -5,52 +5,33 @@
 
 .page {
     &.page-toc {
-        ol {
-            margin: 0px;
+        .glossary {
+            margin-bottom: 40px;
+
+            h2 {
+                a, a:hover {
+                    color: inherit;
+                    text-decoration: none;
+                }
+            }
+
+            .glossary-index {
+                list-style: none;
+                margin: 0px;
+                padding: 0px;
+
+                li {
+                    display: inline;
+                    margin: 0px 8px;
+                    white-space: nowrap;
+                }
+            }
         }
     }
 
     .book-chapter {
         display: none;
     }
-
-    .exercise, .quiz {
-        margin: 1cm 0cm;
-        border: 2px solid #ddd;
-
-        .exercise-header {
-            padding: 0.1cm 0.3cm;
-            background: #f5f5f5;
-            border-bottom: 1px solid #ddd;
-            font-weight: bold;
-            page-break-inside: avoid;
-        }
-
-        .exercise-inner {
-            padding: 0.15cm 0.3cm;
-
-            p:last-child {
-                margin: 0px;
-            }
-        }
-
-        hr {
-            height: 2px;
-        }
-
-        .question {
-            margin-top: 0.1cm;
-            border-top: 1px solid #ddd;
-
-            .question-base {
-
-            }
-
-            .question-solution {
-
-            }
-        }
-    }
 }
 
 

theme/stylesheets/website.less

@@ -41,7 +41,7 @@ html {
 
 body {
     text-rendering: optimizeLegibility;
-	font-smoothing: antialiased;
-	font-family: @font-family-base;
+    font-smoothing: antialiased;
+    font-family: @font-family-base;
     font-size: @font-size-base;
 }

theme/stylesheets/website/font-settings.less

@@ -1,15 +1,15 @@
 .book-header{
-	#font-settings-wrapper{
-		#enlarge-font-size, #reduce-font-size {
-			line-height: 30px;
-		}
+    #font-settings-wrapper{
+        #enlarge-font-size, #reduce-font-size {
+            line-height: 30px;
+        }
 
-		#enlarge-font-size{
-			font-size: 1.4em;
-		}
-		#reduce-font-size{
-			font-size: 1em;
-		}
-	}
+        #enlarge-font-size{
+            font-size: 1.4em;
+        }
+        #reduce-font-size{
+            font-size: 1em;
+        }
+    }
 }
 

theme/templates/ebook/glossary.html

@@ -4,12 +4,18 @@
 
 {% block content %}
 <div class="page page-toc">
-    <h1>Glossary</h1>
-	{% for item in glossaryIndex %}
-	<section class="normal glossary" id="{{ item.id }}">
-	    <h2><a href="#{{ item.id }}">{{ item.name }}</a></h2>
-	    <p>{{ item.description }}</p>
-	</section>
-	{% endfor %}
+    <h1 class="book-chapter book-chapter-1">{% i18n "GLOSSARY" %}Glossary{% endi18n %}</h1>
+    <h1>{% i18n "GLOSSARY" %}Glossary{% endi18n %}</h1>
+    {% for item in glossary %}
+    <section class="normal glossary" id="{{ item.id }}">
+        <h2><a href="#{{ item.id }}">{{ item.name }}</a></h2>
+        <p>{{ item.description|safe }}</p>
+        <ul class="glossary-index">
+        {% for file in item.files %}
+            <li><a href="{{ basePath }}/{{ file.path|contentLink }}"><span class="level">{{ file.level }}.</span> {{ file.title }}</a></li>
+        {% endfor %}
+        </ul>
+    </section>
+    {% endfor %}
 </div>
 {% endblock %}

theme/templates/ebook/layout.html

@@ -1,5 +1,5 @@
 <!DOCTYPE HTML>
-<html lang="{{ language }}" {% block htmlTag %}{% endblock %}>
+<html lang="{{ language }}" {% block htmlTag %}{% endblock %} {% if options.direction == "rtl" %}dir="rtl"{% endif %}>
     {{ htmlSnippet("html:start")|default("")|safe }}
     <head>
         {{ htmlSnippet("head:start")|default("")|safe }}
@@ -8,8 +8,10 @@
         <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
         <meta name="description" content="{% block description %}{% endblock %}">
         <meta name="generator" content="GitBook {{ gitbook.version }}">
+        {% if options.author %}<meta name="author" content="{{ options.author }}">{% endif %}
+        {% if options.isbn %}<meta name="identifier" content="{{ options.isbn }}" scheme="ISBN">{% endif %}
         {% block head %}{% endblock %}
-        {{ htmlSnippet("head:end")|default("") }}
+        {{ htmlSnippet("head:end")|default("")|safe }}
     </head>
     <body>
         {{ htmlSnippet("body:start")|default("")|safe }}

theme/templates/website/glossary.html

@@ -3,16 +3,15 @@
 {% block title %}{% i18n "GLOSSARY" %}Glossary{% endi18n %} | {{ title }}{% endblock %}
 
 {% block page_inner %}
-	{% for item in glossary %}
-	<section class="normal glossary" id="{{ item.id }}">
-	    <h2><a href="#{{ item.id }}">{{ item.name }}</a></h2>
-	    <p>{{ item.description }}</p>
-	    <h4>{% i18n "GLOSSARY_INDEX" %}Index{% endi18n %}</h4>
-	    <ul class="glossary-index">
-	    {% for file in item.files %}
-	        <li><a href="{{ basePath }}/{{ file.path|contentLink }}"><span class="level">{{ file.level }}.</span> {{ file.title }}</a></li>
-	    {% endfor %}
-	    </ul>
-	</section>
-	{% endfor %}
+    {% for item in glossary %}
+    <section class="normal glossary" id="{{ item.id }}">
+        <h2><a href="#{{ item.id }}">{{ item.name }}</a></h2>
+        <p>{{ item.description|safe }}</p>
+        <ul class="glossary-index">
+        {% for file in item.files %}
+            <li><a href="{{ basePath }}/{{ file.path|contentLink }}"><span class="level">{{ file.level }}.</span> {{ file.title }}</a></li>
+        {% endfor %}
+        </ul>
+    </section>
+    {% endfor %}
 {% endblock %}

theme/templates/website/includes/summary.html

@@ -8,7 +8,7 @@
                         {% if item.level != "0" %}
                             <b>{{ item.level }}.</b>
                         {% endif %}
-                        {% if item.introduction %}{% i18n "SUMMARY_INTRODUCTION" %}Introduction{% endi18n %}{% else %}{{ item.title }}{% endif %}
+                        {% if item.introduction and not item.title %}{% i18n "SUMMARY_INTRODUCTION" %}Introduction{% endi18n %}{% else %}{{ item.title }}{% endif %}
                     </a>
                 {% else %}
                     <a target="_blank" href="{{ item.path }}">
@@ -37,14 +37,14 @@
     </div>
     <ul class="summary">
         {% set _divider = false %}
-    	{% if options.links.sidebar %}
-    	{% for link in options.links.sidebar %}
-    	    {% set _divider = true %}
+        {% if options.links.sidebar %}
+        {% for linkTitle, link in options.links.sidebar %}
+            {% set _divider = true %}
             <li>
-                <a href="{{ options.links.sidebar[loop.key] }}" target="blank" class="custom-link">{{ loop.key }}</a>
+                <a href="{{ link }}" target="blank" class="custom-link">{{ linkTitle }}</a>
             </li>
-    	{% endfor %}
-    	{% endif %}
+        {% endfor %}
+        {% endif %}
 
         {% if _divider %}
         <li class="divider"></li>

theme/templates/website/layout.html

@@ -1,23 +1,22 @@
 <!DOCTYPE HTML>
-<html lang="{{ language }}">
+<html lang="{{ language }}" {% if options.direction == "rtl" %}dir="rtl"{% endif %}>
     {{ htmlSnippet("html:start")|default("")|safe }}
     <head>
-        {{ htmlSnippet("head:start")|default("") }}
+        {{ htmlSnippet("head:start")|default("")|safe }}
         <meta charset="UTF-8">
         <meta http-equiv="X-UA-Compatible" content="IE=11; IE=10; IE=9; IE=8; IE=7; IE=EDGE" />
         <title>{% block title %}{% endblock %}</title>
         <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
         <meta name="description" content="{% block description %}{% endblock %}">
         <meta name="generator" content="GitBook {{ gitbook.version }}">
+        {% if options.author %}<meta name="author" content="{{ options.author }}">{% endif %}
+        {% if options.isbn %}<meta name="identifier" content="{{ options.isbn }}" scheme="ISBN">{% endif %}
         <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="apple-touch-icon-precomposed" sizes="152x152" href="{{ staticBase }}/images/apple-touch-icon-precomposed-152.png">
         <link rel="shortcut icon" href="{{ staticBase }}/images/favicon.ico" type="image/x-icon">
-        {% if options.isbn %}
-        <meta name="identifier" content="{{ options.isbn }}" scheme="ISBN">
-        {% endif %}
         {% block head %}{% endblock %}
         {{ htmlSnippet("head:end")|default("")|safe }}
     </head>