maruku 0.6.1 → 0.7.0.beta1

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

@@ -11,9 +11,9 @@ This is a list:
 md_el(:document,[
 	md_par(["This is a list:"]),
 	md_el(:ol,[
-		md_el(:li_span,["one"],{:want_my_paragraph=>false},[]),
-		md_el(:li_span,["two"],{:want_my_paragraph=>false},[]),
-		md_el(:li_span,["three"],{:want_my_paragraph=>false},[])
+		md_el(:li,["one"],{:want_my_paragraph=>false},[]),
+		md_el(:li,["two"],{:want_my_paragraph=>false},[]),
+		md_el(:li,["three"],{:want_my_paragraph=>false},[])
 	],{},[])
 ],{},[])
 *** Output of to_html ***
@@ -38,20 +38,8 @@ This is a list:
 *** Output of to_md ***
 This is a list:
 
-1.  one
-2.  two
-3.  three
+1. one
+2. two
+3. three
 *** Output of to_s ***
 This is a list:onetwothree
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

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

@@ -13,15 +13,3 @@ One line
 One line
 *** Output of to_s ***
 One line
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

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

@@ -14,15 +14,3 @@ Paragraph
 Paragraph
 *** Output of to_s ***
 Paragraph
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

data/{tests/unittest → spec/block_docs}/paragraph_rules/dont_merge_ref.md

@@ -34,21 +34,13 @@ Paragraph
 Paragraph
 *** Output of to_md ***
 Paragraph
+[google1]: #
 
 Paragraph
+ [google2]: #
 
 Paragraph
+  [google3]: #
+
 *** Output of to_s ***
 ParagraphParagraphParagraph
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

data/{tests/unittest → spec/block_docs}/paragraph_rules/tab_is_blank.md

@@ -22,15 +22,3 @@ Paragraph1
 Paragraph2
 *** Output of to_s ***
 Paragraph1Paragraph2
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

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

@@ -34,7 +34,7 @@ Paragraph 1
 
 Paragraph 2
 
-Paragraph 3 Paragraph 4 Paragraph Br-{\tt \char62}\newline Paragraph 5
+Paragraph 3 Paragraph 4 Paragraph Br-{\tt \symbol{62}}\newline Paragraph 5
 *** Output of to_md ***
 Paragraph 1
 
@@ -44,15 +44,3 @@ Paragraph 3 Paragraph 4 Paragraph Br->
 Paragraph 5
 *** Output of to_s ***
 Paragraph 1Paragraph 2Paragraph 3 Paragraph 4 Paragraph Br->Paragraph 5
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

data/{tests/unittest → spec/block_docs}/recover/recover_links.md

@@ -1,27 +1,15 @@
-This shows how Maruku recovers from parsing errors
+Maruku should not mangle references that don't exist.
 *** Parameters: ***
 {:on_error=>:warning}
 *** Markdown input: ***
 Search on [Google images][ 	GoOgle search ]
 *** Output of inspect ***
-md_el(:document,[md_par(["Search on ", md_link(["Google images"],"google_search")])],{},[])
+md_el(:document,[md_par(["Search on ", md_link(["Google images"]," \tGoOgle search ")])],{},[])
 *** Output of to_html ***
-<p>Search on <span>Google images</span></p>
+<p>Search on [Google images][ 	GoOgle search ]</p>
 *** Output of to_latex ***
 Search on Google images
 *** Output of to_md ***
-Search on Google images
+Search on [Google images][ 	GoOgle search ]
 *** Output of to_s ***
 Search on Google images
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

data/{tests/unittest/pending/ref.md → spec/block_docs/ref_with_period.md}

@@ -8,26 +8,17 @@ Write a comment here
 
 *** Output of inspect ***
 md_el(:document,[
-	md_par([md_link(["a. b"],"a_b"), " is a link."]),
-	md_ref_def("a_b", "http://site.com/", {:title=>nil})
+	md_par([md_link(["a. b"],nil), " is a link."]),
+	md_ref_def("a. b", "http://site.com/", {:title=>nil})
 ],{},[])
 *** Output of to_html ***
-<p><a href='http://site.com/'>a. b</a> is a link.</p>
+<p><a href="http://site.com/">a. b</a> is a link.</p>
 *** Output of to_latex ***
 \href{http://site.com/}{a. b} is a link.
 *** Output of to_md ***
-a. bis a link.
-*** Output of to_s ***
-a. b is a link.
-*** EOF ***
-
-
-
-	OK!
-
+[a. b] is a link.
 
+[a. b]: http://site.com/
 
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)
+*** Output of to_s ***
+a. b is a link.

