maruku 0.7.0 → 0.7.1

data/lib/maruku/output/to_latex.rb

@@ -409,7 +409,7 @@ Created by \\href{#{MaRuKu::MARUKU_URL}}{Maruku} #{self.nice_date}.
   def to_latex_table
     num_columns = self.align.size
 
-    head, *rows = @children.each_slice(num_columns).to_a
+    head, *rows = @children
 
     h = { :center => 'c' , :left => 'l' , :right => 'r'}
     align_string = self.align.map {|a| h[a] }.join('|')
@@ -432,11 +432,17 @@ Created by \\href{#{MaRuKu::MARUKU_URL}}{Maruku} #{self.nice_date}.
 
 
   def to_latex_head_cell
-    children_to_latex
+    to_latex_cell
   end
 
   def to_latex_cell
-    children_to_latex
+    s=""
+    if @attributes.has_key?(:colspan)
+      # TODO figure out how to set the alignment (defaulting to left for now)
+      s="\\multicolumn {"<< @attributes[:colspan]<<"}{|l|}{"<<children_to_latex<<"}"
+    else
+      children_to_latex
+    end
   end
 
   def to_latex_footnote_reference

data/lib/maruku/output/to_s.rb

@@ -4,7 +4,6 @@ module MaRuKu
 
     # Strips all formatting from the string
     def to_s
-      warn "Maruku#to_s is deprecated and will be removed or changed in a near-future version of Maruku."
       children_to_s
     end
 

data/lib/maruku/string_utils.rb

@@ -57,8 +57,8 @@ module MaRuKu
     # @param s [String]
     # @return [Fixnum]
     def spaces_before_first_char(s)
-      match =
-        case s.md_type
+      s = MaRuKu::MDLine.new(s.gsub(/([^\t]*)(\t)/) { $1 + " " * (TAB_SIZE - $1.length % TAB_SIZE) })
+      match = case s.md_type
         when :ulist
           # whitespace, followed by ('*'|'+'|'-') followed by
           # more whitespace, followed by an optional IAL, followed

data/lib/maruku/version.rb

@@ -1,6 +1,6 @@
 module MaRuKu
   # The Maruku version.
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 
   # @deprecated Exists for backwards compatibility. Use {VERSION}
   # @private

data/spec/block_docs/abbrev.md

@@ -415,17 +415,17 @@ md_el(:document,[
 *** Output of to_html ***
 <h1 id="webkit_safari_31_and_the_css_fontface_declaration">WebKit (Safari 3.1) and the <abbr title="Cascading Style Sheets">CSS</abbr> @font-face declaration</h1>
 
-<p>I&#8217;m a big fan of typography in general. If you check out <a href="http://elliottcable.name">my homepage</a> or my <a href="http://elliottcable.name/contact.xhtml">contact elliottcable</a> page, and you&#8217;re using Safari/WebKit or Opera/Kestrel, you&#8217;ll notice the typefaces (fonts, as colloquialized) are <em>very</em> non-standard. (As of this writing, I&#8217;m using <a href="http://www.josbuivenga.demon.nl/museo.html" title="Jos Buivenga's Museo free typeface">Museo</a> and <a href="http://www.josbuivenga.demon.nl/diavlo.html" title="Jos Buivenga's free Diavlo typeface">Diavlo</a><sup id="fnref:1"><a href="#fn:1" rel="footnote">1</a></sup> heavily on both.)</p>
+<p>I’m a big fan of typography in general. If you check out <a href="http://elliottcable.name">my homepage</a> or my <a href="http://elliottcable.name/contact.xhtml">contact elliottcable</a> page, and you’re using Safari/WebKit or Opera/Kestrel, you’ll notice the typefaces (fonts, as colloquialized) are <em>very</em> non-standard. (As of this writing, I’m using <a href="http://www.josbuivenga.demon.nl/museo.html" title="Jos Buivenga's Museo free typeface">Museo</a> and <a href="http://www.josbuivenga.demon.nl/diavlo.html" title="Jos Buivenga's free Diavlo typeface">Diavlo</a><sup id="fnref:1"><a href="#fn:1" rel="footnote">1</a></sup> heavily on both.)</p>
 
-<p>The internet has not be a friendly place for typohiles like myself, up to this point, at least. One might even say it was a frightful, mentally scarring environment for those akin to yours truly. We&#8217;ve been restricted to reading page after page after page on day after day after day for year after year after year abominations of markup and design enslaved by the horrible overlords we know as Lucida, Verdana, Arial, Helvetica, Geneva, Georgia, Courier, and&#8230; dare I invoke ye, thou my terrible overlord? Times New Roman.</p>
+<p>The internet has not be a friendly place for typohiles like myself, up to this point, at least. One might even say it was a frightful, mentally scarring environment for those akin to yours truly. We’ve been restricted to reading page after page after page on day after day after day for year after year after year abominations of markup and design enslaved by the horrible overlords we know as Lucida, Verdana, Arial, Helvetica, Geneva, Georgia, Courier, and… dare I invoke ye, thou my terrible overlord? Times New Roman.</p>
 
 <p>Wherefore art thou, my glorious Archer? And thee as well, my beautiful Garamond? The technical restrictions of that horrible monster we know as the Web Browser hath forced us all too long to use those most banal, those most common, and those most abused, out of all of the typefaces of the world.</p>
 
-<p>All hyperbole aside, I&#8217;m extremely happy to see the advent of a standard <code>@font-face</code> declaration in <abbr title="Cascading Style Sheets">CSS</abbr>. Internet Explorer first implemented a crutched, basic version of this way back in version 4, but nothing ever really came of it - their decision to create the proprietary <abbr title="Embedded OpenType">.EOT</abbr><sup id="fnref:2"><a href="#fn:2" rel="footnote">2</a></sup> format to appease overly restrictive type foundries&#8217; worries about intellectual property (aka. the cold, hard dominatrix that we know only as Ms. Profit) truly and completely killed that initial attempt at bringing astute typography and it&#8217;s advocates to the web. This new run at <code>@font-face</code> by an established, trusted, and open group (the <a href="http://w3c.org" title="World Wide Web Consortium"><abbr title="World Wide Web Consortium">W3C</abbr></a> itself, responsible for helping to make much of what we use as designers on the web standard and cross-system compatible) has a much better chance, in my humble opinion - and I am quite looking forward to the consequences if it succeeds.</p>
+<p>All hyperbole aside, I’m extremely happy to see the advent of a standard <code>@font-face</code> declaration in <abbr title="Cascading Style Sheets">CSS</abbr>. Internet Explorer first implemented a crutched, basic version of this way back in version 4, but nothing ever really came of it - their decision to create the proprietary <abbr title="Embedded OpenType">.EOT</abbr><sup id="fnref:2"><a href="#fn:2" rel="footnote">2</a></sup> format to appease overly restrictive type foundries’ worries about intellectual property (aka. the cold, hard dominatrix that we know only as Ms. Profit) truly and completely killed that initial attempt at bringing astute typography and it’s advocates to the web. This new run at <code>@font-face</code> by an established, trusted, and open group (the <a href="http://w3c.org" title="World Wide Web Consortium"><abbr title="World Wide Web Consortium">W3C</abbr></a> itself, responsible for helping to make much of what we use as designers on the web standard and cross-system compatible) has a much better chance, in my humble opinion - and I am quite looking forward to the consequences if it succeeds.</p>
 
-<p>Now, onwards to the topic of my post as declared in the header (yes, I know, a slow start - but it&#8217;s an interesting topic with an interesting history!). WebKit, the open source rendering engine behind the wonderfulness that is Safari, and how it handles the &#8216;new&#8217; <code>@font-face</code> declaration. No, it&#8217;s not really &#8216;new&#8217;, but yes, it feels like it is.</p>
+<p>Now, onwards to the topic of my post as declared in the header (yes, I know, a slow start - but it’s an interesting topic with an interesting history!). WebKit, the open source rendering engine behind the wonderfulness that is Safari, and how it handles the ‘new’ <code>@font-face</code> declaration. No, it’s not really ‘new’, but yes, it feels like it is.</p>
 
-<p>To put it simply, and to be very blunt, it&#8217;s broken.</p>
+<p>To put it simply, and to be very blunt, it’s broken.</p>
 
 <p>The <a href="http://?"><abbr title="Cascading Style Sheets">CSS</abbr> spec section</a> for <code>@font-face</code> is very specific - typefaces are to be selected based on a wide array of criteria placed in the <code>@font-face</code> declaration block itself. Various textual <abbr title="Cascading Style Sheets">CSS</abbr> attributes may be defined within the <code>@font-face</code> declaration, and then they will be checked when the typeface is referred to later in the <abbr title="Cascading Style Sheets">CSS</abbr>. For instance, if I have two <code>@font-face</code> declarations for the Diavlo family - one for regular text, and one for a heavier weighted version of the typeface - then I later utilize Diavlo in a <code>font-family:</code> attribute, it should refer to the basic Diavlo font defined in the first <code>@font-face</code>. However, if I were to do the same, but also specify a heavy <code>font-weight:</code>, then it should use the heavier version of Diavlo. To place this example in code:</p>
 
@@ -449,9 +449,9 @@ div#content {
   font-family: 'Diavlo';
 }</code></pre>
 
-<p>As you can see, my headings should use the typeface defined in <code>Diavlo_Black.otf</code>, while my body content should use <code>Diavlo_Book.otf</code>. However, in WebKit, this doesn&#8217;t work - it completely ignores any attribute except <code>font-family:</code> and <code>src:</code> in a <code>@font-face</code> declaration! Completely ignores them! Not only that - not <em>only</em> that - it disregards all but the last <code>@font-face</code> for a given <code>font-family:</code> attribute string!</p>
+<p>As you can see, my headings should use the typeface defined in <code>Diavlo_Black.otf</code>, while my body content should use <code>Diavlo_Book.otf</code>. However, in WebKit, this doesn’t work - it completely ignores any attribute except <code>font-family:</code> and <code>src:</code> in a <code>@font-face</code> declaration! Completely ignores them! Not only that - not <em>only</em> that - it disregards all but the last <code>@font-face</code> for a given <code>font-family:</code> attribute string!</p>
 
-<p>The implication here is that, to make <code>@font-face</code> work as it is currently implemented in WebKit (and thus, Safari 3.1), I have to declare <em>completely imaginary, non-existent type families</em> to satisfy WebKit alone. Here&#8217;s the method I have used in the places I current implement <code>@font-face</code>:</p>
+<p>The implication here is that, to make <code>@font-face</code> work as it is currently implemented in WebKit (and thus, Safari 3.1), I have to declare <em>completely imaginary, non-existent type families</em> to satisfy WebKit alone. Here’s the method I have used in the places I current implement <code>@font-face</code>:</p>
 
 <pre><code>@font-face {
   font-family: 'Diavlo Book';
@@ -471,7 +471,7 @@ div#content {
   font-family: 'Diavlo Book';
 }</code></pre>
 
-<p>Isn&#8217;t it horrible? Seriously, my eyes, they bleed. There&#8217;s lots of problems with this far beyond the lack of semanticity when it comes to the typeface names&#8230; let me see how many ways this breaks the purpose of <code>@font-face</code>:</p>
+<p>Isn’t it horrible? Seriously, my eyes, they bleed. There’s lots of problems with this far beyond the lack of semanticity when it comes to the typeface names… let me see how many ways this breaks the purpose of <code>@font-face</code>:</p>
 
 <ul>
 <li>
@@ -479,33 +479,33 @@ div#content {
 
 <p>As soon as we begin to use <code>@font-face</code> in our page, we can no longer make any use of any other textual control attribute - <code>font-weight:</code>, <code>font-style:</code>, and <code>font-variant:</code> are no longer available to us, because they no longer correctly map to technical typeface variant/features.</p>
 
-<p>Also, many default elements are destroyed, unusable, without &#8216;fixing&#8217; - for instance, <code>&lt;b&gt;</code> would have no effect in a page styled for WebKit as above; We would have to specify something like <code>b {font-family: 'Diavlo Black';}</code> - how broken is that? Unless we caught all such default elements and re-styled them to use the bastardized names instead of the correct attributes, lots of basic HTML formatting would be broken. I myself may never use in-document formatting (separation of design and content!), but what about comments forms? Forum posts? Direct HTML-literal quotes?</p>
+<p>Also, many default elements are destroyed, unusable, without ‘fixing’ - for instance, <code>&lt;b&gt;</code> would have no effect in a page styled for WebKit as above; We would have to specify something like <code>b {font-family: 'Diavlo Black';}</code> - how broken is that? Unless we caught all such default elements and re-styled them to use the bastardized names instead of the correct attributes, lots of basic HTML formatting would be broken. I myself may never use in-document formatting (separation of design and content!), but what about comments forms? Forum posts? Direct HTML-literal quotes?</p>
 
-<p>If we want to use Javascript to modify the display of the content, we can&#8217;t simply adjust the mentioned textual control attributes - we have to know and change the entire <code>font-family:</code> array of strings.</p>
+<p>If we want to use Javascript to modify the display of the content, we can’t simply adjust the mentioned textual control attributes - we have to know and change the entire <code>font-family:</code> array of strings.</p>
 </li>
 
 <li>
 <p>You make us very wet.</p>
 
-<p>And by wet, I mean &#8216;not <abbr title="Don't Repeat Yourself">DRY</abbr>&#8217;. What if we decide to change one of the bastardized font names? Or use a different font entirely? We have to go through all of our <abbr title="Cascading Style Sheets">CSS</abbr>, all of our Javascript, and make sure we update every occurrence of the typeface&#8217;s bastardized name.</p>
+<p>And by wet, I mean ‘not <abbr title="Don't Repeat Yourself">DRY</abbr>’. What if we decide to change one of the bastardized font names? Or use a different font entirely? We have to go through all of our <abbr title="Cascading Style Sheets">CSS</abbr>, all of our Javascript, and make sure we update every occurrence of the typeface’s bastardized name.</p>
 </li>
 
 <li>
-<p>You remove our user&#8217;s user choice, and waste bandwidth.</p>
+<p>You remove our user’s user choice, and waste bandwidth.</p>
 
-<p>Since the names refer to families that don&#8217;t, in fact, exist, the browser can&#8217;t override the declaration with a user&#8217;s installed version of the typeface. This means that, regardless of whether the user already has the typeface installed on their own computer, the browser won&#8217;t use that - it doesn&#8217;t know to use &#8216;Diavlo&#8217;, which the user has installed, because it was told to use &#8216;Diavlo Black&#8217;, which no user in the entire world has installed on their computer.</p>
+<p>Since the names refer to families that don’t, in fact, exist, the browser can’t override the declaration with a user’s installed version of the typeface. This means that, regardless of whether the user already has the typeface installed on their own computer, the browser won’t use that - it doesn’t know to use ‘Diavlo’, which the user has installed, because it was told to use ‘Diavlo Black’, which no user in the entire world has installed on their computer.</p>
 </li>
 </ul>
 
-<p>This whole thing is rather worrying - I&#8217;ve heard Opera has <code>@font-face</code> support, though I haven&#8217;t had time to test this myself, so I don&#8217;t know if it actually does - or, for that matter, if it does it &#8216;correctly&#8217;, or has the same problems as WebKit. But either way, WebKit is one of the first two implementations to ever attempt to support <code>@font-face</code> (Microsoft&#8217;s unrelated <code>@font-face</code> declaration notwithstanding) - I really don&#8217;t want to see it&#8217;s early mistakes carried on to FireFox in a few years, and then Internet Explorer a few decades after that. That will leave us stuck with this broken system forever, as it has been demonstrated time and time again that if nobody else supports an old standard correctly, a newcomer to the standard will not do it correctly either. I for one would really, really, hate that.</p>
+<p>This whole thing is rather worrying - I’ve heard Opera has <code>@font-face</code> support, though I haven’t had time to test this myself, so I don’t know if it actually does - or, for that matter, if it does it ‘correctly’, or has the same problems as WebKit. But either way, WebKit is one of the first two implementations to ever attempt to support <code>@font-face</code> (Microsoft’s unrelated <code>@font-face</code> declaration notwithstanding) - I really don’t want to see it’s early mistakes carried on to FireFox in a few years, and then Internet Explorer a few decades after that. That will leave us stuck with this broken system forever, as it has been demonstrated time and time again that if nobody else supports an old standard correctly, a newcomer to the standard will not do it correctly either. I for one would really, really, hate that.</p>
 
-<p>In summary&#8230; come on, WebKit team, this isn&#8217;t like you - you&#8217;re always the ones with the closest-to-standard implementation, and the cleanest code, and&#8230; hell, overall? Webkit is the most secure/fastest browser available. But this is making me lose my faith in you, guys, please get it right. You&#8217;re pioneering a leap into the future when it comes to the Web - this is as important, or <em>more</em> important, than Mosiac&#8217;s allowing of images was.</p>
+<p>In summary… come on, WebKit team, this isn’t like you - you’re always the ones with the closest-to-standard implementation, and the cleanest code, and… hell, overall? Webkit is the most secure/fastest browser available. But this is making me lose my faith in you, guys, please get it right. You’re pioneering a leap into the future when it comes to the Web - this is as important, or <em>more</em> important, than Mosiac’s allowing of images was.</p>
 
-<p>To put it succinctly - don&#8217;t fuck this up, y&#8217;all.</p>
+<p>To put it succinctly - don’t fuck this up, y’all.</p>
 <div class="footnotes"><hr /><ol><li id="fn:1">
-<p>These are fonts by <a href="jos">Jos Buivenga</a>, quite the amazing person. His (free) fonts are, uniquely, released for use on the web in <code>@font-face</code> declarations - unlike the vast majority of other (even free to download) typefaces, which have ridiculously restricting licenses and terms of use statements. Props, Jos - you&#8217;re a pioneer, and deserve recognition as such. <a href="#fnref:1" rev="footnote">&#8617;</a></p>
+<p>These are fonts by <a href="jos">Jos Buivenga</a>, quite the amazing person. His (free) fonts are, uniquely, released for use on the web in <code>@font-face</code> declarations - unlike the vast majority of other (even free to download) typefaces, which have ridiculously restricting licenses and terms of use statements. Props, Jos - you’re a pioneer, and deserve recognition as such. <a href="#fnref:1" rev="footnote">↩</a></p>
 </li><li id="fn:2">
-<p>To give Microsoft a little credit, something I rarely do&#8230; Yes, I&#8217;m aware Microsoft submitted EOT to the <abbr title="World Wide Web Consortium">W3C</abbr> as a proposal - the problem isn&#8217;t with their attempts to make it non-proprietary, but with the basic concept of making typefaces on the web DRMed. Look what such attempts have done to the music and video industry - simply decimated it. Do we really want to see the same thing happen to our beloved medium as typography moves into the 21st century? <a href="#fnref:2" rev="footnote">&#8617;</a></p>
+<p>To give Microsoft a little credit, something I rarely do… Yes, I’m aware Microsoft submitted EOT to the <abbr title="World Wide Web Consortium">W3C</abbr> as a proposal - the problem isn’t with their attempts to make it non-proprietary, but with the basic concept of making typefaces on the web DRMed. Look what such attempts have done to the music and video industry - simply decimated it. Do we really want to see the same thing happen to our beloved medium as typography moves into the 21st century? <a href="#fnref:2" rev="footnote">↩</a></p>
 </li></ol></div>
 *** Output of to_latex ***
 \hypertarget{webkit_safari_31_and_the_css_fontface_declaration}{}\section*{{WebKit (Safari 3.1) and the CSS @font-face declaration}}\label{webkit_safari_31_and_the_css_fontface_declaration}

data/spec/block_docs/attribute_sanitize.md

@@ -0,0 +1,22 @@
+Make sure extended attributes get escaped when generating HTML: https://github.com/bhollis/maruku/issues/114
+*** Parameters: ***
+{} # params
+*** Markdown input: ***
+*foo*{: style='ball & chain'}
+
+*foo*{: style='ball\008 chain'}
+
+*foo*{: style='ball\" badAttribute=\"chain'}
+*** Output of inspect ***
+md_el(:document, [
+  md_par(md_em("foo", [["style", "ball & chain"]])),
+  md_par(md_em("foo", [["style", "ball\\008 chain"]])),
+  md_par(md_em("foo", [["style", "ball\" badAttribute=\"chain"]]))
+])
+*** Output of to_html ***
+<p><em style="ball &amp; chain">foo</em>
+</p>
+<p><em style="ball\008 chain">foo</em>
+</p>
+<p><em style="ball&quot; badAttribute=&quot;chain">foo</em>
+</p>

data/spec/block_docs/auto_cdata.md

@@ -0,0 +1,48 @@
+Adds CDATA only when necessary.
+NOTE: CDATA is output because we use XHTML - for HTML mode it should be omitted.
+*** Parameters: ***
+{}
+*** Markdown input: ***
+<script>
+  var x = true && true;
+</script>
+
+<script>
+  var x = true;
+</script>
+
+<script>foo && bar</script>
+
+<script>alert('foo');</script>
+
+<style type="text/css">
+  p > .highlight {
+    color: red;
+    background-image: url('/foo?bar&baz');
+  }
+</style>
+
+<style type="text/css">
+  .highlight {
+    color: red;
+  }
+</style>
+*** Output of inspect ***
+
+*** Output of to_html ***
+<script>//<![CDATA[
+  var x = true && true;
+//]]></script><script>
+  var x = true;
+</script><script>//<![CDATA[
+foo && bar
+//]]></script><script>alert('foo');</script><style type='text/css'>/*<![CDATA[*/
+  p > .highlight {
+    color: red;
+    background-image: url('/foo?bar&baz');
+  }
+/*]]>*/</style><style type='text/css'>
+  .highlight {
+    color: red;
+  }
+</style>

data/spec/block_docs/bug_table.md

@@ -19,10 +19,10 @@ h         | h
 md_el(:document,[
 	md_par(["hello"], [["summary", "Table summary"], [:class, "class1"], ["style", "color:red"]]),
 	md_el(:table,[
-		md_el(:head_cell,["h"],{},[]),
-		md_el(:head_cell,["h"],{},[]),
-		md_el(:cell,[" c1"],{},[[:ref, "t"]]),
-		md_el(:cell,["c2"],{},[])
+		[md_el(:head_cell,["h"],{},[]),
+		md_el(:head_cell,["h"],{},[])],
+		[md_el(:cell,[" c1"],{},[[:ref, "t"]]),
+		md_el(:cell,["c2"],{},[])]
 	],{:align=>[:left, :left]},[["summary", "Table summary"], [:class, "class1"], ["style", "color:red"]]),
 	md_el(:ald,[],{:ald=>[["scope", "row"]],:ald_id=>"t"},[])
 ],{},[])

data/spec/block_docs/code4.md

@@ -0,0 +1,79 @@
+Codes which look like lists
+*** Parameters: ***
+{}
+*** Markdown input: ***
+
+This is code (4 spaces):
+
+    * Code
+      * Code (again)
+
+This is also code
+
+    * Code
+	* Code (again)
+
+This is code (1 tab):
+
+	* Code
+		* Code (again)
+
+
+*** Output of inspect ***
+md_el(:document,[
+	md_par(["This is code (4 spaces):"]),
+	md_el(:code,[],{:raw_code=>"* Code
+  * Code (again)", :lang=>nil},[]),
+	md_par(["This is also code"]),
+	md_el(:code,[],{:raw_code=>"* Code
+* Code (again)", :lang=>nil},[]),
+	md_par(["This is code (1 tab):"]),
+	md_el(:code,[],{:raw_code=>"* Code
+	* Code (again)", :lang=>nil},[])
+],{},[])
+*** Output of to_html ***
+<p>This is code (4 spaces):</p>
+
+<pre><code>* Code
+  * Code (again)</code></pre>
+
+<p>This is also code</p>
+
+<pre><code>* Code
+* Code (again)</code></pre>
+
+<p>This is code (1 tab):</p>
+
+<pre><code>* Code
+	* Code (again)</code></pre>
+*** Output of to_latex ***
+This is code (4 spaces):
+
+\begin{verbatim}* Code
+  * Code (again)\end{verbatim}
+This is also code
+
+\begin{verbatim}* Code
+* Code (again)\end{verbatim}
+This is code (1 tab):
+
+\begin{verbatim}* Code
+	* Code (again)\end{verbatim}
+*** Output of to_md ***
+This is code (4 spaces):
+
+     * Code
+       * Code (again)
+
+This is also code
+
+     * Code
+     * Code (again)
+
+This is code (1 tab):
+
+     * Code
+         * Code (again)
+*** Output of to_s ***
+This is code (4 spaces):This is also codeThis is code (1 tab):
+

data/spec/block_docs/div_without_newline.md

@@ -0,0 +1,16 @@
+Handle blocks of block HTML without a newline. https://github.com/bhollis/maruku/issues/123
+REXML won't clean up the HTML the way Nokogiri will...
+*** Parameters: ***
+{ }
+*** Markdown input: ***
+Heres some HTML.
+<div>
+Foo
+</div>
+*** Output of inspect ***
+
+*** Output of to_html ***
+<p>Heres some HTML.</p>
+<div>
+Foo
+</div>

data/spec/block_docs/empty_cells.md

@@ -9,15 +9,9 @@ Write a comment here
 *** Output of inspect ***
 md_el(:document,[
 	md_el(:table,[
-		md_el(:head_cell,[],{},[]),
-		md_el(:head_cell,["1"],{},[]),
-		md_el(:head_cell,["2"],{},[]),
-		md_el(:cell,["A"],{},[]),
-		md_el(:cell,["X"],{},[]),
-		md_el(:cell,[],{},[]),
-		md_el(:cell,["B"],{},[]),
-		md_el(:cell,[],{},[]),
-		md_el(:cell,["X"],{},[])
+		[md_el(:head_cell,[],{},[]),md_el(:head_cell,["1"],{},[]),md_el(:head_cell,["2"],{},[])],
+		[md_el(:cell,["A"],{},[]),md_el(:cell,["X"],{},[]),md_el(:cell,[],{},[])],
+		[md_el(:cell,["B"],{},[]),md_el(:cell,[],{},[]),md_el(:cell,["X"],{},[])]
 	],{:align=>[:left, :left, :left]},[])
 ],{},[])
 *** Output of to_html ***

data/spec/block_docs/entities.md

@@ -26,18 +26,12 @@ It should read like this: `©`.
 md_el(:document,[
 	md_par(["Maruku translates HTML entities to the equivalent in LaTeX:"]),
 	md_el(:table,[
-		md_el(:head_cell,["Entity"],{},[]),
-		md_el(:head_cell,["Result"],{},[]),
-		md_el(:cell,[md_code("©")],{},[]),
-		md_el(:cell,[md_entity("copy")],{},[]),
-		md_el(:cell,[md_code("£")],{},[]),
-		md_el(:cell,[md_entity("pound")],{},[]),
-		md_el(:cell,[md_code("a b")],{},[]),
-		md_el(:cell,["a", md_entity("nbsp"), "b"],{},[]),
-		md_el(:cell,[md_code("λ")],{},[]),
-		md_el(:cell,[md_entity("lambda")],{},[]),
-		md_el(:cell,[md_code("—")],{},[]),
-		md_el(:cell,[md_entity("mdash")],{},[])
+		[md_el(:head_cell,["Entity"],{},[]),md_el(:head_cell,["Result"],{},[])],
+		[md_el(:cell,[md_code("©")],{},[]),md_el(:cell,[md_entity("copy")],{},[])],
+		[md_el(:cell,[md_code("£")],{},[]),md_el(:cell,[md_entity("pound")],{},[])],
+		[md_el(:cell,[md_code("a b")],{},[]),md_el(:cell,["a", md_entity("nbsp"), "b"],{},[])],
+		[md_el(:cell,[md_code("λ")],{},[]),md_el(:cell,[md_entity("lambda")],{},[])],
+		[md_el(:cell,[md_code("—")],{},[]),md_el(:cell,[md_entity("mdash")],{},[])]
 	],{:align=>[:left, :left]},[]),
 	md_par([
 		"Entity-substitution does not happen in code blocks or inline code."

data/spec/block_docs/extra_table1.md

@@ -12,12 +12,12 @@ Content Cell  | Content Cell
 *** Output of inspect ***
 md_el(:document,[
 	md_el(:table,[
-		md_el(:head_cell,["First Header"],{},[]),
-		md_el(:head_cell,["Second Header"],{},[]),
-		md_el(:cell,["Content Cell"],{},[]),
-		md_el(:cell,["Content Cell"],{},[]),
-		md_el(:cell,["Content Cell"],{},[]),
-		md_el(:cell,["Content Cell"],{},[])
+		[md_el(:head_cell,["First Header"],{},[]),
+		md_el(:head_cell,["Second Header"],{},[])],
+		[md_el(:cell,["Content Cell"],{},[]),
+		md_el(:cell,["Content Cell"],{},[])],
+		[md_el(:cell,["Content Cell"],{},[]),
+		md_el(:cell,["Content Cell"],{},[])]
 	],{:align=>[:left, :left]},[])
 ],{},[])
 *** Output of to_html ***

data/spec/block_docs/fenced_code_blocks.md

@@ -31,36 +31,28 @@ john = Twitter::Client.new(
 ~~~~~
 *** Output of inspect ***
 md_el(:document, [
-	md_el(:code, [], {:raw_code=>"\njohn = Twitter::Client.new(\n  :oauth_token => \"John's access token\",\n  :oauth_token_secret => \"John's access secret\"\n)\n", :lang=>"ruby"}),
-	md_el(:code, [], {:raw_code=>"\njohn = Twitter::Client.new(\n  :oauth_token => \"John's access token\",\n  :oauth_token_secret => \"John's access secret\"\n)\n", :lang=>nil}),
-	md_el(:code, [], {:raw_code=>"\njohn = Twitter::Client.new(\n  :oauth_token => \"John's access token\",\n  :oauth_token_secret => \"John's access secret\"\n)\n", :lang=>"ruby"}),
-	md_el(:code, [], {:raw_code=>"\njohn = Twitter::Client.new(\n  :oauth_token => \"John's access token\",\n  :oauth_token_secret => \"John's access secret\"\n)\n", :lang=>nil})
+	md_el(:code, [], {:raw_code=>"john = Twitter::Client.new(\n  :oauth_token => \"John's access token\",\n  :oauth_token_secret => \"John's access secret\"\n)", :lang=>"ruby"}),
+	md_el(:code, [], {:raw_code=>"john = Twitter::Client.new(\n  :oauth_token => \"John's access token\",\n  :oauth_token_secret => \"John's access secret\"\n)", :lang=>nil}),
+	md_el(:code, [], {:raw_code=>"john = Twitter::Client.new(\n  :oauth_token => \"John's access token\",\n  :oauth_token_secret => \"John's access secret\"\n)", :lang=>"ruby"}),
+	md_el(:code, [], {:raw_code=>"john = Twitter::Client.new(\n  :oauth_token => \"John's access token\",\n  :oauth_token_secret => \"John's access secret\"\n)", :lang=>nil})
 ])
 *** Output of to_html ***
-<pre class="ruby"><code class="ruby">
-john = Twitter::Client.new(
+<pre class="ruby"><code class="ruby">john = Twitter::Client.new(
   :oauth_token =&gt; "John's access token",
   :oauth_token_secret =&gt; "John's access secret"
-)
-</code></pre>
+)</code></pre>
 
-<pre><code>
-john = Twitter::Client.new(
+<pre><code>john = Twitter::Client.new(
   :oauth_token =&gt; "John's access token",
   :oauth_token_secret =&gt; "John's access secret"
-)
-</code></pre>
+)</code></pre>
 
-<pre class="ruby"><code class="ruby">
-john = Twitter::Client.new(
+<pre class="ruby"><code class="ruby">john = Twitter::Client.new(
   :oauth_token =&gt; "John's access token",
   :oauth_token_secret =&gt; "John's access secret"
-)
-</code></pre>
+)</code></pre>
 
-<pre><code>
-john = Twitter::Client.new(
+<pre><code>john = Twitter::Client.new(
   :oauth_token =&gt; "John's access token",
   :oauth_token_secret =&gt; "John's access secret"
-)
-</code></pre>
+)</code></pre>

data/spec/block_docs/fenced_code_blocks_highlighted.md

@@ -11,8 +11,7 @@ john = Twitter::Client.new(
 *** Output of inspect ***
 
 *** Output of to_html ***
-<pre class="ruby"><code class="ruby">
-<span class="ident">john</span> <span class="punct">=</span> <span class="constant">Twitter</span><span class="punct">::</span><span class="constant">Client</span><span class="punct">.</span><span class="ident">new</span><span class="punct">(</span>
+<pre class="ruby"><code class="ruby"><span class="ident">john</span> <span class="punct">=</span> <span class="constant">Twitter</span><span class="punct">::</span><span class="constant">Client</span><span class="punct">.</span><span class="ident">new</span><span class="punct">(</span>
   <span class="symbol">:oauth_token</span> <span class="punct">=&gt;</span> <span class="punct">"</span><span class="string">John's access token</span><span class="punct">",</span>
   <span class="symbol">:oauth_token_secret</span> <span class="punct">=&gt;</span> <span class="punct">"</span><span class="string">John's access secret</span><span class="punct">"</span>
 <span class="punct">)</span></code></pre>