From 16ebf2a783724527faac2036bc2f971df8dea0a5 Mon Sep 17 00:00:00 2001 From: Riceball LEE Date: Wed, 11 Nov 2015 07:37:08 +0000 Subject: * [bug] the markdown plugin can not render highlight codes for marked.setOptions(highlight) --- test/simple.md | 10 ++++++++++ test/test-markdown-external.html | 36 ++++++++++++++++++++++++++++++++++++ test/test-markdown-external.js | 19 +++++++++++++++++++ 3 files changed, 65 insertions(+) create mode 100644 test/simple.md create mode 100644 test/test-markdown-external.html create mode 100644 test/test-markdown-external.js (limited to 'test') diff --git a/test/simple.md b/test/simple.md new file mode 100644 index 0000000..cd57d70 --- /dev/null +++ b/test/simple.md @@ -0,0 +1,10 @@ +## Slide 1.1 + +```js +var a = 1; +``` + +## Slide 1.2 + + +## Slide 2 diff --git a/test/test-markdown-external.html b/test/test-markdown-external.html new file mode 100644 index 0000000..859d0a1 --- /dev/null +++ b/test/test-markdown-external.html @@ -0,0 +1,36 @@ + + + + + + + reveal.js - Test Markdown + + + + + + + +
+
+ + + + + + + + + + + + + + diff --git a/test/test-markdown-external.js b/test/test-markdown-external.js new file mode 100644 index 0000000..a9ea034 --- /dev/null +++ b/test/test-markdown-external.js @@ -0,0 +1,19 @@ + + +Reveal.addEventListener( 'ready', function() { + + QUnit.module( 'Markdown' ); + + test( 'Vertical separator', function() { + strictEqual( document.querySelectorAll( '.reveal .slides>section>section' ).length, 2, 'found two slides' ); + }); + test( 'language highlighter', function() { + strictEqual( document.querySelectorAll( '.hljs-keyword' ).length, 1, 'got rendered highlight tag.' ); + strictEqual( document.querySelector( '.hljs-keyword' ).innerHTML, 'var', 'the same keyword: var.' ); + }); + + +} ); + +Reveal.initialize(); + -- cgit v1.2.3 From 993526ff67a46ff3d7749014b7b0841a00831ad5 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Fri, 8 Jan 2016 14:18:53 +0100 Subject: fix broken iframe in backgrounds example --- test/examples/slide-backgrounds.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/examples/slide-backgrounds.html b/test/examples/slide-backgrounds.html index 4e5e406..316c92a 100644 --- a/test/examples/slide-backgrounds.html +++ b/test/examples/slide-backgrounds.html @@ -93,7 +93,7 @@

Video background

-
+

Iframe background

