var g_list_level = 0;
- this.makeHtml = function(text) {
+ this.makeHtml = function(_text) {
//
// Main function. The order in which other subs are called here is
// essential. Link and image substitutions need to happen before
// _EscapeSpecialCharsWithinTagAttributes(), so that any *'s or _'s in the <a>
// and <img> tags get encoded.
- //
-
+ //v
+ var text = '' + _text;
// Clear the global hashes. If we don't clear these, you get conflicts
// from other articles when generating a page which contains more than
// one article (e.g. an index page that shows the N most recent
// attacklab: strip sentinel
text = text.replace(/~0/,"");
+
+
+ text += '~0';
+
+ text = text.replace(/(?:^|\n)```(.*)\n([\s\S]*?)\n```/g, function (wholeMatch, language, codeblock) {
+ var end = '\n';
+
+ // First parse the github code block
+ codeblock = _EncodeCode( codeblock);
+ codeblock = _Detab(codeblock);
+ codeblock = codeblock.replace(/^\n+/g, ''); // trim leading newlines
+ codeblock = codeblock.replace(/\n+$/g, ''); // trim trailing whitespace
+
+ codeblock = '<pre><code' + (language ? ' class="' + language + ' language-' + language + '"' : '') + '>' + codeblock + end + '</code></pre>';
+
+ return hashBlock(codeblock) ;
+ });
+
+ // attacklab: strip sentinel
+ text = text.replace(/~0/, '');
+
+
+
+
+
return text;
}
// Encode/escape certain characters inside Markdown code runs.
// The point is that in code, these characters are literals,
// and lose their special Markdown meanings.
+
+ // REMOVED - Data going into markdown should be encoded before it enters..
+
//
// Encode all ampersands; HTML entities are not
// entities within a Markdown code span.
- text = text.replace(/&/g,"&");
+
+
+ //text = text.replace(/&/g,"&");
// Do the angle bracket song and dance:
- text = text.replace(/</g,"<");
- text = text.replace(/>/g,">");
+ //text = text.replace(/</g,"<");
+ //text = text.replace(/>/g,">");
// Now, escape characters that are magic in Markdown:
text = escapeCharacters(text,"\*_{}[]\\",false);
text = text.replace(/^(\t|[ ]{1,4})/gm,"~0"); // attacklab: g_tab_width
// attacklab: clean up hack
- text = text.replace(/~0/g,"")
+ text = text.replace(/~0/g,"");
return text;
}