maruku 0.6.1 → 0.7.0.beta1

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

@@ -1,6 +1,6 @@
-Write a comment here
+
 *** Parameters: ***
-{} # params 
+{} # params
 *** Markdown input: ***
 <http://www.aa.com>
 
@@ -25,28 +25,28 @@ md_el(:document,[
 	md_par([md_url("http://www.bb.com")]),
 	md_par([md_url("http://www.cc.com")]),
 	md_par([md_url("http://www.dd.com")]),
-	md_el(:code,[],{:raw_code=>"<http://www.dd.com>"},[]),
+	md_el(:code,[],{:raw_code=>"<http://www.dd.com>", :lang=>nil},[]),
 	md_par([md_email("a@invalid.it")]),
 	md_par([md_email("a@invalid.it")]),
 	md_par([md_email("a@invalid.it")]),
-	md_el(:code,[],{:raw_code=>"<a@invalid.it>"},[])
+	md_el(:code,[],{:raw_code=>"<a@invalid.it>", :lang=>nil},[])
 ],{},[])
 *** Output of to_html ***
-<p><a href='http://www.aa.com'>http://www.aa.com</a></p>
+<p><a href="http://www.aa.com">http://www.aa.com</a></p>
 
-<p><a href='http://www.bb.com'>http://www.bb.com</a></p>
+<p><a href="http://www.bb.com">http://www.bb.com</a></p>
 
-<p><a href='http://www.cc.com'>http://www.cc.com</a></p>
+<p><a href="http://www.cc.com">http://www.cc.com</a></p>
 
-<p><a href='http://www.dd.com'>http://www.dd.com</a></p>
+<p><a href="http://www.dd.com">http://www.dd.com</a></p>
 
 <pre><code>&lt;http://www.dd.com&gt;</code></pre>
 
-<p><a href='mailto:a@invalid.it'>&#097;&#064;&#105;&#110;&#118;&#097;&#108;&#105;&#100;&#046;&#105;&#116;</a></p>
+<p><a href="mailto:a@invalid.it">&#097;&#064;&#105;&#110;&#118;&#097;&#108;&#105;&#100;&#046;&#105;&#116;</a></p>
 
-<p><a href='mailto:a@invalid.it'>&#097;&#064;&#105;&#110;&#118;&#097;&#108;&#105;&#100;&#046;&#105;&#116;</a></p>
+<p><a href="mailto:a@invalid.it">&#097;&#064;&#105;&#110;&#118;&#097;&#108;&#105;&#100;&#046;&#105;&#116;</a></p>
 
-<p><a href='mailto:a@invalid.it'>&#097;&#064;&#105;&#110;&#118;&#097;&#108;&#105;&#100;&#046;&#105;&#116;</a></p>
+<p><a href="mailto:a@invalid.it">&#097;&#064;&#105;&#110;&#118;&#097;&#108;&#105;&#100;&#046;&#105;&#116;</a></p>
 
 <pre><code>&lt;a@invalid.it&gt;</code></pre>
 *** Output of to_latex ***
