Bump version to 2.1.0

Fix #775: add optional print.css style

CHANGES.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.1.0
+- Fix error in calcul of `levels` in table of contents, error introduced a few versions ago
+- Add optional `styles/print.css` to replace `print.css` used in ebook
+
 ## 2.0.4
 - Fix `{% raw %}`, got confused with "fake" variable declarations
 - Fix title of language chooser

lib/configuration.js

@@ -186,6 +186,7 @@ Configuration.DEFAULT = {
     // CSS Styles
     "styles": {
         "website": "styles/website.css",
+        "print": "styles/print.css",
         "ebook": "styles/ebook.css",
         "pdf": "styles/pdf.css",
         "mobi": "styles/mobi.css",

lib/generators/ebook.js

@@ -18,7 +18,7 @@ var Generator = function(book, format) {
     this.namespace = "ebook";
 
     // Styles to use
-    this.styles = _.compact(["ebook", this.ebookFormat]);
+    this.styles = _.compact(["print", "ebook", this.ebookFormat]);
 
     // Convert images (svg -> png)
     this.convertImages = true;

lib/generators/website.js

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

package.json

@@ -1,6 +1,6 @@
 {
     "name": "gitbook",
-    "version": "2.0.4",
+    "version": "2.1.0",
     "homepage": "https://www.gitbook.com",
     "description": "Library and cmd utility to generate GitBooks",
     "main": "lib/index.js",
@@ -12,7 +12,7 @@
         "resolve": "0.6.3",
         "fs-extra": "0.16.5",
         "fstream-ignore": "1.0.2",
-        "gitbook-parsers": "0.7.5",
+        "gitbook-parsers": "0.7.6",
         "nunjucks": "mozilla/nunjucks#103513c294835bcbe64222de6db494e2555e294e",
         "nunjucks-autoescape": "1.0.0",
         "nunjucks-filter": "1.0.0",

test/assertions.js

@@ -35,7 +35,7 @@ should.Assertion.add('html', function(rules, description) {
         var $el = $(query);
 
         // Test number of elements
-        $el.should.have.lengthOf(validations.count);
+        $el.length.should.be.equal(validations.count);
 
         // Test text
         if (validations.text !== undefined) {

test/books/style-print/README.md

@@ -0,0 +1,3 @@
+# Readme
+
+Default description for the book.

test/books/style-print/SUMMARY.md

@@ -0,0 +1 @@
+# Summary

test/books/style-print/styles/print.css

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

test/ebook.js

@@ -21,4 +21,35 @@ describe('eBook generator', function () {
             book.should.have.file("gitbook/style.css");
         });
     });
+
+    describe('Custom styles', function() {
+        var book;
+
+        before(function() {
+            return books.generate("style-print", "ebook")
+                .then(function(_book) {
+                    book = _book;
+                });
+        });
+
+        it('should remove default print.css', function() {
+            var PAGE = fs.readFileSync(
+                path.join(book.options.output, "index.html"),
+                { encoding: "utf-8" }
+            );
+            PAGE.should.be.html({
+                "link": {
+                    count: 1,
+                    attributes: {
+                        href: "./styles/print.css"
+                    }
+                }
+            });
+        });
+
+        it('should correctly print.css', function() {
+            book.should.have.file("styles");
+            book.should.have.file("styles/print.css");
+        });
+    })
 });

theme/templates/ebook/layout.html

@@ -11,11 +11,11 @@
         {% 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 %}
+        {% block style %}{% endblock %}
         {{ htmlSnippet("head:end")|default("", true)|safe }}
     </head>
     <body>
         {{ htmlSnippet("body:start")|default("", true)|safe }}
-        {% block style %}{% endblock %}
         {% block content %}{% endblock %}
         {% block javascript %}{% endblock %}
         {{ htmlSnippet("body:end")|default("", true)|safe }}

theme/templates/ebook/page.html

@@ -3,7 +3,9 @@
 {% block title %}{{ progress.current.title }} | {{ title }}{% endblock %}
 
 {% block style %}
+    {% if not styles.print %}
     <link rel="stylesheet" href="{{ staticBase }}/print.css">
+    {% endif %}
     {% for resource in plugins.resources.css %}
         {% if resource.url %}
         <link rel="stylesheet" href="{{ resource.url }}">
@@ -11,7 +13,7 @@
         <link rel="stylesheet" href="{{ staticBase }}/plugins/{{ resource.path }}">
         {% endif %}
     {% endfor %}
-    {% for style in styles %}
+    {% for type, style in styles %}
         <link rel="stylesheet" href="{{ basePath }}/{{ style }}">
     {% endfor %}
 {% endblock %}

theme/templates/website/page.html

@@ -70,7 +70,7 @@ require(["gitbook"], function(gitbook) {
         <link rel="stylesheet" href="{{ staticBase }}/plugins/{{ resource.path }}">
         {% endif %}
     {% endfor %}
-    {% for style in styles %}
+    {% for type, style in styles %}
         <link rel="stylesheet" href="{{ basePath }}/{{ style }}">
     {% endfor %}
 {% endblock %}