diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/book.js | 6 | ||||
-rw-r--r-- | lib/generators/site.js | 8 | ||||
-rw-r--r-- | lib/parsers.js | 34 | ||||
-rw-r--r-- | lib/utils/summary.js | 24 |
4 files changed, 11 insertions, 61 deletions
diff --git a/lib/book.js b/lib/book.js index 343a340..639adef 100644 --- a/lib/book.js +++ b/lib/book.js @@ -2,17 +2,17 @@ var Q = require("q"); var _ = require("lodash"); var path = require("path"); +var parsers = require("gitbook-parsers"); + var fs = require("./utils/fs"); var parseNavigation = require("./utils/navigation"); var parseProgress = require("./utils/progress"); var pageUtil = require("./utils/page"); -var summaryUtil = require("./utils/summary"); var Configuration = require("./configuration"); var TemplateEngine = require("./template"); var Plugin = require("./plugin"); -var parsers = require("./parsers"); var generators = require("./generators"); var Book = function(root, options, parent) { @@ -271,7 +271,7 @@ Book.prototype.parseSummary = function() { }); }) .then(function(summary) { - that.summary = summaryUtil.normalize(summary); + that.summary = summary; that.navigation = parseNavigation(that.summary, that.files); }); }; diff --git a/lib/generators/site.js b/lib/generators/site.js index 375fd5c..d5a0c08 100644 --- a/lib/generators/site.js +++ b/lib/generators/site.js @@ -130,7 +130,15 @@ Generator.prototype.writeParsedFile = function(page) { // Write the index for langs Generator.prototype.langsIndex = function(langs) { + var that = this; + var basePath = "."; + + return this._writeTemplate(this.langsTemplate, { + langs: langs, + basePath: basePath, + staticBase: path.join(basePath, "gitbook"), + }, path.join(this.options.output, "index.html")); }; diff --git a/lib/parsers.js b/lib/parsers.js deleted file mode 100644 index 523cb87..0000000 --- a/lib/parsers.js +++ /dev/null @@ -1,34 +0,0 @@ -var _ = require("lodash"); -var path = require("path"); - -// This list is ordered by priority of parsers to use -var PARSER = [ - { - name: "markdown", - extensions: [".md", ".markdown"], - parser: require("gitbook-markdown") - }, - { - name: "asciidoc", - extensions: [".adoc", ".asciidoc"], - parser: require("gitbook-asciidoc") - } -]; - -// Return a specific parser according to an extension -function getParser(ext) { - return _.find(PARSER, function(input) { - return _.contains(input.extensions, ext); - }); -} - -// Return parser for a file -function getParserForFile(filename) { - return getParser(path.extname(filename)); -}; - -module.exports = { - extensions: _.flatten(_.pluck(PARSER, "extensions")), - get: getParser, - getForFile: getParserForFile -}; diff --git a/lib/utils/summary.js b/lib/utils/summary.js deleted file mode 100644 index 274cab3..0000000 --- a/lib/utils/summary.js +++ /dev/null @@ -1,24 +0,0 @@ -var _ = require("lodash"); -var links = require("./links"); - -function normalizeChapters(chapterList, level, base) { - var i = base || 0; - return _.map(chapterList, function(chapter) { - chapter.level = (level? [level || "", i] : [i]).join("."); - chapter.exteral = links.isExternal(chapter.path); - chapter.article = normalizeChapters(chapter.articles || [], chapter.level, 1); - - i = i + 1; - return chapter; - }); -}; - -function normalizeSummary(summary) { - if (_.isArray(summary)) summary = { chapters: summary }; - summary.chapters = normalizeChapters(summary.chapters); - return summary; -}; - -module.exports = { - normalize: normalizeSummary -}; |