summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamy Pessé <samypesse@gmail.com>2015-03-08 22:52:54 +0100
committerSamy Pessé <samypesse@gmail.com>2015-03-08 22:53:18 +0100
commitee3a0ba8016f33ed04b2016d72eba1bc36c24146 (patch)
tree8c806e2d02f791f5ba704e735cf609b1c4c8fb20
parent7a4179a2a207cecc0b2e4bbdfeb3d0929b85a4c8 (diff)
downloadgitbook-ee3a0ba8016f33ed04b2016d72eba1bc36c24146.zip
gitbook-ee3a0ba8016f33ed04b2016d72eba1bc36c24146.tar.gz
gitbook-ee3a0ba8016f33ed04b2016d72eba1bc36c24146.tar.bz2
Fix #633: update markdown parser to fix codeblocks
Sort glossary and fix #634
-rw-r--r--lib/book.js9
-rw-r--r--package.json2
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/book.js b/lib/book.js
index 38448dd..aee425c 100644
--- a/lib/book.js
+++ b/lib/book.js
@@ -507,13 +507,20 @@ 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);
})
// Prepare and Parse markup
- .then(filetype.page.prepare)
.then(function(content) {
page.content = content;
diff --git a/package.json b/package.json
index 05dcc69..dc03970 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
"resolve": "0.6.3",
"fs-extra": "0.16.3",
"fstream-ignore": "1.0.2",
- "gitbook-parsers": "0.5.0",
+ "gitbook-parsers": "0.5.1",
"nunjucks": "git+https://github.com/mozilla/nunjucks.git#42d2b9f5c0ad5db8ca3a1fdbba5bde9fc4cc2c45",
"nunjucks-autoescape": "0.1.1",
"nunjucks-filter": "0.1.0",