1 files changed, 30 insertions, 15 deletions

diff --git a/plugin/markdown/markdown.js b/plugin/markdown/markdown.js
index 8366c50..bc771e7 100755
--- a/plugin/markdown/markdown.js
+++ b/plugin/markdown/markdown.js
@@ -6,6 +6,14 @@
         throw 'The reveal.js Markdown plugin requires marked to be loaded';
     }
 
+    if (typeof hljs !== 'undefined') {
+        marked.setOptions({
+            highlight: function (lang, code) {
+                return hljs.highlightAuto(lang, code).value;
+            }
+        });
+    }
+
     var stripLeadingWhitespace = function(section) {
 
         var template = section.querySelector( 'script' );
@@ -28,9 +36,9 @@
     };
 
     var twrap = function(el) {
-      var cnt = el.content || el;
-      cnt += el.asideContent ? ('<aside class="notes" data-markdown>' + el.asideContent + '</aside>') : '';
-      return '<script type="text/template">' + cnt + '</script>';
+        var content = el.content || el;
+        content += el.asideContent ? ('<aside class="notes" data-markdown>' + el.asideContent + '</aside>') : '';
+        return '<script type="text/template">' + content + '</script>';
     };
 
     var getForwardedAttributes = function(section) {
@@ -53,15 +61,16 @@
         }
 
         return result.join( ' ' );
-    }
+    };
 
     var slidifyMarkdown = function(markdown, separator, vertical, notes, attributes) {
 
         separator = separator || '^\n---\n$';
+        notes = notes || 'note:';
 
-        var reSeparator = new RegExp(separator + (vertical ? '|' + vertical : ''), 'mg'),
-            reHorSeparator = new RegExp(separator),
-            notesSeparator = new RegExp(notes, 'mg'),
+        var separatorRegex = new RegExp( separator + ( vertical ? '|' + vertical : '' ), 'mg' ),
+            horizontalSeparatorRegex = new RegExp( separator ),
+            notesSeparatorRegex = new RegExp( notes, 'mgi' ),
             matches,
             noteMatch,
             lastIndex = 0,
@@ -74,22 +83,22 @@
             markdownSections = '';
 
         // iterate until all blocks between separators are stacked up
-        while( matches = reSeparator.exec(markdown) ) {
+        while( matches = separatorRegex.exec( markdown ) ) {
             asideContent = null;
 
             // determine direction (horizontal by default)
-            isHorizontal = reHorSeparator.test(matches[0]);
+            isHorizontal = horizontalSeparatorRegex.test( matches[0] );
 
             if( !isHorizontal && wasHorizontal ) {
                 // create vertical stack
-                sectionStack.push([]);
+                sectionStack.push( [] );
             }
 
             // pluck slide content from markdown input
-            content = markdown.substring(lastIndex, matches.index);
-            noteMatch = content.split(notesSeparator);
+            content = markdown.substring( lastIndex, matches.index );
+            noteMatch = content.split( notesSeparatorRegex );
 
-            if(noteMatch.length === 2) {
+            if( noteMatch.length === 2 ) {
                 content = noteMatch[0];
                 asideContent = noteMatch[1].trim();
             }
@@ -107,7 +116,7 @@
                 sectionStack[sectionStack.length-1].push(slide);
             }
 
-            lastIndex = reSeparator.lastIndex;
+            lastIndex = separatorRegex.lastIndex;
             wasHorizontal = isHorizontal;
         }
 
@@ -117,7 +126,7 @@
         // flatten the hierarchical stack, and insert <section data-markdown> tags
         for( var k = 0, klen = sectionStack.length; k < klen; k++ ) {
             // vertical
-           if(sectionStack[k].propertyIsEnumerable(length) && typeof sectionStack[k].splice === "function") {
+            if( sectionStack[k].propertyIsEnumerable(length) && typeof sectionStack[k].splice === 'function' ) {
                 markdownSections += '<section '+ attributes +'>' +
                                         '<section data-markdown>' +  sectionStack[k].map(twrap).join('</section><section data-markdown>') + '</section>' +
                                     '</section>';
@@ -143,6 +152,12 @@
                 var xhr = new XMLHttpRequest(),
                     url = section.getAttribute('data-markdown');
 
+                datacharset = section.getAttribute('data-charset');
+                // see https://developer.mozilla.org/en-US/docs/Web/API/element.getAttribute#Notes
+                if (datacharset != null && datacharset != '') {
+                    xhr.overrideMimeType('text/html; charset=' + datacharset);
+                }
+
                 xhr.onreadystatechange = function () {
                     if( xhr.readyState === 4 ) {
                         if (xhr.status >= 200 && xhr.status < 300) {