Bump version to 0.2.1

Disable automatic highlighting

README.md

@@ -35,7 +35,6 @@ Options for commands `build` and `serve` are:
 -g, --github <repo_path> ID of github repo like : username/repo
 -o, --output <directory>  Path to output directory, defaults to ./_book
 -f, --format <name>       Change generation format, defaults to site, availables are: site, page, pdf, json
--i, --intro <intro>       Description of the book to generate
 --githubHost <url>   The url of the github host (defaults to https://github.com/)
 --theme <path>            Path to theme directory
 ```

lib/generate/fs.js

@@ -16,7 +16,8 @@ var getFiles = function(path) {
 
     // Add extra rules to ignore common folders
     ig.addIgnoreRules([
-        '.git/'
+        '.git/',
+        '.gitignore',
     ], '__custom_stuff');
 
     // Push each file to our list

lib/generate/index.js

@@ -129,6 +129,15 @@ var generate = function(options) {
                 });
             })
 
+            // Skip processing some files
+            .then(function() {
+                files = _.filter(files, function (file) {
+                    return !(
+                        file === 'SUMMARY.md'
+                    );
+                });
+            })
+
             // Copy file and replace markdown file
             .then(function() {
                 return Q.all(
@@ -177,7 +186,7 @@ var generateFile = function(options) {
     return Q.nfcall(tmp.dir)
     .then(function(tmpDir) {
         return generate(
-            _.extend({}, 
+            _.extend({},
                 options,
                 {
                     output: tmpDir
@@ -195,7 +204,7 @@ var generateFile = function(options) {
                     _outputFile = _outputFile.slice(0, -path.extname(_outputFile).length)+"_"+lang+path.extname(_outputFile);
                     _tmpDir = path.join(_tmpDir, lang);
                 }
-                
+
                 return fs.copy(
                     path.join(_tmpDir, "index."+ext),
                     _outputFile

lib/parse/lex.js

@@ -56,7 +56,7 @@ function isQuiz(nodes) {
 
     if(
         // List of questions
-        listIdx !== -1 && isQuizNode(quizNodes[listIdx + 1]) &&
+        listIdx !== -1 && isQuizNode(quizNodes[listIdx + 1]) ||
 
         // Table of questions
         (

lib/parse/page.js

@@ -8,17 +8,6 @@ var renderer = require('./renderer');
 var lnormalize = require('../utils/lang').normalize;
 
 
-// Synchronous highlighting with highlight.js
-marked.setOptions({
-    highlight: function (code, lang) {
-        try {
-            return hljs.highlight(lang, code).value;
-        } catch(e) {
-            return hljs.highlightAuto(code).value;
-        }
-    }
-});
-
 
 // Render a section using our custom renderer
 function render(section, _options) {
@@ -30,7 +19,21 @@ function render(section, _options) {
 
     // Build options using defaults and our custom renderer
     var options = _.extend({}, marked.defaults, {
-        renderer: renderer(null, _options)
+        renderer: renderer(null, _options),
+
+        // Synchronous highlighting with highlight.js
+        highlight: function (code, lang) {
+            if(!lang) return code;
+
+            // Normalize lang
+            lang = lnormalize(lang);
+
+            try {
+                return hljs.highlight(lang, code).value;
+            } catch(e) { }
+
+            return code;
+        }
     });
 
     return marked.parser(section, options);

package.json

@@ -1,6 +1,6 @@
 {
     "name": "gitbook",
-    "version": "0.2.0",
+    "version": "0.2.1",
     "description": "Library and cmd utility to generate GitBooks",
     "main": "lib/index.js",
     "dependencies": {

test/fixtures/QUIZ_PAGE.md

@@ -31,3 +31,18 @@ Some more nice content ....
 [Cool stuff](http://gitbook.io)
 
 [Link to another Markdown file](./xyz/file.md)
+
+---
+
+Quiz test 2: What does Gitbook support?
+- [x] Table-based questions with radio buttons
+- [x] Table-based questions with checkboxes
+- [ ] Telepathy
+- [x] List-based questions with checkboxes
+- [x] List-based questions with radio buttons
+- [ ] Moon-on-a-stick
+
+> Gitbook supports table and list based quiz questions using either radio buttons or checkboxes.
+
+---
+

test/page.js

@@ -28,6 +28,7 @@ describe('Page parsing', function() {
         assert.equal(QUIZ_LEXED[0].type, 'normal');
         assert.equal(QUIZ_LEXED[1].type, 'quiz');
         assert.equal(QUIZ_LEXED[2].type, 'normal');
+        assert.equal(QUIZ_LEXED[3].type, 'quiz');
     });
 
     it('should gen content for normal sections', function() {

theme/javascript/core/navigation.js

@@ -38,10 +38,17 @@ define([
             });
             $("head").html(headContent);
 
-            // Update header, body and summary
+            // Update header, body
             $('.book-header').html($page.find('.book-header').html());
             $('.book-body').html($page.find('.book-body').html());
+
+            // Update summary
+            var scrollPosition = $('.book-summary .summary').scrollTop();
             $('.book-summary').html($page.find('.book-summary').html());
+            $('.book-summary .summary').scrollTop(scrollPosition);
+
+            // Update state
+            state.update($page);
 
             if (push) updateHistory(url, null);
             preparePage();

theme/javascript/core/state.js

@@ -1,14 +1,19 @@
 define([
     "jQuery"
 ], function() {
-    var $book = $(".book");
+    var state = {};
 
-    return {
+    state.update = function(dom) {
-      '$book': $book,
+        var $book = $(dom.find(".book"));
 
-      'githubId': $book.data("github"),
+        state.$book = $book;
-      'level': $book.data("level"),
+        state.githubId = $book.data("github");
-      'basePath': $book.data("basepath"),
+        state.level = $book.data("level");
-      'revision': $book.data("revision")
+        state.basePath = $book.data("basepath");
+        state.revision = $book.data("revision");
     };
+
+    state.update($);
+
+    return state;
 });

theme/stylesheets/book/languages.less

@@ -37,8 +37,6 @@
                 padding: 10px 5px;
                 font-size: 16px;
 
-                border-bottom: 1px solid #eee;
-
                 a {
 
                 }