data/spec/block_docs/ref_with_title.md

@@ -0,0 +1,22 @@
+Comment
+*** Parameters: ***
+{}
+*** Markdown input: ***
+[bar][1].
+
+[1]: /url/ "Title"
+*** Output of inspect ***
+md_el(:document,[
+        md_par([md_link(["bar"],"1"), "."]),
+        md_ref_def("1", "/url/", {:title=>"Title"})
+],{},[])
+*** Output of to_html ***
+<p><a href="/url/" title="Title">bar</a>.</p>
+*** Output of to_latex ***
+\href{/url/}{bar}.
+*** Output of to_md ***
+[bar][1].
+
+[1]: /url/ "Title"
+*** Output of to_s ***
+bar.

data/{tests/unittest → spec/block_docs}/references/long_example.md

@@ -51,33 +51,26 @@ md_el(:document,[
 	])
 ],{},[])
 *** Output of to_html ***
-<p>filters &#8211; including <a href='http://docutils.sourceforge.net/mirror/setext.html'>Setext</a>, <a href='http://www.aaronsw.com/2002/atx/'>atx</a>, <a href='http://textism.com/tools/textile/'>Textile</a>, <a href='http://docutils.sourceforge.net/rst.html'>reStructuredText</a>, <a href='http://www.triptico.com/software/grutatxt.html'>Grutatext</a>, and <a href='http://ettext.taint.org/doc/'>EtText</a> &#8211; the single biggest source of inspiration for Markdown&#8217;s syntax is the format of plain text email.</p>
+<p>filters – including <a href="http://docutils.sourceforge.net/mirror/setext.html">Setext</a>, <a href="http://www.aaronsw.com/2002/atx/">atx</a>, <a href="http://textism.com/tools/textile/">Textile</a>, <a href="http://docutils.sourceforge.net/rst.html">reStructuredText</a>, <a href="http://www.triptico.com/software/grutatxt.html">Grutatext</a>, and <a href="http://ettext.taint.org/doc/">EtText</a> – the single biggest source of inspiration for Markdown’s syntax is the format of plain text email.</p>
 
-<p>To this end, Markdown&#8217;s syntax is comprised entirely of punctuation</p>
+<p>To this end, Markdown’s syntax is comprised entirely of punctuation</p>
 *** Output of to_latex ***
