Merge branch 'pr-523' into develop

Author: gnab

src/remark/lexer.js

@@ -21,7 +21,7 @@ var regexByName = {
     FENCES: /(?:^|\n) *(`{3,}|~{3,}) *(?:\S+)? *\n(?:[\s\S]+?)\s*\4 *(?:\n+|$)/,
     DEF: /(?:^|\n) *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/,
     MACRO: /!\[:([^\] ]+)([^\]]*)\](?:\(([^\)]*)\))?/,
-    SLIDE_SEPARATOR: /(?:^|\n)(---)(?:\n|$)/,
+    SLIDE_SEPARATOR: /(?:^|\n)((---?)|(\<\!--\s+break\s+--\>?))(?:\n|$)/,
     FRAGMENT_SEPARATOR: /(?:^|\n)(--)(?![^\n])/,
     NOTES_SEPARATOR: /(?:^|\n)(\?{3})(?:\n|$)/
   };

test/remark/lexer_test.js

@@ -27,6 +27,24 @@ describe('Lexer', function () {
       ]);
     });
 
+    it('should recognize silent separator', function () {
+      lexer.lex('\n<!-- break -->').should.eql([
+        {type: 'separator', text: '<!-- break -->'}
+      ]);
+    });
+
+    it('should not preserve trailing line breaks of silent separators', function () {
+      lexer.lex('\n<!-- break -->\n').should.eql([
+        {type: 'separator', text: '<!-- break -->'}
+      ]);
+    });
+
+    it('should ignore additional whitespace inside of silent separator', function() {
+      lexer.lex('\n<!--    break  -->').should.eql([
+        {type: 'separator', text: '<!--    break  -->'}
+      ]);
+    });
+
     it('should recognize continued separator', function () {
       lexer.lex('\n--').should.eql([
         {type: 'separator', text: '--'},

test/remark/parser_test.js

@@ -11,6 +11,10 @@ describe('Parser', function () {
       parser.parse('1\n---\n2\n---\n3').length.should.equal(3);
     });
 
+    it('should handle multiple slides with the silent separator', function () {
+      parser.parse('1\n<!-- break -->\n2\n<!-- break -->\n3').length.should.equal(3);
+    });
+
     it('should treat empty source as single slide', function () {
       parser.parse('').length.should.equal(1);
     });