Permalink
Browse files

Merge remote-tracking branch 'unwiredben/master'

  • Loading branch information...
2 parents fb4fed1 + 9b297fa commit 9075cdc08018d6ee965173501e1f31c48930b10c @coreyti coreyti committed Oct 31, 2012
Showing with 12 additions and 6 deletions.
  1. +2 −2 src/showdown.js
  2. +5 −2 test/cases/html5-strutural-tags.html
  3. +5 −2 test/cases/html5-strutural-tags.md
View
@@ -361,13 +361,13 @@ var _HashHTMLBlocks = function(text) {
\b // word break
// attacklab: hack around khtml/pcre bug...
[^\r]*? // any number of lines, minimally matching
- .*</\2> // the matching end tag
+ </\2> // the matching end tag
[ \t]* // trailing spaces/tabs
(?=\n+) // followed by a newline
) // attacklab: there are sentinel newlines at end of document
/gm,function(){...}};
*/
- text = text.replace(/^(<(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|style|section|header|footer|nav|article|aside)\b[^\r]*?.*<\/\2>[ \t]*(?=\n+)\n)/gm,hashElement);
+ text = text.replace(/^(<(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|style|section|header|footer|nav|article|aside)\b[^\r]*?<\/\2>[ \t]*(?=\n+)\n)/gm,hashElement);
// Special case just for <hr />. It was easier to make a special case than
// to make the other regex more complicated.
@@ -9,8 +9,11 @@
<nav>navigation</nav>
-<article>read me</article>
+<article>read
+me</article>
-<aside>ignore me</aside>
+<aside>
+ignore me
+</aside>
<p>the end</p>
@@ -5,7 +5,10 @@ These HTML5 tags should pass through just fine.
<header>head</header>
<footer>footsies</footer>
<nav>navigation</nav>
-<article>read me</article>
-<aside>ignore me</aside>
+<article>read
+me</article>
+<aside>
+ignore me
+</aside>
the end

0 comments on commit 9075cdc

Please sign in to comment.