Fix gollum style code blocks.

This commit is contained in:
bootstraponline
2012-05-15 10:12:32 -06:00
parent 3ea5b0193c
commit 966ba29084
@@ -175,6 +175,9 @@ else
// Strip link definitions, store in hashes.
text = _StripLinkDefinitions(text);
// Process gollum style code highlighting.
text = _DoCodeSpansGollum(text);
text = _RunBlockGamut(text);
text = _UnescapeSpecialChars(text);
@@ -1030,7 +1033,7 @@ else
c = c.replace(/[ \t]*$/gm, ""); // trailing whitespace
c = _EncodeCode(c);
c = c.replace(/:\/\//gm, "~P"); // to prevent auto-linking. Not necessary in code *blocks*, but in code spans. Will be converted back after the auto-linker runs.
return m1 + "<pre>`" + c + "</pre>";
return m1 + hashBlock("<pre>`" + c + "</pre>");
}
);
@@ -1146,8 +1149,6 @@ else
// Wrap <p> tags.
//
var end = grafs.length;
var extendedString = "";
var isExtended = false;
for (var i = 0; i < end; i++) {
var str = grafs[i];
@@ -1156,28 +1157,6 @@ else
grafsOut.push(str);
}
else if (/\S/.test(str)) {
// Detect start of gollum code.
if (str.substring(0,3) === "```") {
isExtended = true;
}
if (isExtended === true) {
// Detect end of gollum code.
var strLength = str.length;
if (str.substring(strLength-3, strLength) === "```") {
str = extendedString + str;
str = _DoCodeSpansGollum(str);
grafsOut.push(str);
isExtended = false;
extendedString = "";
continue;
}
extendedString += str + "\n\n";
continue;
}
str = _RunSpanGamut(str);
str = str.replace(/^([ \t]*)/g, "<p>");
str += "</p>"