@@ -67,18 +67,21 @@ md_el(:document,[
 
 \begin{verbatim}<a@invalid.it>\end{verbatim}
 *** Output of to_md ***
+<http://www.aa.com>
 
-*** Output of to_s ***
+ <http://www.bb.com>
 
-*** EOF ***
+  <http://www.cc.com>
 
+   <http://www.dd.com>
 
+    <http://www.dd.com>
 
-	OK!
+<a@invalid.it>
 
+ <a@invalid.it>
 
+   <a@invalid.it>
 
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)
+    <a@invalid.it>
+*** Output of to_s ***

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

@@ -27,6 +27,8 @@ If all else fails, ask [Google](http://www.google.com)
 
 And now [reference-style link ID with spaces] [Google Images]
 
+And now [reference-style link ID (without spaces)][Google Search]
+
 [google]: http://www.google.com
 
 [google2]: http://www.google.com 'Single quotes'
@@ -36,17 +38,17 @@ And now [reference-style link ID with spaces] [Google Images]
 [google4]: http://www.google.com (Parenthesis)
 
 [Google Search]: 
- http://www.google.com "Google search"
+ http://www.google.com 'Google search'
 
 [Google Images]: 
  http://images.google.com  (Google images)
 *** Output of inspect ***
 md_el(:document,[
+	md_par(["Search on ", md_link(["Google"],"")]),
+	md_par(["Search on ", md_link(["Google"],"")]),
 	md_par(["Search on ", md_link(["Google"],"google")]),
-	md_par(["Search on ", md_link(["Google"],"google")]),
-	md_par(["Search on ", md_link(["Google"],"google")]),
-	md_par(["Search on ", md_link(["Google"],"google")]),
-	md_par(["Search on ", md_link(["Google images"],"google_images")]),
+	md_par(["Search on ", md_link(["Google"],"Google")]),
+	md_par(["Search on ", md_link(["Google images"],"")]),
 	md_par(["Inline: ", md_im_link(["Google images"], "http://google.com", nil)]),
 	md_par([
 		"Inline with title: ",
@@ -71,37 +73,43 @@ md_el(:document,[
 	]),
 	md_par([
 		"And now ",
-		md_link(["reference-style link ID with spaces"],"google_images")
+		md_link(["reference-style link ID with spaces"],"Google Images")
+	]),
+	md_par([
+		"And now ",
+		md_link(["reference-style link ID (without spaces)"], "Google Search")
 	]),
 	md_ref_def("google", "http://www.google.com", {:title=>nil}),
 	md_ref_def("google2", "http://www.google.com", {:title=>"Single quotes"}),
 	md_ref_def("google3", "http://www.google.com", {:title=>"Double quotes"}),
 	md_ref_def("google4", "http://www.google.com", {:title=>"Parenthesis"}),
-	md_ref_def("google_search", "http://www.google.com", {:title=>"Google search"}),
-	md_ref_def("google_images", "http://images.google.com", {:title=>"Google images"})
+	md_ref_def("google search", "http://www.google.com", {:title=>"Google search"}),
+	md_ref_def("google images", "http://images.google.com", {:title=>"Google images"})
 ],{},[])
 *** Output of to_html ***
-<p>Search on <a href='http://www.google.com'>Google</a></p>
+<p>Search on <a href="http://www.google.com">Google</a></p>
 
-<p>Search on <a href='http://www.google.com'>Google</a></p>
+<p>Search on <a href="http://www.google.com">Google</a></p>
 
-<p>Search on <a href='http://www.google.com'>Google</a></p>
+<p>Search on <a href="http://www.google.com">Google</a></p>
 
-<p>Search on <a href='http://www.google.com'>Google</a></p>
+<p>Search on <a href="http://www.google.com">Google</a></p>
 
-<p>Search on <a href='http://images.google.com' title='Google images'>Google images</a></p>
+<p>Search on <a href="http://images.google.com" title="Google images">Google images</a></p>
 
-<p>Inline: <a href='http://google.com'>Google images</a></p>
+<p>Inline: <a href="http://google.com">Google images</a></p>
 
-<p>Inline with title: <a href='http://google.com' title='Title'>Google images</a></p>
+<p>Inline with title: <a href="http://google.com" title="Title">Google images</a></p>
 
-<p>Inline with title: <a href='http://google.com' title='Title'>Google images</a></p>
+<p>Inline with title: <a href="http://google.com" title="Title">Google images</a></p>
 
-<p>Search on <a href='http://www.gogole.com'>http://www.gogole.com</a> or <a href='http://Here.com'>http://Here.com</a> or ask <a href='mailto:bill@google.com'>&#098;&#105;&#108;&#108;&#064;&#103;&#111;&#111;&#103;&#108;&#101;&#046;&#099;&#111;&#109;</a> or you might ask bill@google.com.</p>
+<p>Search on <a href="http://www.gogole.com">http://www.gogole.com</a> or <a href="http://Here.com">http://Here.com</a> or ask <a href="mailto:bill@google.com">&#098;&#105;&#108;&#108;&#064;&#103;&#111;&#111;&#103;&#108;&#101;&#046;&#099;&#111;&#109;</a> or you might ask bill@google.com.</p>
 
-<p>If all else fails, ask <a href='http://www.google.com'>Google</a></p>
+<p>If all else fails, ask <a href="http://www.google.com">Google</a></p>
 
-<p>And now <a href='http://images.google.com' title='Google images'>reference-style link ID with spaces</a></p>
+<p>And now <a href="http://images.google.com" title="Google images">reference-style link ID with spaces</a></p>
+
+<p>And now <a href="http://www.google.com" title="Google search">reference-style link ID (without spaces)</a></p>
 *** Output of to_latex ***
 Search on \href{http://www.google.com}{Google}
 
@@ -124,6 +132,8 @@ Search on \href{http://www.gogole.com}{http\char58\char47\char47www\char46gogole
 If all else fails, ask \href{http://www.google.com}{Google}
 
 And now \href{http://images.google.com}{reference-style link ID with spaces}
+
+And now \href{http://www.google.com}{reference-style link ID (without spaces)}
 *** Output of to_md ***
 Search on Google
 
@@ -148,17 +158,8 @@ If all else fails, ask Google
 
 And now
 reference-style link ID with spaces
-*** Output of to_s ***
-Search on GoogleSearch on GoogleSearch on GoogleSearch on GoogleSearch on Google imagesInline: Google imagesInline with title: Google imagesInline with title: Google imagesSearch on  or  or ask  or you might ask bill@google.com.If all else fails, ask GoogleAnd now reference-style link ID with spaces
-*** EOF ***
-
-
-
-	OK!
 
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)
+And now
+reference-style link ID (without spaces)
+*** Output of to_s ***
+Search on GoogleSearch on GoogleSearch on GoogleSearch on GoogleSearch on Google imagesInline: Google imagesInline with title: Google imagesInline with title: Google imagesSearch on  or  or ask  or you might ask bill@google.com.If all else fails, ask GoogleAnd now reference-style link ID with spacesAnd now reference-style link ID (without spaces)

data/spec/block_docs/links2.md

@@ -0,0 +1,21 @@
+Write a comment here
+*** Parameters: ***
+{} # params 
+*** Markdown input: ***
+See [foo' bar][foo_bar]
+
+[foo_bar]: http://agorf.gr/
+
+
+*** Output of inspect ***
+md_el(:document,[ md_par([ "See ", md_link(["foo", md_entity("rsquo"), " bar"],"foo_bar")]),
+	md_ref_def("foo_bar", "http://agorf.gr/", {:title=>nil})
+],{},[])
+*** Output of to_html ***
+<p>See <a href="http://agorf.gr/">foo’ bar</a></p>
+*** Output of to_latex ***
+See \href{http://agorf.gr/}{foo' bar}
+*** Output of to_md ***
+See foo bar
+*** Output of to_s ***
+See foo bar

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

@@ -44,15 +44,3 @@ This is a blockquote inside a list
 item.
 *** Output of to_s ***
 A list item with a blockquote:This is a blockquote inside a list item.
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

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

@@ -9,13 +9,13 @@ Write a comment here
 *** Output of inspect ***
 md_el(:document,[
 	md_el(:ul,[
-		md_el(:li_span,[md_link(["Maruku"],"maruku"), ": good."],{:want_my_paragraph=>false},[])
+		md_el(:li,[md_link(["Maruku"],nil), ": good."],{:want_my_paragraph=>false},[])
 	],{},[]),
 	md_ref_def("maruku", "http://maruku.org/", {:title=>nil})
 ],{},[])
 *** Output of to_html ***
 <ul>
-<li><a href='http://maruku.org/'>Maruku</a>: good.</li>
+<li><a href="http://maruku.org/">Maruku</a>: good.</li>
 </ul>
 *** Output of to_latex ***
 \begin{itemize}%
@@ -26,15 +26,3 @@ md_el(:document,[
 -aruku: good.
 *** Output of to_s ***
 Maruku: good.
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

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

@@ -29,7 +29,7 @@ md_el(:document,[
 <li>
 <p>This is a list item with two paragraphs.</p>
 
-<p>This is the second paragraph in the list item. You&#8217;re only required to indent the first line. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</p>
+<p>This is the second paragraph in the list item. You’re only required to indent the first line. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</p>
 </li>
 
 <li>
@@ -40,7 +40,7 @@ md_el(:document,[
 \begin{itemize}%
 \item This is a list item with two paragraphs.
 
-This is the second paragraph in the list item. You'{}re only required to indent the first line. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
+This is the second paragraph in the list item. You're only required to indent the first line. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
 
 
 \item other
@@ -54,15 +54,3 @@ This is the second paragraph in the list item. Youre only required to indent the
 -ther
 *** Output of to_s ***
 This is a list item with two paragraphs.This is the second paragraph in the list item. Youre only required to indent the first line. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.other
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

data/spec/block_docs/list_multipara.md

@@ -0,0 +1,42 @@
+Lists with multiple paragraphs
+*** Parameters: ***
+{}
+*** Markdown input: ***
+*   A list item with a couple paragraphs,
+    each of which is indented.
+    
+    For example, this paragraph.
+
+*   Another list item
+*** Output of inspect ***
+md_el(:document, md_el(:ul, [
+	md_li([
+	  md_par("A list item with a couple paragraphs, each of which is indented."),
+	  md_par("For example, this paragraph.")
+  ], true),
+	md_li(md_par("Another list item"), false)
+]))
+*** Output of to_html ***
+<ul>
+<li>
+<p>A list item with a couple paragraphs, each of which is indented.</p>
+
+<p>For example, this paragraph.</p>
+</li>
+
+<li>
+<p>Another list item</p>
+</li>
+</ul>
+*** Output of to_latex ***
+\begin{itemize}%
+\item A list item with a couple paragraphs, each of which is indented.
+
+For example, this paragraph.
+
+
+\item Another list item
+
+
+
+\end{itemize}

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

@@ -37,19 +37,19 @@ sit amet, consectetuer adipiscing elit.
 *** Output of inspect ***
 md_el(:document,[
 	md_el(:ul,[
-		md_el(:li_span,[
+		md_el(:li,[
 			"Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus."
 		],{:want_my_paragraph=>false},[]),
-		md_el(:li_span,[
+		md_el(:li,[
 			"Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing."
 		],{:want_my_paragraph=>false},[]),
-		md_el(:li_span,[
+		md_el(:li,[
 			"Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing."
 		],{:want_my_paragraph=>false},[]),
-		md_el(:li_span,[
+		md_el(:li,[
 			"Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing."
 		],{:want_my_paragraph=>false},[]),
-		md_el(:li_span,[
+		md_el(:li,[
 			"Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing."
 		],{:want_my_paragraph=>false},[])
 	],{},[]),
@@ -111,7 +111,7 @@ md_el(:document,[
 <li>
 <p>This is a list item with two paragraphs.</p>
 
-<p>This is the second paragraph in the list item. You&#8217;re only required to indent the first line. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</p>
+<p>This is the second paragraph in the list item. You’re only required to indent the first line. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</p>
 </li>
 
 <li>
@@ -145,7 +145,7 @@ Ancora
 \begin{itemize}%
 \item This is a list item with two paragraphs.
 
-This is the second paragraph in the list item. You'{}re only required to indent the first line. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
+This is the second paragraph in the list item. You're only required to indent the first line. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
 
 
 \item Another item in the same list.
@@ -154,51 +154,50 @@ This is the second paragraph in the list item. You'{}re only required to indent
 
 \end{itemize}
 *** Output of to_md ***
--orem ipsum dolor sit amet,
+- Lorem ipsum dolor sit amet,
 consectetuer adipiscing elit.
 Aliquam hendrerit mi posuere
 lectus. Vestibulum enim wisi,
 viverra nec, fringilla in, laoreet
 vitae, risus.
--onec sit amet nisl. Aliquam semper
+- Donec sit amet nisl. Aliquam semper
 ipsum sit amet velit. Suspendisse
 id sem consectetuer libero luctus
 adipiscing.
--onec sit amet nisl. Aliquam semper
+- Donec sit amet nisl. Aliquam semper
 ipsum sit amet velit. Suspendisse
 id sem consectetuer libero luctus
 adipiscing.
--onec sit amet nisl. Aliquam semper
+- Donec sit amet nisl. Aliquam semper
 ipsum sit amet velit. Suspendisse
 id sem consectetuer libero luctus
 adipiscing.
--onec sit amet nisl. Aliquam semper
+- Donec sit amet nisl. Aliquam semper
 ipsum sit amet velit. Suspendisse
 id sem consectetuer libero luctus
 adipiscing.
 
 Ancora
 
--This is a list item with two paragraphs. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
+- 
+This is a list item with two
+paragraphs. Lorem ipsum dolor sit amet,
+consectetuer adipiscing elit. Aliquam
+hendrerit mi posuere lectus.
 ATTENZIONE!
--Suspendisse id sem consectetuer libero luctus adipiscing.
+- 
+Suspendisse id sem consectetuer libero
+luctus adipiscing.
 
 Ancora
 
--This is a list item with two paragraphs.
-This is the second paragraph in the list item. Youre only required to indent the first line. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
--nother item in the same list.
+- This is a list item with two
+paragraphs.
+  This is the second paragraph in the
+list item. You re only required to
+indent the first line. Lorem ipsum
+dolor sit amet, consectetuer adipiscing
+elit.
+- Another item in the same list.
 *** Output of to_s ***
 Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.AncoraThis is a list item with two paragraphs. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.ATTENZIONE!Suspendisse id sem consectetuer libero luctus adipiscing.AncoraThis is a list item with two paragraphs.This is the second paragraph in the list item. Youre only required to indent the first line. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Another item in the same list.
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)