Bump version to 2.0.0-alpha.9

CHANGES.md

@@ -1,4 +1,18 @@
 # 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-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

lib/book.js

@@ -664,7 +664,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));

package.json

@@ -1,6 +1,6 @@
 {
     "name": "gitbook",
-    "version": "2.0.0-alpha.8",
+    "version": "2.0.0-alpha.9",
     "homepage": "https://www.gitbook.com",
     "description": "Library and cmd utility to generate GitBooks",
     "main": "lib/index.js",
@@ -13,8 +13,8 @@
         "fs-extra": "0.16.3",
         "fstream-ignore": "1.0.2",
         "gitbook-parsers": "0.4.1",
-        "nunjucks": "git+https://github.com/SamyPesse/nunjucks.git#4019d1b7379372336b86ce1b0bf84352a2029747",
-        "nunjucks-autoescape": "0.1.0",
+        "nunjucks": "git+https://github.com/mozilla/nunjucks.git#42d2b9f5c0ad5db8ca3a1fdbba5bde9fc4cc2c45",
+        "nunjucks-autoescape": "0.1.1",
         "nunjucks-filter": "0.1.0",
         "nunjucks-i18n": "1.0.0",
         "semver": "2.2.1",

theme/templates/ebook/layout.html

@@ -9,7 +9,7 @@
         <meta name="description" content="{% block description %}{% endblock %}">
         <meta name="generator" content="GitBook {{ gitbook.version }}">
         {% block head %}{% endblock %}
-        {{ htmlSnippet("head:end")|default("") }}
+        {{ htmlSnippet("head:end")|default("")|safe }}
     </head>
     <body>
         {{ htmlSnippet("body:start")|default("")|safe }}

theme/templates/website/includes/summary.html

@@ -38,10 +38,10 @@
     <ul class="summary">
         {% set _divider = false %}
     	{% if options.links.sidebar %}
-    	{% for link in 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 %}

theme/templates/website/layout.html

@@ -2,7 +2,7 @@
 <html lang="{{ language }}">
     {{ 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>