tags around block-level tags.
text = HashHTMLBlocks(text);
- text = FormParagraphs(text, unhash: unhash);
+ text = FormParagraphs(text, unhash: unhash, createParagraphs: createParagraphs);
text = DoAlertBlocks(text);
text = DoTabsBlocks(text);
@@ -445,7 +445,7 @@ namespace Docnet
/// splits on two or more newlines, to form "paragraphs";
/// each paragraph is then unhashed (if it is a hash and unhashing isn't turned off) or wrapped in HTML p tag
///
- private string FormParagraphs(string text, bool unhash = true)
+ private string FormParagraphs(string text, bool unhash = true, bool createParagraphs = true)
{
// split on two or more newlines
string[] grafs = _newlinesMultiple.Split(_newlinesLeadingTrailing.Replace(text, ""));
@@ -467,7 +467,7 @@ namespace Docnet
if (skipGraphs) { continue; }
- if (grafs[i].StartsWith("\x1AH"))
+ if (grafs[i].Contains("\x1AH"))
{
// unhashify HTML blocks
if (unhash)
@@ -495,8 +495,8 @@ namespace Docnet
else
{
// do span level processing inside the block, then wrap result in
\n\n");
- }
-
-
- private static Regex _faIcon = new Regex(@"(@fa-)(\S+)", RegexOptions.Compiled | RegexOptions.Singleline);
-
- private string DoFaIconsBlocks(string text)
- {
- return _faIcon.Replace(text, new MatchEvaluator(FaIconEvaluator));
- }
-
- private string FaIconEvaluator(Match match)
- {
- string iconName = match.Groups[2].Value.ToLowerInvariant();
- return string.Concat("");
- }
-
- private static Regex _tabsBlock = new Regex(@"(@tabs)\s*([\s\S]+?)\s(@endtabs)", RegexOptions.Compiled);
- private static Regex _tabBlock = new Regex(@"(@tab)[\t| ]+([\S+| ]+)\n([\s\S]+?)\s(@end)", RegexOptions.Compiled);
- private string DoTabsBlocks(string text)
- {
- _tabIdCounter = 0;
- return _tabsBlock.Replace(text, new MatchEvaluator(TabsEvaluator));
- }
-
- private string TabsEvaluator(Match match)
- {
- _tabIdCounter++;
-
- string text = match.Groups[2].Value;
- // 'text' is the markdown which contains the different tab definitions. We simply use another regex to collect the tab content - tab header pairs
- // which we'll then use here to build the tab HTML. We'll use some global vars to make sure the tabs are unique on the page so the user can specify multiple tabs
- // on them.
- var tabsMatches = _tabBlock.Matches(text);
- var headerSB = new StringBuilder();
- var contentSB = new StringBuilder();
- int tabCounter = 0;
- var checkedAttribute = " checked";
- foreach(Match m in tabsMatches)
- {
- // header
- headerSB.AppendFormat("",
- tabCounter, _tabIdCounter, checkedAttribute, m.Groups[2].Value);
- // content
- var contentText = m.Groups.Count < 2 ? string.Empty : _newlinesLeadingTrailing.Replace(m.Groups[3].Value, "");
- contentSB.AppendFormat("
");
- }
-
-
- private static Regex _alertBlock = new Regex(@"(@alert) (\S+)\s*([\s\S]+?)\s(@end)", RegexOptions.Compiled);
-
- private string DoAlertBlocks(string text)
- {
- return _alertBlock.Replace(text, new MatchEvaluator(AlertEvaluator));
- }
-
- private string AlertEvaluator(Match match)
- {
- string text = match.Groups[3].Value;
- string alertType = match.Groups[2].Value.ToLowerInvariant();
- string title = string.Empty;
- string faIconName = string.Empty;
- switch(alertType)
- {
- case "danger":
- title = "Danger!";
- faIconName = "times-circle";
- break;
- case "warning":
- title = "Warning!";
- faIconName = "warning";
- break;
- case "neutral":
- case "info":
- title = "Info";
- faIconName = "info-circle";
- break;
- }
-
- //removed Outdent on the alert block
- text = _newlinesLeadingTrailing.Replace(text, "");
- return string.Concat("\n\n
", title, "",
- text, "
");
- }
-
private static Regex _codeSpan = new Regex(@"
- (?
/// Turn Markdown `code spans` into HTML code tags
@@ -1524,9 +1420,12 @@ namespace Docnet
///
private string DoItalicsAndBold(string text)
{
-
- // must go first, then
- if (_strictBoldItalic)
+ if(!(text.Contains("*") || text.Contains("_")))
+ {
+ return text;
+ }
+ // must go first, then
+ if (_strictBoldItalic)
{
text = _strictBold.Replace(text, "$1$3");
text = _strictItalic.Replace(text, "$1$3");
@@ -1734,15 +1633,126 @@ namespace Docnet
}
- #region Encoding and Normalization
+ private static Regex _githubCodeBlock = new Regex(@"(?
- /// encodes email address randomly
- /// roughly 10% raw, 45% hex, 45% dec
- /// note that @ is always encoded and : never is
- ///
- private string EncodeEmailAddress(string addr)
+ //removed Outdent on the codeblock
+ codeBlock = EncodeCode(codeBlock);
+ codeBlock = _newlinesLeadingTrailing.Replace(codeBlock, "");
+
+ if(typeBlock == "nohighlight")
+ {
+ return string.Concat("\n\n
", codeBlock, "\n
\n\n");
+ }
+ return string.Concat("\n\n
", codeBlock, "\n
\n\n");
+ }
+
+
+ private static Regex _faIcon = new Regex(@"(@fa-)(\S+)", RegexOptions.Compiled | RegexOptions.Singleline);
+ private string DoFaIconsBlocks(string text)
+ {
+ return _faIcon.Replace(text, new MatchEvaluator(FaIconEvaluator));
+ }
+
+ private string FaIconEvaluator(Match match)
+ {
+ string iconName = match.Groups[2].Value.ToLowerInvariant();
+ return string.Concat("");
+ }
+
+
+ private static Regex _tabsBlock = new Regex(@"(@tabs)\s*([\s\S]+?)\s(@endtabs)", RegexOptions.Compiled);
+ private static Regex _tabBlock = new Regex(@"(@tab)[\t| ]+([\S+| ]+)\n([\s\S]+?)\s(@end)", RegexOptions.Compiled);
+ private string DoTabsBlocks(string text)
+ {
+ _tabIdCounter = 0;
+ return _tabsBlock.Replace(text, new MatchEvaluator(TabsEvaluator));
+ }
+
+ private string TabsEvaluator(Match match)
+ {
+ _tabIdCounter++;
+
+ string text = match.Groups[2].Value;
+ // 'text' is the markdown which contains the different tab definitions. We simply use another regex to collect the tab content - tab header pairs
+ // which we'll then use here to build the tab HTML. We'll use some global vars to make sure the tabs are unique on the page so the user can specify multiple tabs
+ // on them.
+ var tabsMatches = _tabBlock.Matches(text);
+ var headerSB = new StringBuilder();
+ var contentSB = new StringBuilder();
+ int tabCounter = 0;
+ var checkedAttribute = " checked";
+ foreach(Match m in tabsMatches)
+ {
+ // header
+ headerSB.AppendFormat("",
+ tabCounter, _tabIdCounter, checkedAttribute, m.Groups[2].Value);
+ // content
+ var contentText = m.Groups.Count < 2 ? string.Empty : _newlinesLeadingTrailing.Replace(m.Groups[3].Value, "");
+ contentSB.AppendFormat("