maruku 0.6.0 → 0.7.3

data/{tests/unittest → spec/block_docs}/html3.md

@@ -22,22 +22,10 @@ md_el(:document,[
 	])
 ],{},[])
 *** Output of to_html ***
-<p>taking part in <a href='http://sied.dis.uniroma1.it/'>some arcane conspirations</a> which involve <b href='http://www.flickr.com/photos/censi/70893277/'>coffee</b>, <a href='http://flickr.com/photos/censi/42775664/in/set-936677/'>robots</a>, <a href='http://www.flickr.com/photos/censi/42775888/in/set-936677/'>sushi</a>,</p>
+<p>taking part in <a href="http://sied.dis.uniroma1.it/">some arcane conspirations</a> which involve <b href="http://www.flickr.com/photos/censi/70893277/">coffee</b>, <a href="http://flickr.com/photos/censi/42775664/in/set-936677/">robots</a>, <a href="http://www.flickr.com/photos/censi/42775888/in/set-936677/">sushi</a>,</p>
 *** Output of to_latex ***
 taking part in  which involve , , ,
 *** Output of to_md ***
 taking part in which involve , , ,
 *** Output of to_s ***
 taking part in  which involve , , ,
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

data/{tests/unittest → spec/block_docs}/html4.md

@@ -14,8 +14,8 @@ md_el(:document,[
 	md_html("<div class=\"frame\">\n\t<a  class=\"photo\" href=\"http://www.flickr.com/photos/censi/54757256/\"><img alt=\"\"\n  moz-do-not-send=\"true\"\n  src=\"http://static.flickr.com/27/54757256_1a2c1d2a95_m.jpg\" /></a>\n</div>")
 ],{},[])
 *** Output of to_html ***
-<div class='frame'>
-	<a href='http://www.flickr.com/photos/censi/54757256/' class='photo'><img src='http://static.flickr.com/27/54757256_1a2c1d2a95_m.jpg' moz-do-not-send='true' alt='' /></a>
+<div class="frame">
+	<a class="photo" href="http://www.flickr.com/photos/censi/54757256/"><img alt="" moz-do-not-send="true" src="http://static.flickr.com/27/54757256_1a2c1d2a95_m.jpg" /></a>
 </div>
 *** Output of to_latex ***
 
