lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed a weird bug in Markdown that caused <h1> elements to be nested in <p> elements.

Browse Source
This commit is contained in:
Daniel Stolt
2015-02-04 16:27:17 +01:00
parent 99072faf14
commit 8406a08bf6
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Orchard.Web/Modules/Markdown/Markdown.cs
View File

@@ -606,25 +606,25 @@ namespace MarkdownSharp
// Regular expression for the content of a block tag.
string attr = @"
(?>    # optional tag attributes
\s   # starts with whitespace
(?> # optional tag attributes
\s # starts with whitespace
(?>
[^>""/]+ # text outside quotes
[^>""/]+ # text outside quotes
|
/+(?!>)  # slash not followed by >
/+(?!>) # slash not followed by >
|
""[^""]*""  # text inside double quotes (tolerate >)
""[^""]*"" # text inside double quotes (tolerate >)
|
'[^']*' # text inside single quotes (tolerate >)
'[^']*' # text inside single quotes (tolerate >)
)*
)?
)?
";
string content = RepeatString(@"
(?>
[^<]+   # content without tag
[^<]+ # content without tag
|
<\2   # nested opening tag
<\2 # nested opening tag
" + attr + @" # attributes
(?>
/>
@@ -632,9 +632,9 @@ namespace MarkdownSharp
>", _nestDepth) + // end of opening tag
".*?" + // last level nested tag content
RepeatString(@"
</\2\s*> # closing nested tag
</\2\s*> # closing nested tag
)
|   
|
<(?!/\2\s*> # other tags with a different name
)
)*", _nestDepth);
@@ -642,11 +642,11 @@ namespace MarkdownSharp
string content2 = content.Replace(@"\2", @"\3");
// First, look for nested blocks, e.g.:
//  <div>
//   <div>
//   tags for inner block must be indented.
//   </div>
//  </div>
// <div>
// <div>
// tags for inner block must be indented.
// </div>
// </div>
//
// The outermost tags must start at the left margin for this to match, and
// the inner nested divs must be indented.