-filters --{} including \href{http://docutils.sourceforge.net/mirror/setext.html}{Setext}, \href{http://www.aaronsw.com/2002/atx/}{atx}, \href{http://textism.com/tools/textile/}{Textile}, \href{http://docutils.sourceforge.net/rst.html}{reStructuredText}, \href{http://www.triptico.com/software/grutatxt.html}{Grutatext}, and \href{http://ettext.taint.org/doc/}{EtText} --{} the single biggest source of inspiration for Markdown'{}s syntax is the format of plain text email.
+filters -- including \href{http://docutils.sourceforge.net/mirror/setext.html}{Setext}, \href{http://www.aaronsw.com/2002/atx/}{atx}, \href{http://textism.com/tools/textile/}{Textile}, \href{http://docutils.sourceforge.net/rst.html}{reStructuredText}, \href{http://www.triptico.com/software/grutatxt.html}{Grutatext}, and \href{http://ettext.taint.org/doc/}{EtText} -- the single biggest source of inspiration for Markdown's syntax is the format of plain text email.
 
-To this end, Markdown'{}s syntax is comprised entirely of punctuation
+To this end, Markdown's syntax is comprised entirely of punctuation
 *** Output of to_md ***
-filters including Setext, atx, Textile,
-reStructuredText, Grutatext, and EtText
-the single biggest source of
-inspiration for Markdown s syntax is
-the format of plain text email.
-
-To this end, Markdown s syntax is
-comprised entirely of punctuation
-*** Output of to_s ***
-filters  including Setext, atx, Textile, reStructuredText, Grutatext, and EtText  the single biggest source of inspiration for Markdowns syntax is the format of plain text email.To this end, Markdowns syntax is comprised entirely of punctuation
-*** EOF ***
-
-
-
-	OK!
 
+filters -- including [Setext] [1], [atx] [2], [Textile] [3], [reStructuredText] [4],
+[Grutatext] [5], and [EtText] [6] -- the single biggest source of
+inspiration for Markdown's syntax is the format of plain text email.
 
+  [1]: http://docutils.sourceforge.net/mirror/setext.html
+  [2]: http://www.aaronsw.com/2002/atx/
+  [3]: http://textism.com/tools/textile/
+  [4]: http://docutils.sourceforge.net/rst.html
+  [5]: http://www.triptico.com/software/grutatxt.html
+  [6]: http://ettext.taint.org/doc/
 
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)
+To this end, Markdown's syntax is comprised entirely of punctuation
+*** Output of to_s ***
+filters  including Setext, atx, Textile, reStructuredText, Grutatext, and EtText  the single biggest source of inspiration for Markdowns syntax is the format of plain text email.To this end, Markdowns syntax is comprised entirely of punctuation

data/{tests/unittest → spec/block_docs}/references/spaces_and_numbers.md

@@ -13,15 +13,3 @@ md_el(:document,[md_ref_def("6", "http://ettext.taint.org/doc/", {:title=>nil})]
 
 *** 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}/smartypants.md

@@ -19,7 +19,7 @@ I -- too -- met << some curly quotes >> there or <<here>>No space.
 
 *** Output of inspect ***
 md_el(:document,[
-	md_el(:code,[],{:raw_code=>"'Twas a \"test\" to 'remember' in the '90s."},[]),
+	md_el(:code,[],{:raw_code=>"'Twas a \"test\" to 'remember' in the '90s.", :lang=>nil},[]),
 	md_par([
 		md_entity("lsquo"),
 		"Twas a ",
@@ -34,7 +34,7 @@ md_el(:document,[
 		md_entity("rsquo"),
 		"90s."
 	]),
-	md_el(:code,[],{:raw_code=>"It was --- in a sense --- really... interesting."},[]),
+	md_el(:code,[],{:raw_code=>"It was --- in a sense --- really... interesting.", :lang=>nil},[]),
 	md_par([
 		"It was ",
 		md_entity("mdash"),
@@ -44,7 +44,7 @@ md_el(:document,[
 		md_entity("hellip"),
 		" interesting."
 	]),
-	md_el(:code,[],{:raw_code=>"I -- too -- met << some curly quotes >> there or <<here>>No space."},[]),
+	md_el(:code,[],{:raw_code=>"I -- too -- met << some curly quotes >> there or <<here>>No space.", :lang=>nil},[]),
 	md_par([
 		"I ",
 		md_entity("ndash"),
@@ -62,65 +62,58 @@ md_el(:document,[
 		md_entity("raquo"),
 		"No space."
 	]),
-	md_el(:code,[],{:raw_code=>"She was 6\\\"12\\'."},[]),
+	md_el(:code,[],{:raw_code=>"She was 6\\\"12\\'.", :lang=>nil},[]),
 	md_el(:quote,[
 		md_par(["She was 6", md_entity("quot"), "12", md_entity("apos"), "."])
 	],{},[])
 ],{},[])
 *** Output of to_html ***
-<pre><code>&#39;Twas a &quot;test&quot; to &#39;remember&#39; in the &#39;90s.</code></pre>
+<pre><code>'Twas a "test" to 'remember' in the '90s.</code></pre>
 
-<p>&#8216;Twas a &#8220;test&#8221; to &#8216;remember&#8217; in the &#8217;90s.</p>
+<p>‘Twas a “test” to ‘remember’ in the ’90s.</p>
 
 <pre><code>It was --- in a sense --- really... interesting.</code></pre>
 
-<p>It was &#8212; in a sense &#8212; really&#8230; interesting.</p>
+<p>It was — in a sense — really… interesting.</p>
 
 <pre><code>I -- too -- met &lt;&lt; some curly quotes &gt;&gt; there or &lt;&lt;here&gt;&gt;No space.</code></pre>
 
-<p>I &#8211; too &#8211; met &#171;&#160;some curly quotes&#160;&#187; there or &#171;here&#187;No space.</p>
+<p>I – too – met « some curly quotes » there or «here»No space.</p>
 
-<pre><code>She was 6\&quot;12\&#39;.</code></pre>
+<pre><code>She was 6\"12\'.</code></pre>
 
 <blockquote>
-<p>She was 6&#34;12&#39;.</p>
+<p>She was 6"12'.</p>
 </blockquote>
 *** Output of to_latex ***
 \begin{verbatim}'Twas a "test" to 'remember' in the '90s.\end{verbatim}
-`{}Twas a ``{}test''{} to `{}remember'{} in the '{}90s.
+`Twas a ``test'' to `remember' in the '90s.
 
 \begin{verbatim}It was --- in a sense --- really... interesting.\end{verbatim}
-It was ---{} in a sense ---{} really\ldots{} interesting.
+It was --- in a sense --- really\ldots{} interesting.
 
 \begin{verbatim}I -- too -- met << some curly quotes >> there or <<here>>No space.\end{verbatim}
-I --{} too --{} met \guillemotleft{}~{}some curly quotes~{}\guillemotright{} there or \guillemotleft{}here\guillemotright{}No space.
+I -- too -- met \guillemotleft{}~some curly quotes~\guillemotright{} there or \guillemotleft{}here\guillemotright{}No space.
 
 \begin{verbatim}She was 6\"12\'.\end{verbatim}
 \begin{quote}%
-She was 6"{}12'{}.
+She was 6"12'.
 
 
 \end{quote}
 *** Output of to_md ***
-Twas a test to remember in the 90s.
-
-It was in a sense really interesting.
-
-I too met some curly quotes there or
-here No space.
-
-She was 6 12 .
-*** Output of to_s ***
-Twas a test to remember in the 90s.It was  in a sense  really interesting.I  too  met some curly quotes there or hereNo space.She was 612.
-*** EOF ***
-
+	'Twas a "test" to 'remember' in the '90s.
+'Twas a "test" to 'remember' in the '90s.
 
+	It was --- in a sense --- really... interesting.
+It was --- in a sense --- really... interesting.
 
-	OK!
+	I -- too -- met << some curly quotes >> there or <<here>>No space.
+I -- too -- met << some curly quotes >> there or <<here>>No space.
 
 
+	She was 6\"12\'.
+> She was 6\"12\'.
 
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)
+*** Output of to_s ***
+Twas a test to remember in the 90s.It was  in a sense  really interesting.I  too  met some curly quotes there or hereNo space.She was 612.

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

@@ -17,21 +17,21 @@ This is ruby code:
 *** Output of inspect ***
 md_el(:document,[
 	md_par(["This is ruby code:"]),
-	md_el(:code,[],{:raw_code=>"require 'maruku'\n\nputs Maruku.new($stdin).to_html"},[]),
+	md_el(:code,[],{:raw_code=>"require 'maruku'\n\nputs Maruku.new($stdin).to_html", :lang=>nil},[]),
 	md_par(["This is ruby code:"]),
-	md_el(:code,[],{:raw_code=>"require 'maruku'"},[["lang", "ruby"], [:ref, "html_use_syntax"]]),
-	md_el(:code,[],{:raw_code=>"puts Maruku.new($stdin).to_html"},[])
+	md_el(:code,[],{:raw_code=>"require 'maruku'", :lang=>nil},[["lang", "ruby"], [:ref, "html_use_syntax"]]),
+	md_el(:code,[],{:raw_code=>"puts Maruku.new($stdin).to_html", :lang=>nil},[])
 ],{},[])
 *** Output of to_html ***
 <p>This is ruby code:</p>
 
-<pre><code>require &#39;maruku&#39;
+<pre><code>require 'maruku'
 
 puts Maruku.new($stdin).to_html</code></pre>
 
 <p>This is ruby code:</p>
 
-<pre><code class='ruby' lang='ruby'><span class='ident'>require</span> <span class='punct'>&#39;</span><span class='string'>maruku</span><span class='punct'>&#39;</span></code></pre>
+<pre class="ruby"><code class="ruby"><span class="ident">require</span> <span class="punct">'</span><span class="string">maruku</span><span class="punct">'</span></code></pre>
 
 <pre><code>puts Maruku.new($stdin).to_html</code></pre>
 *** Output of to_latex ***
@@ -47,18 +47,14 @@ This is ruby code:
 *** Output of to_md ***
 This is ruby code:
 
-This is ruby code:
-*** Output of to_s ***
-This is ruby code:This is ruby code:
-*** EOF ***
-
-
-
-	OK!
+     require 'maruku'
+     
+     puts Maruku.new($stdin).to_html
 
+This is ruby code:
 
+     require 'maruku'
 
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)
+     puts Maruku.new($stdin).to_html
+*** Output of to_s ***
+This is ruby code:This is ruby code: