Don't inherit attributes

Author: BenHall

lib/marked.js

@@ -663,7 +663,7 @@ InlineLexer.prototype.output = function(src) {
     if (cap = this.rules.code.exec(src)) {
       src = src.substring(cap[0].length);
 
-      var attr;
+      var attr = undefined;
       if (attr_cap = this.rules.attr.exec(src)) {
         src = src.substring(attr_cap[0].length);
         attr = attr_cap[2];
@@ -1106,7 +1106,7 @@ function escape(html, encode) {
 }
 
 function unescape(html) {
-	// explicitly match decimal, hex, and named HTML entities 
+	// explicitly match decimal, hex, and named HTML entities
   return html.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/g, function(_, n) {
     n = n.toLowerCase();
     if (n === 'colon') return ':';

test/tests/code_spans.html

@@ -2,7 +2,8 @@
 
 <p><code class="lang">code with an attribute</code></p>
 
+<p><code class="execute">code with an attribute</code> in the same line as another<code>code block</code></p>
+
 <p>Fix for backticks within HTML tag: <span attr='`ticks`'>like this</span></p>
 
 <p>Here&#39;s how you put <code>`backticks`</code> in a code span.</p>
-

test/tests/code_spans.text

@@ -2,7 +2,8 @@
 
 `code with an attribute`{{lang}}
 
+`code with an attribute`{{execute}} in the same line as another `code block`
+
 Fix for backticks within HTML tag: <span attr='`ticks`'>like this</span>
 
 Here's how you put `` `backticks` `` in a code span.
-

test/tests/file_blocks.html

@@ -0,0 +1,9 @@
+<p>Regular text.</p>
+<div class="file">file block on the first line
+</div>
+<p>Regular text.</p>
+
+<div class="file">   file block with leading spaces
+   and multiple lines
+</div>
+

test/tests/file_blocks.text

@@ -0,0 +1,12 @@
+Regular text.
+
+///
+file block on the first line
+///
+	
+Regular text.
+
+///
+   file block with leading spaces
+   and multiple lines
+///