maruku 0.6.0 → 0.7.3

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)

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

@@ -10,7 +10,7 @@ List:
 md_el(:document,[
 	md_par(["List:"]),
 	md_el(:ul,[
-		md_el(:li_span,["\303\250", md_code("gcc")],{:want_my_paragraph=>false},[])
+		md_el(:li,["è", md_code("gcc")],{:want_my_paragraph=>false},[])
 	],{},[])
 ],{},[])
 *** Output of to_html ***
@@ -29,18 +29,6 @@ List:
 *** Output of to_md ***
 List:
 
--�
+- è`gcc`
 *** Output of to_s ***
 List:è
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

data/spec/block_docs/lists11.md

@@ -0,0 +1,23 @@
+Write a comment here
+*** Parameters: ***
+{} # params 
+*** Markdown input: ***
+- ένα
+
+*** Output of inspect ***
+md_el(:document,[
+	md_el(:ul,[md_el(:li,["ένα"],{:want_my_paragraph=>false},[])],{},[])
+],{},[])
+*** Output of to_html ***
+<ul>
+<li>ένα</li>
+</ul>
+*** Output of to_latex ***
+\begin{itemize}%
+\item ένα
+
+\end{itemize}
+*** Output of to_md ***
+- ένα
+*** Output of to_s ***
+ένα

data/spec/block_docs/lists12.md

@@ -0,0 +1,43 @@
+List Items with non alphanumeric content. https://github.com/bhollis/maruku/issues/1
+*** Parameters: ***
+{}
+*** Markdown input: ***
+* A
+* ?
+* B
+
+*** Output of inspect ***
+md_el(:document,[
+  md_el(:ul,[
+    md_el(:li,["A"],{:want_my_paragraph=>false},[]),
+    md_el(:li,["?"],{:want_my_paragraph=>false},[]),
+    md_el(:li,["B"],{:want_my_paragraph=>false},[])
+  ],{},[])
+],{},[])
+
+*** Output of to_html ***
+<ul>
+<li>A</li>
+
+<li>?</li>
+
+<li>B</li>
+</ul>
+
+*** Output of to_latex ***
+\begin{itemize}%
+\item A
+\item ?
+\item B
+
+\end{itemize}
+
+*** Output of to_md ***
+- A
+- ?
+- B
+
+*** Output of to_s ***
+A?B
+
+

data/spec/block_docs/lists13.md

@@ -0,0 +1,55 @@
+List Items with non alphanumeric content
+*** Parameters: ***
+{}
+*** Markdown input: ***
+* {: #foo} A
+* {: #bar } ?
+* {#fubar} B
+* {#fubar2 } C
+* {Not an IAL}
+
+*** Output of inspect ***
+md_el(:document,[
+  md_el(:ul,[
+   md_el(:li,["A"],{:want_my_paragraph=>false},[[:id, "foo"]]),
+   md_el(:li,["?"],{:want_my_paragraph=>false},[[:id, "bar"]]),
+   md_el(:li,["B"],{:want_my_paragraph=>false},[[:id, "fubar"]]),
+   md_el(:li,["C"],{:want_my_paragraph=>false},[[:id, "fubar2"]]),
+   md_el(:li,["{Not an IAL}"],{:want_my_paragraph=>false},[])
+   ],{},[]),
+],{},[])
+
+*** Output of to_html ***
+<ul>
+<li id="foo">A</li>
+
+<li id="bar">?</li>
+
+<li id="fubar">B</li>
+
+<li id="fubar2">C</li>
+
+<li>{Not an IAL}</li>
+</ul>
+
+*** Output of to_latex ***
+\begin{itemize}%
+\item A
+\item ?
+\item B
+\item C
+\item \{Not an IAL\}
+
+\end{itemize}
+
+*** Output of to_md ***
+- A
+- ?
+- B
+- C
+- {Not an IAL}
+
+*** Output of to_s ***
+A?BC{Not an IAL}
+
+

data/spec/block_docs/lists14.md

@@ -0,0 +1,61 @@
+Nested Lists with IALs
+*** Parameters: ***
+{}
+*** Markdown input: ***
+1. First
+   * {: #bar} A
+   * B
+2. {: .foo} Second
+   * C
+   * D
+3. {:fubar style="color:red"} Third
+
+*** Output of inspect ***
+md_el(:document, [
+  md_el(:ol, [
+    md_li(["First",
+      md_el(:ul, [
+        md_li("A", false, [[:id, "bar"]]),
+        md_li("B", false)
+      ], {}, [])
+     ], false),
+    md_li([
+      "Second",
+      md_el(:ul, [md_li("C", false), md_li("D", false)],{},[])
+     ], false, [[:class, "foo"]]),
+    md_li("Third", false, [[:ref, "fubar"],["style", "color:red"]])
+   ],{},[])
+],{},[])
+
+*** Output of to_html ***
+<ol>
+<li>First
+<ul>
+<li id="bar">A</li>
+<li>B</li>
+</ul>
+</li>
+<li class="foo">Second
+<ul>
+<li>C</li>
+<li>D</li>
+</ul></li>
+<li style="color:red">Third</li>
+</ol>
+*** Output of to_latex ***
+\begin{enumerate}%
+\item First\begin{itemize}%
+\item A
+\item B
+
+\end{itemize}
+
+\item Second\begin{itemize}%
+\item C
+\item D
+
+\end{itemize}
+
+\item Third
+
+\end{enumerate}

data/spec/block_docs/lists15.md

@@ -0,0 +1,36 @@
+IAL following list
+*** Parameters: ***
+{}
+*** Markdown input: ***
+* First item
+* {#foo} Second item
+* Third item
+{:fubar style="color:red"}
+
+Now, a paragraph.
+*** Output of inspect ***
+md_el(:document, [
+  md_el(:ul, [
+    md_li("First item", false),
+    md_li("Second item", false, [[:id, "foo"]]),
+    md_li("Third item", false)
+  ], {}, []),
+  md_par("Now, a paragraph.")
+],{},[])
+
+*** Output of to_html ***
+<ul style="color:red">
+<li>First item</li>
+<li id="foo">Second item</li>
+<li>Third item</li>
+</ul>
+
+<p>Now, a paragraph.</p>
+*** Output of to_latex ***
+\begin{itemize}%
+\item First item
+\item Second item
+\item Third item
+
+\end{itemize}
+Now, a paragraph.