'+i(c)+"
")}),a=a.replace(/^(\#{1,6})[ \t]*(.+?)[ \t]*\#*\n+/gm,function(a,c,d){var e=c.length;return t(""+d+"\n"+e+"\n"+f+""}),a},v=function(a){return a=a.replace(/&/g,"&"),a=a.replace(//g,">"),a=G(a,"*_{}[]\\",!1),a},w=function(a){return a=a.replace(/(\*\*|__)(?=\S)([^\r]*?\S[*_]*)\1/g,"$2"),a=a.replace(/(\*|_)(?=\S)([^\r]*?\S)\1/g,"$2"),a},x=function(a){return a=a.replace(/((^[ \t]*>[ \t]?.+\n(.+\n)*\n*)+)/gm,function(a,b){var c=b;return c=c.replace(/^[ \t]*>[ \t]?/gm,"~0"),c=c.replace(/~0/g,""),c=c.replace(/^[ \t]+$/gm,""),c=h(c),c=c.replace(/(^|\n)/g,"$1 "),c=c.replace(/(\s*[^\r]+?<\/pre>)/gm,function(a,b){var c=b;return c=c.replace(/^ /mg,"~0"),c=c.replace(/~0/g,""),c}),t("\n"+c+"\n
")}),a},y=function(a){a=a.replace(/^\n+/g,""),a=a.replace(/\n+$/g,"");var b=a.split(/\n{2,}/g),d=new Array,e=b.length;for(var f=0;f=0?d.push(g):g.search(/\S/)>=0&&(g=i(g),g=g.replace(/^([ \t]*)/g,""),g+="
",d.push(g))}e=d.length;for(var f=0;f=0){var h=c[RegExp.$1];h=h.replace(/\$/g,"$$$$"),d[f]=d[f].replace(/~K\d+K/,h)}return d.join("\n\n")},z=function(a){return a=a.replace(/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/g,"&"),a=a.replace(/<(?![a-z\/?\$!])/gi,"<"),a},A=function(a){return a=a.replace(/\\(\\)/g,H),a=a.replace(/\\([`*_{}\[\]()>#+-.!])/g,H),a},B=function(a){return a=a.replace(/<((https?|ftp|dict):[^'">\s]+)>/gi,'$1'),a=a.replace(/<(?:mailto:)?([-.\w]+\@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)>/gi,function(a,b){return C(D(b))}),a},C=function(a){function b(a){var b="0123456789ABCDEF",c=a.charCodeAt(0);return b.charAt(c>>4)+b.charAt(c&15)}var c=[function(a){return"&#"+a.charCodeAt(0)+";"},function(a){return"&#x"+b(a)+";"},function(a){return a}];return a="mailto:"+a,a=a.replace(/./g,function(a){if(a=="@")a=c[Math.floor(Math.random()*2)](a);else if(a!=":"){var b=Math.random();a=b>.9?c[2](a):b>.45?c[1](a):c[0](a)}return a}),a=''+a+"",a=a.replace(/">.+:/g,'">'),a},D=function(a){return a=a.replace(/~E(\d+)E/g,function(a,b){var c=parseInt(b);return String.fromCharCode(c)}),a},E=function(a){return a=a.replace(/^(\t|[ ]{1,4})/gm,"~0"),a=a.replace(/~0/g,""),a},F=function(a){return a=a.replace(/\t(?=\t)/g," "),a=a.replace(/\t/g,"~A~B"),a=a.replace(/~B(.+?)~A/g,function(a,b,c){var d=b,e=4-d.length%4;for(var f=0;f
+
+
+
+
+
+ reveal.js - The HTML Presentation Framework
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/plugin/markdown/markdown.js b/plugin/markdown/markdown.js
index b1660a1..8d40019 100644
--- a/plugin/markdown/markdown.js
+++ b/plugin/markdown/markdown.js
@@ -6,11 +6,7 @@
throw 'The reveal.js Markdown plugin requires Showdown to be loaded';
}
- var sections = document.querySelectorAll( '[data-markdown]' );
-
- for( var i = 0, len = sections.length; i < len; i++ ) {
- var section = sections[i];
- var notes = section.querySelector( 'aside.notes' );
+ var stripLeadingWhitespace = function(section) {
var template = section.querySelector( 'script' );
@@ -27,11 +23,125 @@
text = text.replace( new RegExp('\\n? {' + leadingWs + '}','g'), '\n' );
}
- section.innerHTML = (new Showdown.converter()).makeHtml(text);
+ return text;
+
+ };
+
+ var slidifyMarkdown = function(markdown, separator, vertical) {
+
+ separator = separator || '^\n---\n$';
+
+ var reSeparator = new RegExp(separator + (vertical ? '|' + vertical : ''), 'mg'),
+ reHorSeparator = new RegExp(separator),
+ matches,
+ lastIndex = 0,
+ isHorizontal,
+ wasHorizontal = true,
+ content,
+ sectionStack = [],
+ markdownSections = '';
+
+ // iterate until all blocks between separators are stacked up
+ while( matches = reSeparator.exec(markdown) ) {
+
+ // determine direction (horizontal by default)
+ isHorizontal = reHorSeparator.test(matches[0]);
+
+ if( !isHorizontal && wasHorizontal ) {
+ // create vertical stack
+ sectionStack.push([]);
+ }
+
+ // pluck slide content from markdown input
+ content = markdown.substring(lastIndex, matches.index);
+
+ if( isHorizontal && wasHorizontal ) {
+ // add to horizontal stack
+ sectionStack.push(content);
+ } else {
+ // add to vertical stack
+ sectionStack[sectionStack.length-1].push(content);
+ }
+
+ lastIndex = reSeparator.lastIndex;
+ wasHorizontal = isHorizontal;
+
+ }
+
+ // add the remaining slide
+ (wasHorizontal ? sectionStack : sectionStack[sectionStack.length-1]).push(markdown.substring(lastIndex));
+
+ // flatten the hierarchical stack, and insert tags
+ for( var k = 0, klen = sectionStack.length; k < klen; k++ ) {
+ markdownSections += typeof sectionStack[k] === 'string'
+ ? '' + sectionStack[k] + ' '
+ : '' + sectionStack[k].join(' ') + ' reveal.js - The HTML Presentation Framework
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugin/markdown/example.html b/plugin/markdown/example.html
new file mode 100644
index 0000000..b4e7f91
--- /dev/null
+++ b/plugin/markdown/example.html
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+ reveal.js - Markdown Demo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/plugin/markdown/example.md b/plugin/markdown/example.md
new file mode 100644
index 0000000..e988dd9
--- /dev/null
+++ b/plugin/markdown/example.md
@@ -0,0 +1,29 @@
+# Markdown Demo
+
+
+
+## External 1.1
+
+Content 1.1
+
+
+## External 1.2
+
+Content 1.2
+
+
+
+## External 2
+
+Content 2.1
+
+
+
+## External 3.1
+
+Content 3.1
+
+
+## External 3.2
+
+Content 3.2
--
cgit v1.2.3