maruku 0.6.0 → 0.7.3

data/spec/block_docs/lists6.md

@@ -0,0 +1,88 @@
+Maruku improperly wraps list elements in paragraphs and doesn't handle nested lists right.
+*** Parameters: ***
+{}
+*** Markdown input: ***
+Here's another:
+
+1. First
+2. Second:
+	* Fee
+	* Fie
+	* Foe
+3. Third
+
+Same thing but with paragraphs:
+
+1. First
+
+2. Second:
+	* Fee
+	* Fie
+	* Foe
+
+3. Third
+
+*** Output of inspect ***
+md_el(:document,[
+ 	md_par(["Here", md_entity("rsquo"), "s another:"]),
+ 	md_el(:ol,[
+   	md_el(:li,["First"],{:want_my_paragraph=>false},[]),
+   	md_el(:li,[
+   	  "Second:",
+   	  md_el(:ul,[
+   	    md_el(:li,["Fee"],{:want_my_paragraph=>false},[]),
+ 	      md_el(:li,["Fie"],{:want_my_paragraph=>false},[]),
+ 	      md_el(:li,["Foe"],{:want_my_paragraph=>false},[])
+      ],{},[])
+    ],{:want_my_paragraph=>false},[]),
+ 	  md_el(:li,["Third"],{:want_my_paragraph=>false},[])
+  ],{},[]),
+ 	md_par(["Same thing but with paragraphs:"]),
+ 	md_el(:ol,[
+ 	  md_el(:li,[md_par("First")],{:want_my_paragraph=>true},[]),
+ 	  md_el(:li,[
+ 	    md_par("Second:"),
+ 	    md_el(:ul,[
+ 	      md_el(:li,["Fee"],{:want_my_paragraph=>false},[]),
+ 	      md_el(:li,["Fie"],{:want_my_paragraph=>false},[]),
+ 	      md_el(:li,["Foe"],{:want_my_paragraph=>false},[])
+      ],{},[])
+      ],{:want_my_paragraph=>true},[]),
+ 	  md_el(:li,md_par("Third"),{:want_my_paragraph=>false},[])
+  ],{},[])
+],{},[])
+*** Output of to_html ***
+<p>Here&#8217;s another:</p>
+
+<ol>
+<li>First</li>
+<li>Second:
+<ul>
+<li>Fee</li>
+<li>Fie</li>
+<li>Foe</li>
+</ul></li>
+<li>Third</li>
+</ol>
+
+<p>Same thing but with paragraphs:</p>
+
+<ol>
+<li><p>First</p></li>
+<li><p>Second:</p>
+
+<ul>
+<li>Fee</li>
+
+<li>Fie</li>
+
+<li>Foe</li>
+</ul></li>
+<li><p>Third</p></li>
+</ol>
+*** Output of to_latex ***
+
+*** Output of to_md ***
+
+*** Output of to_s ***
+

data/spec/block_docs/lists7b.md

@@ -0,0 +1,58 @@
+Test case given by Scott.
+
+http://rubyforge.org/tracker/index.php?func=detail&aid=8862&group_id=2795&atid=10735
+
+a should not be indented.
+
+*** Parameters: ***
+{} # params 
+*** Markdown input: ***
+* a
+  * a1
+  * a2
+* b
+
+
+*** Output of inspect ***
+md_el(:document,[
+	md_el(:ul,[
+		md_el(:li,[
+			"a",
+			md_el(:ul,[
+				md_el(:li,["a1"],{:want_my_paragraph=>false},[]),
+				md_el(:li,["a2"],{:want_my_paragraph=>false},[])
+			],{},[])
+		],{:want_my_paragraph=>false},[]),
+		md_el(:li,["b"],{:want_my_paragraph=>false},[])
+	],{},[])
+],{},[])
+*** Output of to_html ***
+<ul>
+<li>a
+<ul>
+<li>a1</li>
+
+<li>a2</li>
+</ul>
+</li>
+
+<li>b</li>
+</ul>
+
+*** Output of to_latex ***
+\begin{itemize}%
+\item a\begin{itemize}%
+\item a1
+\item a2
+
+\end{itemize}
+
+\item b
+
+\end{itemize}
+*** Output of to_md ***
+-* a1
+* a2
+-
+*** Output of to_s ***
+aa1a2b

data/spec/block_docs/lists9.md

@@ -0,0 +1,53 @@
+Maruku should not unnecessarily wrap <li>'s in <p>
+*** Parameters: ***
+{} # params 
+*** Markdown input: ***
+- Due
+  1. tre
+  1. tre
+  1. tre
+- Due
+*** Output of inspect ***
+md_el(:document,[
+	md_el(:ul,[
+		md_el(:li,[
+			"Due",
+			md_el(:ol,[
+				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},[])
+	],{},[])
+],{},[])
+*** Output of to_html ***
+<ul>
+<li>Due
+<ol>
+<li>tre</li>
+<li>tre</li>
+<li>tre</li>
+</ol></li>
+<li>Due</li>
+</ul>
+
+*** Output of to_latex ***
+\begin{itemize}%
+\item Due\begin{enumerate}%
+\item tre
+\item tre
+\item tre
+
+\end{enumerate}
+
+\item Due
+
+\end{itemize}
+*** Output of to_md ***
+-ue* tre
+* tre
+* tre
+-ue
+*** Output of to_s ***
+DuetretretreDue

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,47 @@
-Write a comment abouth the test here.
+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: * one * two"]),
+	md_par(["This is a list:"]),
+	md_el(:ul,[md_li("one", false), md_li("two", false)],{},[]),
 	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_el(:ul,md_li("one ciao", 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_el(:ol,[md_li("one", false), md_li("two", false)],{},[]),
+  md_par(["This is a list:"]),
+	md_el(:ol,md_li("one ciao", false),{},[])
 ],{},[])
 *** Output of to_html ***
+<p>This is not a list: * one * two</p>
+
 <p>This is a list:</p>
 
 <ul>
@@ -42,7 +50,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 +64,14 @@ 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 +79,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 +92,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 +114,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)