Bump version to 2.3.2

Fix blocks in asciidoc

AUTHORS.md

@@ -50,6 +50,7 @@ Translators
     - Iancu Aurel (@awrelll)
 - Korean
     - Iancu Aurel (@awrelll)
+    - SangYeob Yu (@deminoth)
 - Vietnamese
     - Hong Nguyen (@nghong)
 - Hebrew

CHANGES.md

@@ -2,6 +2,19 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.3.2
+- Fix blocks (like maths) in Asciidoc
+- Fix error when checking gitbook version
+
+## 2.3.1
+- Fix black font color for ebooks (mobi, pdf and epub)
+- Fix ISO code for korean language
+- Fix korean translation
+- Fix syntax highlighting for asciidoc
+- Fix inline html escaping in markdown
+- Add warning for file outside SUMMARY
+- Force SUMMARY entries to be unique by filename
+
 ## 2.3.0
 - Fix nunjucks issue with multiple `{% raw %}` blocks
 - Fix crash when git conref failed

README.md

@@ -2,8 +2,8 @@ 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)
+[![Linux 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/63nlflxcwmb2pue6?svg=true)](https://ci.appveyor.com/project/GitBook/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).
 

lib/configuration.js

@@ -121,8 +121,8 @@ Configuration.prototype.load = 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"));
+        if (that.options.gitbook != '*' && !semver.satisfies(semver.inc(pkg.version, 'patch'), that.options.gitbook)) {
+            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"));

lib/index.js

@@ -158,7 +158,7 @@ module.exports = {
                             .then(function(filepath) {
                                 // set livereload path
                                 lrPath = filepath;
-                                console.log("Restart after change in files");
+                                console.log("Restart after change in file", filepath);
                                 console.log('');
                                 return generate();
                             })

lib/template.js

@@ -103,16 +103,16 @@ TemplateEngine.prototype.processBlock = function(blk) {
         return blk.body;
     }
 
-    // Return it as a macro
-    return "%+%"+blk.id+"%+%";
+    // Return it as a position marker
+    return "@%@"+blk.id+"@%@";
 };
 
-// Replace blocks by body after processing
-// This is done to avoid that markdown processer parse the block content
+// Replace position markers of blocks by body after processing
+// This is done to avoid that markdown/asciidoc processer parse the block content
 TemplateEngine.prototype.replaceBlocks = function(content) {
     var that = this;
 
-    return content.replace(/\%\+\%([\s\S]+?)\%\+\%/g, function(match, key) {
+    return content.replace(/\@\%\@([\s\S]+?)\@\%\@/g, function(match, key) {
         var blk = that.blocks[key];
         if (!blk) return match;
 

lib/utils/page.js

@@ -13,6 +13,8 @@ var fs = require('./fs');
 var batch = require('./batch');
 var code = require('./code');
 
+var parsableExtensions = require('gitbook-parsers').extensions;
+
 // Render a cheerio dom as html
 var renderDom = function($, dom, options) {
     if (!dom && $._root && $._root.children) {
@@ -196,11 +198,19 @@ function normalizeHtml(src, options) {
             var absolutePath = links.join(options.base, parts.pathname);
             var anchor = parts.hash || "";
 
+
             // If is in navigation relative: transform as content
             if (options.navigation[absolutePath]) {
                 absolutePath = options.book.contentLink(absolutePath);
             }
 
+            // If md/adoc/rst files is not in summary
+            // or for ebook, signal all files that are outside the summary
+            else if (_.contains(parsableExtensions, path.extname(absolutePath))
+            || _.contains(['epub', 'pdf', 'mobi'], options.book.options.generator)) {
+                options.book.log.warn.ln("page", options.input, "contains an hyperlink to resource outside spine '"+href+"'");
+            }
+
             // Transform as absolute
             href = links.toAbsolute("/"+absolutePath, options.base, options.output)+anchor;
         } else {
@@ -219,7 +229,12 @@ function normalizeHtml(src, options) {
                 ($(this).attr("class") || "").split(" ")
             )
             .map(function(cl) {
+                // Markdown
                 if (cl.search("lang-") === 0) return cl.slice("lang-".length);
+
+                // Asciidoc
+                if (cl.search("language-") === 0) return cl.slice("language-".length);
+
                 return null;
             })
             .compact()

package.json

@@ -1,6 +1,6 @@
 {
     "name": "gitbook",
-    "version": "2.3.0",
+    "version": "2.3.2",
     "homepage": "https://www.gitbook.com",
     "description": "Library and cmd utility to generate GitBooks",
     "main": "lib/index.js",
@@ -12,16 +12,16 @@
         "resolve": "0.6.3",
         "fs-extra": "0.16.5",
         "fstream-ignore": "1.0.2",
-        "gitbook-parsers": "0.7.7",
+        "gitbook-parsers": "0.8.1",
         "nunjucks": "mozilla/nunjucks#b4351ec0752b102ebd02c5e2cbc2898a6e0e4839",
         "nunjucks-autoescape": "1.0.0",
         "nunjucks-filter": "1.0.0",
         "i18n": "0.5.0",
-        "semver": "2.2.1",
+        "semver": "5.0.1",
         "npmi": "0.1.1",
         "cheerio": "0.19.0",
         "gitbook-plugin-livereload": "0.0.1",
-        "chokidar": "~1.0.1",
+        "chokidar": "~1.0.5",
         "send": "0.2.0",
         "tiny-lr": "0.1.5",
         "tmp": "0.0.24",
@@ -32,7 +32,7 @@
         "npm": "2.4.1",
         "dom-serializer": "0.1.0",
         "spawn-cmd": "0.0.2",
-        "highlight.js": "8.6.0",
+        "highlight.js": "8.8.0",
         "escape-string-regexp": "1.0.3"
     },
     "devDependencies": {

test/plugins.js

@@ -3,6 +3,7 @@ var should = require('should');
 var path = require('path');
 
 var Plugin = require('../lib/plugin');
+var parsers = require("gitbook-parsers");
 var PLUGINS_ROOT = path.resolve(__dirname, 'plugins');
 
 describe('Plugins', function () {
@@ -200,5 +201,38 @@ describe('Plugins', function () {
                 });
         });
     });
+
+    describe('Blocks without parsing', function() {
+        var plugin;
+
+        before(function() {
+            plugin = new Plugin(book, "blocks");
+            plugin.load("./blocks", PLUGINS_ROOT);
+
+            return book.plugins.load(plugin);
+        });
+
+        var testTpl = function(markup, str, args, options) {
+            var filetype = parsers.get(markup);
+
+            return book.template.renderString(str, args, options)
+            .then(filetype.page).get('sections').get(0).get('content')
+            .then(book.template.postProcess)
+        };
+
+        it('should correctly process unparsable for markdown', function() {
+            return testTpl('.md', '{% test %}**hello**{% endtest %}')
+                .then(function(content) {
+                    content.should.equal("<p>test**hello**test</p>\n");
+                });
+        });
+
+        it('should correctly process unparsable for asciidoc', function() {
+            return testTpl('.adoc', '{% test %}**hello**{% endtest %}')
+                .then(function(content) {
+                    content.should.equal('<div class="paragraph">\n<p>test**hello**test</p>\n</div>');
+                });
+        });
+    });
 });
 

theme/i18n/ko.json

@@ -3,18 +3,18 @@
     "GLOSSARY": "어휘",
     "GLOSSARY_INDEX": "색인",
     "GLOSSARY_OPEN": "어휘",
-    "GITBOOK_LINK": "에 게시 GitBook",
+    "GITBOOK_LINK": "GitBook에 게시",
     "SUMMARY": "차례",
     "SUMMARY_INTRODUCTION": "소개",
     "SUMMARY_TOGGLE": "차례",
-    "SEARCH_TOGGLE": "수색",
+    "SEARCH_TOGGLE": "검색",
     "SEARCH_PLACEHOLDER": "검색어 입력",
     "FONTSETTINGS_TOGGLE": "글꼴 설정",
-    "SHARE_TOGGLE": "몫",
-    "SHARE_ON": "공유 {{platform}}",
+    "SHARE_TOGGLE": "공유",
+    "SHARE_ON": "{{platform}}에 공유",
     "FONTSETTINGS_WHITE": "화이트",
-    "FONTSETTINGS_SEPIA": "Sepia",
-    "FONTSETTINGS_NIGHT": "밤",
-    "FONTSETTINGS_SANS": "Sans",
-    "FONTSETTINGS_SERIF": "Serif"
+    "FONTSETTINGS_SEPIA": "세피아",
+    "FONTSETTINGS_NIGHT": "나이트",
+    "FONTSETTINGS_SANS": "고딕",
+    "FONTSETTINGS_SERIF": "명조"
 }

theme/stylesheets/ebook.less

@@ -39,6 +39,6 @@
 body {
     .page {
         font-family: sans-serif;
-        .markdown-content(#333, 1.6);
+        .markdown-content(#000, 1.6);
     }
 }