-- cgit v1.2.3 From e4634f20e8be5075882b3cc49a169e0fa1ae8f6a Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Wed, 22 Jun 2016 09:24:09 +0200 Subject: revise simple.md so that slide 1.1 and 1.2 correctly break into separate slides --- test/simple.md | 2 ++ test/test-markdown-external.js | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/simple.md b/test/simple.md index cd57d70..c72a440 100644 --- a/test/simple.md +++ b/test/simple.md @@ -4,7 +4,9 @@ var a = 1; ``` + ## Slide 1.2 + ## Slide 2 diff --git a/test/test-markdown-external.js b/test/test-markdown-external.js index a9ea034..cab85c6 100644 --- a/test/test-markdown-external.js +++ b/test/test-markdown-external.js @@ -7,7 +7,12 @@ Reveal.addEventListener( 'ready', function() { test( 'Vertical separator', function() { strictEqual( document.querySelectorAll( '.reveal .slides>section>section' ).length, 2, 'found two slides' ); }); - test( 'language highlighter', function() { + + test( 'Horizontal separator', function() { + strictEqual( document.querySelectorAll( '.reveal .slides>section' ).length, 2, 'found two slides' ); + }); + + test( 'Language highlighter', function() { strictEqual( document.querySelectorAll( '.hljs-keyword' ).length, 1, 'got rendered highlight tag.' ); strictEqual( document.querySelector( '.hljs-keyword' ).innerHTML, 'var', 'the same keyword: var.' ); }); -- cgit v1.2.3 From 90b301d0a03b8b23ce755c31ec6dac15cf69dc49 Mon Sep 17 00:00:00 2001 From: Benjamin Tan Date: Thu, 8 Dec 2016 17:41:55 +0800 Subject: Enable passing options for parsing Markdown. Closes #1163, #1495. --- README.md | 12 ++++++++++++ plugin/markdown/markdown.js | 32 +++++++++++++++++++------------- test/test-markdown-options.html | 41 +++++++++++++++++++++++++++++++++++++++++ test/test-markdown-options.js | 26 ++++++++++++++++++++++++++ test/test-markdown.html | 2 +- 5 files changed, 99 insertions(+), 14 deletions(-) create mode 100644 test/test-markdown-options.html create mode 100644 test/test-markdown-options.js (limited to 'test') diff --git a/README.md b/README.md index b0257cc..1c55623 100644 --- a/README.md +++ b/README.md @@ -160,6 +160,18 @@ Special syntax (in html comment) is available for adding attributes to the slide
``` +#### Configuring `marked` + +We use [marked](https://github.com/chjj/marked) to parse Markdown. To customise marked's rendering, you can pass in options when [configuring Reveal](#configuration): + +```javascript +Reveal.initialize({ + // Options which are passed into marked + // See https://github.com/chjj/marked#options-1 + markdown: { + smartypants: true + } +}); ### Configuration diff --git a/plugin/markdown/markdown.js b/plugin/markdown/markdown.js index 124aa75..29aabf5 100755 --- a/plugin/markdown/markdown.js +++ b/plugin/markdown/markdown.js @@ -17,18 +17,6 @@ } }( this, function( marked ) { - if( typeof marked === 'undefined' ) { - throw 'The reveal.js Markdown plugin requires marked to be loaded'; - } - - if( typeof hljs !== 'undefined' ) { - marked.setOptions({ - highlight: function( code, lang ) { - return hljs.highlightAuto( code, [lang] ).value; - } - }); - } - var DEFAULT_SLIDE_SEPARATOR = '^\r?\n---\r?\n$', DEFAULT_NOTES_SEPARATOR = 'note:', DEFAULT_ELEMENT_ATTRIBUTES_SEPARATOR = '\\\.element\\\s*?(.+?)$', @@ -189,7 +177,7 @@ markdownSections += '
'; sectionStack[i].forEach( function( child ) { - markdownSections += '
' + createMarkdownSlide( child, options ) + '
'; + markdownSections += '
' + createMarkdownSlide( child, options ) + '
'; } ); markdownSections += '
'; @@ -391,6 +379,24 @@ return { initialize: function() { + if( typeof marked === 'undefined' ) { + throw 'The reveal.js Markdown plugin requires marked to be loaded'; + } + + if( typeof hljs !== 'undefined' ) { + marked.setOptions({ + highlight: function( code, lang ) { + return hljs.highlightAuto( code, [lang] ).value; + } + }); + } + + var options = Reveal.getConfig().markdown; + + if ( options ) { + marked.setOptions( options ); + } + processSlides(); convertSlides(); }, diff --git a/test/test-markdown-options.html b/test/test-markdown-options.html new file mode 100644 index 0000000..5b3be97 --- /dev/null +++ b/test/test-markdown-options.html @@ -0,0 +1,41 @@ + + + + + + + reveal.js - Test Markdown Options + + + + + + + +
+
+ + + + + + + + + + + diff --git a/test/test-markdown-options.js b/test/test-markdown-options.js new file mode 100644 index 0000000..3ae1350 --- /dev/null +++ b/test/test-markdown-options.js @@ -0,0 +1,26 @@ +Reveal.addEventListener( 'ready', function() { + + QUnit.module( 'Markdown' ); + + test( 'Options are set', function() { + strictEqual( marked.defaults.smartypants, true ); + }); + + test( 'Smart quotes are activated', function() { + var text = document.querySelector( '.reveal .slides>section>p' ).textContent; + + strictEqual( /['"]/.test( text ), false ); + strictEqual( /[“”‘’]/.test( text ), true ); + }); + +} ); + +Reveal.initialize({ + dependencies: [ + { src: '../plugin/markdown/marked.js' }, + { src: '../plugin/markdown/markdown.js' }, + ], + markdown: { + smartypants: true + } +}); diff --git a/test/test-markdown.html b/test/test-markdown.html index 7ff0efe..52b39ff 100644 --- a/test/test-markdown.html +++ b/test/test-markdown.html @@ -13,7 +13,7 @@
-
+