@@ -23,15 +23,3 @@ md_el(:document,[
 
 *** Output of to_s ***
 
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

data/{tests/unittest → spec/block_docs}/html5.md

@@ -12,8 +12,8 @@ md_el(:document,[
 	md_html(" <div class=\"frame\">\n <a class=\"photo\" href=\"http://www.flickr.com/photos/censi/88561568/\" ><img moz-do-not-send=\"true\" src=\"http://static.flickr.com/28/88561568_ab84d28245_m.jpg\" width=\"240\" height=\"180\" alt=\"Aperitif\" /></a>\n </div>")
 ],{},[])
 *** Output of to_html ***
-<div class='frame'>
- <a href='http://www.flickr.com/photos/censi/88561568/' class='photo'><img src='http://static.flickr.com/28/88561568_ab84d28245_m.jpg' height='180' moz-do-not-send='true' alt='Aperitif' width='240' /></a>
+<div class="frame">
+ <a class="photo" href="http://www.flickr.com/photos/censi/88561568/"><img moz-do-not-send="true" src="http://static.flickr.com/28/88561568_ab84d28245_m.jpg" width="240" height="180" alt="Aperitif" /></a>
  </div>
 *** Output of to_latex ***
 
@@ -21,15 +21,3 @@ md_el(:document,[
 
 *** Output of to_s ***
 
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

data/spec/block_docs/html_block_in_para.md

@@ -0,0 +1,22 @@
+Maruku should not nest block-level HTML inside a paragraph
+*** Parameters: ***
+{} # params
+*** Markdown input: ***
+One
+<div>a</div>123
+
+<div>a</div>123
+*** Output of inspect ***
+md_el(:document,[
+	md_par("One"),
+  md_html("<div>a</div>"),
+  md_par("123"),
+	md_html("<div>a</div>"),
+  md_par("123")
+],{},[])
+*** Output of to_html ***
+<p>One</p>
+<div>a</div>
+<p>123</p>
+<div>a</div>
+<p>123</p>

data/spec/block_docs/html_inline.md

@@ -0,0 +1,25 @@
+JRUBY NOKOGIRI PENDING - Maruku should nest inline-level HTML inside a paragraph
+(JRuby Nokogiri is broken for empty tags: https://github.com/sparklemotion/nokogiri/issues/971)
+*** Parameters: ***
+{} # params
+*** Markdown input: ***
+One
+<span></span>123
+
+<span></span>123
+
+<animateColor/>123
+
+<svg></svg>
+*** Output of inspect ***
+md_el(:document,[
+	md_par(["One ", md_html("<span></span>"), "123"]),
+	md_par([md_html("<span></span>"), "123"]),
+	md_par([md_html("<animateColor/>"), "123"]),
+	md_html("<svg></svg>"),
+],{},[])
+*** Output of to_html ***
+<p>One <span></span>123</p>
+<p><span></span>123</p>
+<p><animateColor></animateColor>123</p>
+<svg></svg>

data/spec/block_docs/html_trailing.md

@@ -0,0 +1,31 @@
+Markdown should be processed trailing text after HTML
+*** Parameters: ***
+{}
+*** Markdown input: ***
+before
+
+<!-- comment --> ------
+
+after
+
+<p>hello</p> *foo*
+
+done
+*** Output of inspect ***
+md_el(:document, [
+       md_par("before"),
+       md_html("<!-- comment -->"),
+       md_el(:hrule, []),
+       md_par("after"),
+       md_html("<p>hello</p>"),
+       md_par(md_em("foo")),
+       md_par("done") ])
+*** Output of to_html ***
+<p>before</p>
+<!-- comment --><hr />
+
+<p>after</p>
+<p>hello</p>
+<p><em>foo</em></p>
+
+<p>done</p>

data/spec/block_docs/ie.md

@@ -0,0 +1,62 @@
+We must make sure that `'` is always written as `'`.
+
+*** Parameters: ***
+{:html_use_syntax => true} # params 
+*** Markdown input: ***
+`<p>here's an apostrophe & a quote "</p>`
+
+	<p>here's an apostrophe & a quote "</p>
+{:}
+
+	<p>here's an apostrophe & a quote "</p>
+{:lang=xml}
+
+	<p>here's an apostrophe & a quote "</p>
+{:html_use_syntax=true lang=not_supported}
+
+	<p>here's an apostrophe & a quote "</p>
+{:html_use_syntax=true lang=xml}
+
+
+*** Output of inspect ***
+md_el(:document,[
+	md_par([md_code("<p>here's an apostrophe & a quote \"</p>")]),
+	md_el(:code,[],{:raw_code=>"<p>here's an apostrophe & a quote \"</p>", :lang=>nil},[]),
+	md_el(:code,[],{:raw_code=>"<p>here's an apostrophe & a quote \"</p>", :lang=>nil},[["lang", "xml"]]),
+	md_el(:code,[],{:raw_code=>"<p>here's an apostrophe & a quote \"</p>", :lang=>nil},[["html_use_syntax", "true"], ["lang", "not_supported"]]),
+	md_el(:code,[],{:raw_code=>"<p>here's an apostrophe & a quote \"</p>", :lang=>nil},[["html_use_syntax", "true"], ["lang", "xml"]])
+],{},[])
+*** Output of to_html ***
+<p><code>&lt;p&gt;here's an apostrophe &amp; a quote "&lt;/p&gt;</code></p>
+
+<pre><code>&lt;p&gt;here's an apostrophe &amp; a quote "&lt;/p&gt;</code></pre>
+
+<pre class="xml"><code class="xml"><span class="punct">&lt;</span><span class="tag">p</span><span class="punct">&gt;</span>here's an apostrophe &amp; a quote "<span class="punct">&lt;/</span><span class="tag">p</span><span class="punct">&gt;</span></code></pre>
+
+<pre class="not_supported"><code class="not_supported">&lt;p&gt;here's an apostrophe &amp; a quote "&lt;/p&gt;</code></pre>
+
+<pre class="xml"><code class="xml"><span class="punct">&lt;</span><span class="tag">p</span><span class="punct">&gt;</span>here's an apostrophe &amp; a quote "<span class="punct">&lt;/</span><span class="tag">p</span><span class="punct">&gt;</span></code></pre>
+*** Output of to_latex ***
+{\colorbox[rgb]{1.00,0.93,1.00}{\tt \char60p\char62here\char39s\char32an\char32apostrophe\char32\char38\char32a\char32quote\char32\char34\char60\char47p\char62}}
+
+\begin{verbatim}<p>here's an apostrophe & a quote "</p>\end{verbatim}
+\begin{verbatim}<p>here's an apostrophe & a quote "</p>\end{verbatim}
+\begin{verbatim}<p>here's an apostrophe & a quote "</p>\end{verbatim}
+\begin{verbatim}<p>here's an apostrophe & a quote "</p>\end{verbatim}
+*** Output of to_md ***
+
+`<p>here's an apostrophe & a quote "</p>`
+
+     <p>here's an apostrophe & a quote "</p>
+{:}
+
+     <p>here's an apostrophe & a quote "</p>
+{:lang=xml}
+
+     <p>here's an apostrophe & a quote "</p>
+{:html_use_syntax=true lang=not_supported}
+
+     <p>here's an apostrophe & a quote "</p>
+{:html_use_syntax=true lang=xml}
+*** Output of to_s ***
+

data/spec/block_docs/iframe.md

@@ -0,0 +1,29 @@
+Embed html iframe element
+*** Parameters: ***
+{}
+*** Markdown input: ***
+Paragraph1
+
+<iframe src="http://www.youtube.com/">a</iframe>
+
+Paragraph2
+*** Output of inspect ***
+md_el(:document,[
+	md_par(["Paragraph1"]),
+	md_html('<iframe src="http://www.youtube.com/">a</iframe>'),
+	md_par(["Paragraph2"])
+],{},[])
+*** Output of to_html ***
+<p>Paragraph1</p>
+<iframe src="http://www.youtube.com/">a</iframe>
+<p>Paragraph2</p>
+*** Output of to_latex ***
+Paragraph1
+
+Paragraph2
+*** Output of to_md ***
+Paragraph1
+
+Paragraph2
+*** Output of to_s ***
+Paragraph1Paragraph2

data/spec/block_docs/ignore_bad_header.md

@@ -0,0 +1,9 @@
+Pass weird messed up header through to output without blowing up. Secondary issue noticed via https://github.com/bhollis/maruku/issues/124
+*** Parameters: ***
+{:on_error => :raise}
+*** Markdown input: ***
+= Markdown, with some ruby =
+*** Output of inspect ***
+md_el(:document, md_par(["= Markdown, with some ruby ="]))
+*** Output of to_html ***
+<p>= Markdown, with some ruby =</p>

data/{tests/unittest → spec/block_docs}/images.md

@@ -3,7 +3,7 @@ Write a comment abouth the test here.
 {}
 *** Markdown input: ***
 
-This page does not uilizes ![Cascading Style Sheets](http://jigsaw.w3.org/css-validator/images/vcss)
+This page does not utilize ![Cascading Style Sheets](http://jigsaw.w3.org/css-validator/images/vcss)
 
 
 Please mouseover to see the title: ![Cascading Style Sheets](http://jigsaw.w3.org/css-validator/images/vcss "Title ok!")
@@ -27,7 +27,7 @@ This is double size: ![Cascading Style Sheets] [css2]
 *** Output of inspect ***
 md_el(:document,[
 	md_par([
-		"This page does not uilizes ",
+		"This page does not utilize ",
 		md_im_image(["Cascading Style Sheets"], "http://jigsaw.w3.org/css-validator/images/vcss", nil)
 	]),
 	md_par([
@@ -52,51 +52,45 @@ md_el(:document,[
 	md_ref_def("css2", "http://jigsaw.w3.org/css-validator/images/vcss", {:title=>"Optional title attribute"})
 ],{},[])
 *** Output of to_html ***
-<p>This page does not uilizes <img src='http://jigsaw.w3.org/css-validator/images/vcss' alt='Cascading Style Sheets' /></p>
+<p>This page does not utilize <img src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Cascading Style Sheets" /></p>
 
-<p>Please mouseover to see the title: <img src='http://jigsaw.w3.org/css-validator/images/vcss' alt='Cascading Style Sheets' /></p>
+<p>Please mouseover to see the title: <img src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Cascading Style Sheets" title="Title ok!" /></p>
 
-<p>Please mouseover to see the title: <img src='http://jigsaw.w3.org/css-validator/images/vcss' alt='Cascading Style Sheets' /></p>
+<p>Please mouseover to see the title: <img src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Cascading Style Sheets" title="Title ok!" /></p>
 
-<p>I&#8217;ll say it one more time: this page does not use <img src='http://jigsaw.w3.org/css-validator/images/vcss' alt='Cascading Style Sheets' /></p>
+<p>I’ll say it one more time: this page does not use <img src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Cascading Style Sheets" title="Optional title attribute" /></p>
 
-<p>This is double size: <img src='http://jigsaw.w3.org/css-validator/images/vcss' alt='Cascading Style Sheets' /></p>
+<p>This is double size: <img src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Cascading Style Sheets" title="Optional title attribute" /></p>
 *** Output of to_latex ***
-This page does not uilizes 
+This page does not utilize 
 
 Please mouseover to see the title: 
 
 Please mouseover to see the title: 
 
-I'{}ll say it one more time: this page does not use 
+I'll say it one more time: this page does not use 
 
 This is double size:
 *** Output of to_md ***
-This page does not uilizes
-Cascading Style Sheets
+This page does not utilize
+![Cascading Style Sheets](http://jigsaw.w3.org/css-validator/images/vcss)
 
 Please mouseover to see the title:
-Cascading Style Sheets
+![Cascading Style Sheets](http://jigsaw.w3.org/css-validator/images/vcss "Title ok!")
 
 Please mouseover to see the title:
-Cascading Style Sheets
+![Cascading Style Sheets](http://jigsaw.w3.org/css-validator/images/vcss "Title ok!")
 
-I ll say it one more time: this page
-does not use Cascading Style Sheets
+I'll say it one more time: this
+page does not use
+![Cascading Style Sheets][css]
 
 This is double size:
-Cascading Style Sheets
-*** Output of to_s ***
-This page does not uilizes Cascading Style SheetsPlease mouseover to see the title: Cascading Style SheetsPlease mouseover to see the title: Cascading Style SheetsIll say it one more time: this page does not use Cascading Style SheetsThis is double size: Cascading Style Sheets
-*** EOF ***
-
-
-
-	OK!
-
+![Cascading Style Sheets][css2]
 
+[css]: http://jigsaw.w3.org/css-validator/images/vcss "Optional title attribute"
 
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)
+[css2]: http://jigsaw.w3.org/css-validator/images/vcss "Optional title attribute" class=external
+   style="border:0;width:188px;height:131px"
+*** Output of to_s ***
+This page does not utilize Cascading Style SheetsPlease mouseover to see the title: Cascading Style SheetsPlease mouseover to see the title: Cascading Style SheetsIll say it one more time: this page does not use Cascading Style SheetsThis is double size: Cascading Style Sheets

data/{tests/unittest → spec/block_docs}/images2.md

@@ -11,33 +11,23 @@ This is an ![image].
 
 *** Output of inspect ***
 md_el(:document,[
-	md_par(["This is an ", md_image(["image"], "image"), "."]),
+	md_par(["This is an ", md_image(["image"], ""), "."]),
 	md_par(["This is an ", md_image(["image"], "image"), "."]),
 	md_ref_def("image", "image.jpg", {:title=>nil})
 ],{},[])
 *** Output of to_html ***
-<p>This is an <img src='image.jpg' alt='image' />.</p>
+<p>This is an <img src="image.jpg" alt="image" />.</p>
 
-<p>This is an <img src='image.jpg' alt='image' />.</p>
+<p>This is an <img src="image.jpg" alt="image" />.</p>
 *** Output of to_latex ***
 This is an .
 
 This is an .
 *** Output of to_md ***
-This is an image.
+This is an ![image][].
+
+This is an ![image].
 
-This is an image.
+[image]: image.jpg
 *** Output of to_s ***
 This is an image.This is an image.
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

data/{tests/unittest → spec/block_docs}/inline_html.md

@@ -6,13 +6,13 @@ CSS: style.css
 
 Input:
 
-	<em>Emphasis</em>
+    <em>Emphasis</em>
 
 Result: <em>Emphasis</em>
 
 Input:
 
-	<img src="http://jigsaw.w3.org/css-validator/images/vcss"/>
+    <img src="http://jigsaw.w3.org/css-validator/images/vcss"/>
 
 Result on span: <img src="http://jigsaw.w3.org/css-validator/images/vcss"/>
 
@@ -25,14 +25,14 @@ Without closing:
 <img src="http://jigsaw.w3.org/css-validator/images/vcss">
 
 <div markdown="1">
-	This is *true* markdown text (paragraph)
-
-	<p markdown="1">
-		This is *true* markdown text (no paragraph)
-	</p>
-	<p markdown="block">
-		This is *true* markdown text (block paragraph)
-	</p>
+   This is *true* markdown text (paragraph)
+
+   <p markdown="1">
+   This is *true* markdown text (no paragraph)
+   </p>
+   <p markdown="block">
+   This is *true* markdown text (block paragraph)
+   </p>
 </div>
 
 <table>
@@ -47,19 +47,19 @@ Without closing:
 *** Output of inspect ***
 md_el(:document,[
 	md_par(["Input:"]),
-	md_el(:code,[],{:raw_code=>"<em>Emphasis</em>"},[]),
+	md_el(:code,[],{:raw_code=>"<em>Emphasis</em>", :lang=>nil},[]),
 	md_par(["Result: ", md_html("<em>Emphasis</em>")]),
 	md_par(["Input:"]),
-	md_el(:code,[],{:raw_code=>"<img src=\"http://jigsaw.w3.org/css-validator/images/vcss\"/>"},[]),
+	md_el(:code,[],{:raw_code=>"<img src=\"http://jigsaw.w3.org/css-validator/images/vcss\"/>", :lang=>nil},[]),
 	md_par([
 		"Result on span: ",
 		md_html("<img src=\"http://jigsaw.w3.org/css-validator/images/vcss\" />")
 	]),
 	md_par(["Result alone:"]),
-	md_html("<img src=\"http://jigsaw.w3.org/css-validator/images/vcss\" />"),
+	md_par(md_html("<img src=\"http://jigsaw.w3.org/css-validator/images/vcss\" />")),
 	md_par(["Without closing:"]),
-	md_html("<img src=\"http://jigsaw.w3.org/css-validator/images/vcss\" />"),
-	md_html("<div markdown=\"1\">\n\tThis is *true* markdown text (paragraph)\n\n\t<p markdown=\"1\">\n\t\tThis is *true* markdown text (no paragraph)\n\t</p>\n\t<p markdown=\"block\">\n\t\tThis is *true* markdown text (block paragraph)\n\t</p>\n</div>"),
+	md_par(md_html("<img src=\"http://jigsaw.w3.org/css-validator/images/vcss\" />")),
+	md_html("<div markdown=\"1\">\n   This is *true* markdown text (paragraph)\n\n   <p markdown=\"1\">\n   This is *true* markdown text (no paragraph)\n   </p>\n   <p markdown=\"block\">\n   This is *true* markdown text (block paragraph)\n   </p>\n</div>"),
 	md_html("<table>\n<tr>\n<td markdown=\"1\">This is a *true* markdown text. (no par)</td>\n<td markdown=\"block\">This is *true* markdown text. (par)</td>\n</tr>\n</table>")
 ],{},[])
 *** Output of to_html ***
@@ -71,57 +71,37 @@ md_el(:document,[
 
 <p>Input:</p>
 
-<pre><code>&lt;img src=&quot;http://jigsaw.w3.org/css-validator/images/vcss&quot;/&gt;</code></pre>
+<pre><code>&lt;img src="http://jigsaw.w3.org/css-validator/images/vcss"/&gt;</code></pre>
 
-<p>Result on span: <img src='http://jigsaw.w3.org/css-validator/images/vcss' /></p>
+<p>Result on span: <img src="http://jigsaw.w3.org/css-validator/images/vcss" /></p>
 
 <p>Result alone:</p>
-<img src='http://jigsaw.w3.org/css-validator/images/vcss' />
+
+<p><img src="http://jigsaw.w3.org/css-validator/images/vcss" /></p>
+
 <p>Without closing:</p>
-<img src='http://jigsaw.w3.org/css-validator/images/vcss' /><div>
-<p>
-<p>This is</p>
-<em>
-<p>true</p>
-</em>
-<p>markdown text (paragraph)</p>
-</p>
-<p>
-<p>
-<p>This is</p>
-<em>
-<p>true</p>
-</em>
-<p>markdown text (no paragraph)</p>
-</p>
-</p>
-	<p>
-<p>
-<p>This is</p>
-<em>
-<p>true</p>
-</em>
-<p>markdown text (block paragraph)</p>
-</p>
+
+<p><img src="http://jigsaw.w3.org/css-validator/images/vcss" /></p>
+<div>
+<p>This is <em>true</em> markdown text (paragraph)</p>
+
+
+   <p>
+   This is <em>true</em> markdown text (no paragraph)
+   </p>
+   <p>
+<p>This is <em>true</em> markdown text (block paragraph)</p>
+
 </p>
 </div><table>
 <tr>
+<td>This is a <em>true</em> markdown text. (no par)</td>
 <td>
-<p>This is a</p>
-<em>
-<p>true</p>
-</em>
-<p>markdown text. (no par)</p>
-</td>
-<td>
-<p>This is</p>
-<em>
-<p>true</p>
-</em>
-<p>markdown text. (par)</p>
+<p>This is <em>true</em> markdown text. (par)</p>
 </td>
 </tr>
 </table>
+
 *** Output of to_latex ***
 Input:
 
@@ -135,6 +115,8 @@ Result on span:
 
 Result alone:
 
+
+
 Without closing:
 *** Output of to_md ***
 Input:
@@ -150,15 +132,3 @@ Result alone:
 Without closing:
 *** Output of to_s ***
 Input:Result: Input:Result on span: Result alone:Without closing:
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)