Merge branch 'improve/template-blocks'

lib/configuration.js

@@ -100,7 +100,7 @@ Configuration.prototype.load = function() {
 
         try {
             configPath = require.resolve(
-                path.resolve(that.book.root, that.options.configFile)
+                that.book.resolve(that.options.configFile)
             );
 
             // Invalidate node.js cache for livreloading
@@ -125,7 +125,7 @@ Configuration.prototype.load = function() {
             that.book.log.warn.ln("gitbook version specified in your book.json might be too strict for future patches, \""+(_.first(pkg.version.split("."))+".x.x")+"\" is more adequate");
         }
 
-        that.options.output = path.resolve(that.options.output || path.join(that.book.root, "_book"));
+        that.options.output = path.resolve(that.options.output || that.book.resolve("_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);

lib/generator.js

@@ -36,7 +36,7 @@ BaseGenerator.prototype.convertFile = function(input) {
 // Copy file to the output (non parsable)
 BaseGenerator.prototype.transferFile = function(input) {
     return fs.copy(
-        path.join(this.book.root, input),
+        this.book.resolve(input),
         path.join(this.options.output, input)
     );
 };
@@ -53,8 +53,8 @@ BaseGenerator.prototype.copyCover = function() {
     var that = this;
 
     return Q.all([
-        fs.copy(path.join(that.book.root, "cover.jpg"), path.join(that.options.output, "cover.jpg")),
-        fs.copy(path.join(that.book.root, "cover_small.jpg"), path.join(that.options.output, "cover_small.jpg"))
+        fs.copy(that.book.resolve("cover.jpg"), path.join(that.options.output, "cover.jpg")),
+        fs.copy(that.book.resolve("cover_small.jpg"), path.join(that.options.output, "cover_small.jpg"))
     ])
     .fail(function() {
         // If orignaly from multi-lang, try copy from parent

lib/generators/website.js

@@ -50,7 +50,7 @@ Generator.prototype.prepareStyles = function() {
     this.styles = _.chain(this.styles)
         .map(function(style) {
             var stylePath = that.options.styles[style];
-            if (stylePath && fs.existsSync(path.resolve(that.book.root, stylePath))) {
+            if (stylePath && fs.existsSync(that.book.resolve(stylePath))) {
                 return [style, stylePath];
             }
             return null;

lib/template.js

@@ -30,7 +30,7 @@ var BookLoader = nunjucks.Loader.extend({
         git.resolveFile(fileurl)
         .then(function(filepath) {
             // Is local file
-            if (!filepath) filepath = path.resolve(that.book.root, fileurl);
+            if (!filepath) filepath = that.book.resolve(fileurl);
             else that.book.log.debug.ln("resolve from git", fileurl, "to", filepath)
 
             //  Read file from absolute path