maruku 0.6.1 → 0.7.0.beta1

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

@@ -33,12 +33,12 @@ Paragraph with header:
 ### header ###
 
 Paragraph with header on two lines:
-header
-------
+header 2
+--------
 
 
 Paragraph with html after
-<div></div>
+<div>Woo</div>
 
 Paragraph with html after, indented:
      <em>Emphasis</em>
@@ -70,8 +70,9 @@ md_el(:document,[
 	md_par(["Paragraph with header:"]),
 	md_el(:header,["header"],{:level=>3},[]),
 	md_par(["Paragraph with header on two lines:"]),
-	md_el(:header,["header"],{:level=>2},[]),
-	md_par(["Paragraph with html after ", md_html("<div></div>")]),
+	md_el(:header,["header 2"],{:level=>2},[]),
+	md_par("Paragraph with html after"),
+  md_html("<div>Woo</div>"),
 	md_par([
 		"Paragraph with html after, indented: ",
 		md_html("<em>Emphasis</em>")
@@ -114,19 +115,20 @@ md_el(:document,[
 
 <p>Paragraph with header:</p>
 
-<h3 id='header'>header</h3>
+<h3 id="header">header</h3>
 
 <p>Paragraph with header on two lines:</p>
 
-<h2 id='header'>header</h2>
+<h2 id="header_2">header 2</h2>
 
-<p>Paragraph with html after <div /></p>
+<p>Paragraph with html after</p>
+<div>Woo</div>
 
 <p>Paragraph with html after, indented: <em>Emphasis</em></p>
 
 <p>Paragraph with html after, indented: <em>Emphasis</em> <em>tralla</em> <em>Emph</em></p>
 
-<p>Paragraph with html after, indented: <em>Emphasis *tralla* Emph</em></p>
+<p>Paragraph with html after, indented: <em>Emphasis <em>tralla</em> Emph</em></p>
 *** Output of to_latex ***
 Paragraph, list with no space: * ciao
 
@@ -157,9 +159,9 @@ Paragraph with header:
 
 Paragraph with header on two lines:
 
-\hypertarget{header}{}\subsection*{{header}}\label{header}
+\hypertarget{header_2}{}\subsection*{{header 2}}\label{header_2}
 
-Paragraph with html after 
+Paragraph with html after
 
 Paragraph with html after, indented: 
 
@@ -194,9 +196,13 @@ Quoted
 
 Paragraph with header:
 
-headerParagraph with header on two lines:
+### header
+
+Paragraph with header on two lines:
+
+## header
 
-headerParagraph with html after
+Paragraph with html after
 
 Paragraph with html after, indented:
 
@@ -206,15 +212,3 @@ tralla
 Paragraph with html after, indented:
 *** Output of to_s ***
 Paragraph, list with no space: * ciaoParagraph, list with 1 space: * ciaoParagraph, list with 3 space: * ciaoParagraph, list with 4 spaces: * ciaoParagraph, list with 1 tab: * ciaoParagraph (1 space after), list with no space: * ciaoParagraph (2 spaces after), list with no space:* ciaoParagraph (3 spaces after), list with no space: * ciaoParagraph with block quote:QuotedParagraph with header:headerParagraph with header on two lines:headerParagraph with html after Paragraph with html after, indented: Paragraph with html after, indented:  tralla Paragraph with html after, indented:
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

data/spec/block_docs/lists_blank.md

@@ -0,0 +1,35 @@
+Lists should allow newlines between items.
+*** Parameters: ***
+{}
+*** Markdown input: ***
+*   A list item
+
+
+
+*   Another list item
+*** Output of inspect ***
+md_el(:document,[
+	md_el(:ul,[
+    md_li(md_par("A list item"), true),
+    md_li(md_par("Another list item"), false)
+	])
+])
+*** Output of to_html ***
+<ul>
+<li>
+<p>A list item</p>
+</li>
+<li>
+<p>Another list item</p>
+</li>
+</ul>
+*** Output of to_latex ***
+\begin{itemize}%
+\item A list item
+
+
+\item Another list item
+
+
+
+\end{itemize}

data/{tests/unittest/list3.md → spec/block_docs/lists_blockquote_code.md}

@@ -1,4 +1,4 @@
-Write a comment abouth the test here.
+Lists should be able to contain blockquotes and code.
 *** Parameters: ***
 {}
 *** Markdown input: ***
@@ -19,7 +19,7 @@ md_el(:document,[
 		],{:want_my_paragraph=>true},[]),
 		md_el(:li,[
 			md_par(["A list item with a code block:"]),
-			md_el(:code,[],{:raw_code=>"<code goes here>"},[])
+			md_el(:code,[],{:raw_code=>"<code goes here>", :lang=>nil},[])
 		],{:want_my_paragraph=>true},[])
 	],{},[])
 ],{},[])
@@ -62,15 +62,3 @@ item.
 - list item with a code block:
 *** Output of to_s ***
 A list item with a blockquote:This is a blockquote inside a list item.A list item with a code block:
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

data/{tests/unittest/list4.md → spec/block_docs/lists_need_blank_line.md}

@@ -1,39 +1,59 @@
-Write a comment abouth the test here.
+PENDING - list syntax needs a newline before it to be a valid list!
 *** Parameters: ***
 {}
 *** Markdown input: ***
+This is not a list:
+* one
+* two
+
 This is a list:
+
 * one
 * two
 
-This is not a list:
+This is a list:
+
 * one
 ciao
 
 This is a list:
+
 1. one
 1. two
 
-This is not a list:
+This is a list:
+
 1987. one
 ciao
 
+
 *** Output of inspect ***
 md_el(:document,[
+	md_par(["This is not a list:\n* one\n* two"]),
 	md_par(["This is a list:"]),
 	md_el(:ul,[
 		md_el(:li_span,["one"],{:want_my_paragraph=>false},[]),
 		md_el(:li_span,["two"],{:want_my_paragraph=>false},[])
 	],{},[]),
-	md_par(["This is not a list: * one ciao"]),
+	md_par(["This is a list:"]),
+  md_el(:ul,[
+		md_el(:li_span,["one ciao"],{:want_my_paragraph=>false},[])
+	],{},[]),
 	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_par(["This is not a list: 1987. one ciao"])
+  md_par(["This is a list:"]),
+	md_el(:ol,[
+    md_el(:li_span,["one ciao"],{:want_my_paragraph=>false},[])
+  ],{},[])
 ],{},[])
 *** Output of to_html ***
+<p>This is not a list:
+* one
+* two</p>
+
 <p>This is a list:</p>
 
 <ul>
@@ -42,7 +62,11 @@ md_el(:document,[
 <li>two</li>
 </ul>
 
-<p>This is not a list: * one ciao</p>
+<p>This is a list:</p>
+
+<ul>
+<li>one ciao</li>
+</ul>
 
 <p>This is a list:</p>
 
@@ -52,8 +76,16 @@ md_el(:document,[
 <li>two</li>
 </ol>
 
-<p>This is not a list: 1987. one ciao</p>
+<p>This is a list:</p>
+
+<ol>
+<li>one ciao</li>
+</ol>
 *** Output of to_latex ***
+This is not a list:
+* one
+* two
+
 This is a list:
 
 \begin{itemize}%
@@ -61,8 +93,12 @@ This is a list:
 \item two
 
 \end{itemize}
-This is not a list: * one ciao
+This is a list:
+
+\begin{itemize}%
+\item one ciao
 
+\end{itemize}
 This is a list:
 
 \begin{enumerate}%
@@ -70,7 +106,12 @@ This is a list:
 \item two
 
 \end{enumerate}
-This is not a list: 1987. one ciao
+This is a list:
+
+\begin{enumerate}%
+\item one ciao
+
+\end{enumerate}
 *** Output of to_md ***
 This is a list:
 
@@ -87,15 +128,3 @@ This is a list:
 This is not a list: 1987. one ciao
 *** Output of to_s ***
 This is a list:onetwoThis is not a list: * one ciaoThis is a list:onetwoThis is not a list: 1987. one ciao
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

data/spec/block_docs/lists_nested.md

@@ -0,0 +1,44 @@
+Nesting lists.
+*** Parameters: ***
+{} # params 
+*** Markdown input: ***
+*   A list item
+    * Foo
+    * Bar
+      * Bax
+      * Bap
+*   Another list item
+*** Output of inspect ***
+md_el(:document, md_el(:ul, [
+	md_li([
+	"A list item",
+	md_el(:ul, [
+	md_li("Foo", false),
+	md_li([
+	"Bar",
+	md_el(:ul, [
+	md_li("Bax", false),
+	md_li("Bap", false)
+])
+], false)
+])
+], false),
+	md_li("Another list item", false)
+]))
+*** Output of to_html ***
+<ul>
+<li>A list item
+<ul>
+<li>Foo</li>
+<li>Bar
+<ul>
+<li>Bax</li>
+
+<li>Bap</li>
+</ul>
+</li>
+</ul>
+</li>
+
+<li>Another list item</li>
+</ul>

data/spec/block_docs/lists_nested_blankline.md

@@ -0,0 +1,28 @@
+PENDING - Nesting lists should handle newlines inbetween list items.
+*** Parameters: ***
+{} # params 
+*** Markdown input: ***
+* Bar
+  * Bax
+
+  * boo
+*** Output of inspect ***
+md_el(:document, md_el(:ul, [
+	md_li([
+	  "Bar",
+	  md_el(:ul, [
+	    md_li(md_par("Bax"), false),
+	    md_li(md_par("Bar"), false)
+          ], {}, [])
+       ],{},[])
+],{},[]))
+*** Output of to_html ***
+<ul>
+<li>Bar
+
+<ul>
+<li><p>Bax</p></li>
+<li><p>boo</p></li>
+</ul>
+</li>
+</ul>

data/spec/block_docs/lists_nested_deep.md

@@ -0,0 +1,43 @@
+Lists should be nestable to arbitrary depth.
+*** Parameters: ***
+{}
+*** Markdown input: ***
+* Space
+  * Space
+    * Space
+      * Space
+        * Space
+
+*** Output of inspect ***
+md_el(:document, [
+	md_el(:ul, md_li([
+	"Space",
+	md_el(:ul, md_li([
+	"Space",
+	md_el(:ul, md_li([
+	"Space",
+	md_el(:ul, md_li(["Space", md_el(:ul, md_li("Space", false))], false))
+], false))
+], false))
+], false))
+])
+*** Output of to_html ***
+<ul>
+<li>Space
+<ul>
+<li>Space
+<ul>
+<li>Space
+<ul>
+<li>Space
+<ul>
+<li>Space</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>

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

@@ -1,4 +1,4 @@
-Write a comment abouth the test here.
+PENDING - Maruku should handle weirdly indented lists and paragraphs within lists.
 *** Parameters: ***
 {}
 *** Markdown input: ***
@@ -44,19 +44,19 @@ sit amet, consectetuer adipiscing elit.
 *** Output of inspect ***
 md_el(:document,[
 	md_el(:ol,[
-		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},[])
 	],{},[]),
@@ -68,16 +68,15 @@ md_el(:document,[
 			]),
 			md_par(["ATTENZIONE!"]),
 			md_el(:ul,[
-				md_el(:li,[md_par(["Uno"])],{:want_my_paragraph=>false},[]),
-				md_el(:li,[
-					md_par(["Due"]),
+				md_el(:li,["Uno"],{:want_my_paragraph=>false},[]),
+				md_el(:li,["Due",
 					md_el(:ol,[
-						md_el(:li_span,["tre"],{:want_my_paragraph=>false},[]),
-						md_el(:li_span,["tre"],{:want_my_paragraph=>false},[]),
-						md_el(:li_span,["tre"],{:want_my_paragraph=>false},[])
-					],{},[])
-				],{:want_my_paragraph=>true},[]),
-				md_el(:li,[md_par(["Due"])],{:want_my_paragraph=>false},[])
+						md_el(:li,["tre"],{:want_my_paragraph=>false},[]),
+						md_el(:li,["tre"],{:want_my_paragraph=>false},[]),
+						md_el(:li,["tre"],{:want_my_paragraph=>false},[])
+					],{:want_my_paragraph=>false},[])
+				],{},[]),
+				md_el(:li,["Due"],{:want_my_paragraph=>false},[])
 			],{},[])
 		],{:want_my_paragraph=>true},[]),
 		md_el(:li,[
@@ -119,13 +118,9 @@ md_el(:document,[
 <p>ATTENZIONE!</p>
 
 <ul>
-<li>
-<p>Uno</p>
-</li>
-
-<li>
-<p>Due</p>
+<li>Uno</li>
 
+<li>Due
 <ol>
 <li>tre</li>
 
@@ -135,9 +130,7 @@ md_el(:document,[
 </ol>
 </li>
 
-<li>
-<p>Due</p>
-</li>
+<li>Due</li>
 </ul>
 </li>
 
@@ -177,11 +170,7 @@ ATTENZIONE!
 
 \begin{itemize}%
 \item Uno
-
-
-\item Due
-
-\begin{enumerate}%
+\item Due\begin{enumerate}%
 \item tre
 \item tre
 \item tre
@@ -190,8 +179,6 @@ ATTENZIONE!
 
 \item Due
 
-
-
 \end{itemize}
 
 \item Suspendisse id sem consectetuer libero luctus adipiscing.
@@ -204,7 +191,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.
@@ -239,36 +226,32 @@ This is the second paragraph in the list item. You'{}re only required to indent
 Ancora
 
 1.  
-    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!
-    Uno
-    
-    Due
+    - Uno
+    - Due
     
     1.  tre
     2.  tre
     3.  tre
-    
-    Due
+    - Due
 2.  
-    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!UnoDuetretretreDueSuspendisse 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)