maruku 0.4.0 → 0.4.1

data/tests/unittest/inline_html.md

@@ -88,9 +88,7 @@ md_el(:document,[
 <p>Result alone:</p>
 <img src='http://jigsaw.w3.org/css-validator/images/vcss' />
 <p>Without closing:</p>
-<img src='http://jigsaw.w3.org/css-validator/images/vcss' /><div>
-<p>This is <em>true</em> markdown text (paragraph)</p>
-<p>This is <em>true</em> markdown text (no paragraph)</p><p>
+<img src='http://jigsaw.w3.org/css-validator/images/vcss' /><div><p>This is <em>true</em> markdown text (paragraph)</p><p>This is <em>true</em> markdown text (no paragraph)</p><p>
 <p>This is <em>true</em> markdown text (block paragraph)</p>
 </p></div><table>
 <tr>
@@ -112,21 +110,21 @@ Input:
 
 \begin{verbatim}<em>Emphasis</em>
 \end{verbatim}
-Result: {\bf Raw HTML removed in latex version }
+Result: 
 
 Input:
 
 \begin{verbatim}<img src="http://jigsaw.w3.org/css-validator/images/vcss"/>
 \end{verbatim}
-Result on span: {\bf Raw HTML removed in latex version }
+Result on span: 
 
 Result alone:
 
-{\bf Raw HTML removed in latex version }Without closing:
+Without closing:
+
+The following is invalid HTML, and will generate an error:
 
-{\bf Raw HTML removed in latex version }{\bf Raw HTML removed in latex version }{\bf Raw HTML removed in latex version }The following is invalid HTML, and will generate an error:
 
-{\bf Raw HTML removed in latex version }{\bf Raw HTML removed in latex version }
 *** Output of to_md ***
 Input:
 
@@ -206,27 +204,7 @@ Input:Result: Input:Result on span: Result alone:Without closing:The following i
 </table>
 
 *** Output of Markdown.pl (parsed) ***
-Error: #<REXML::ParseException: #<REXML::ParseException: Missing end tag for 'img' (got "p")
-Line: 
-Position: 
-Last 80 unconsumed characters:
-  <div markdown="1">     This is *true* markdown text (paragraph)      <p markdow>
-/Volumes/Alter/Ruby/local/lib/ruby/1.8/rexml/parsers/baseparser.rb:315:in `pull'
-/Volumes/Alter/Ruby/local/lib/ruby/1.8/rexml/parsers/treeparser.rb:21:in `parse'
-/Volumes/Alter/Ruby/local/lib/ruby/1.8/rexml/document.rb:190:in `build'
-/Volumes/Alter/Ruby/local/lib/ruby/1.8/rexml/document.rb:45:in `initialize'
-bin/marutest:171:in `new'
-bin/marutest:171:in `run_test'
-bin/marutest:235:in `marutest'
-bin/marutest:233:in `each'
-bin/marutest:233:in `marutest'
-bin/marutest:303
-...
-Missing end tag for 'img' (got "p")
-Line: 
-Position: 
-Last 80 unconsumed characters:
-  <div markdown="1">     This is *true* markdown text (paragraph)      <p markdow
+Error: #<REXML::ParseException: Missing end tag for 'img' (got "p")
 Line: 
 Position: 
 Last 80 unconsumed characters:

data/tests/unittest/inline_html2.md

@@ -14,7 +14,7 @@ md_el(:document,[
 <p>Test <strong>bold</strong></p>
 </div><p>Test <strong>bold</strong></p>
 *** Output of to_latex ***
-{\bf Raw HTML removed in latex version }{\bf Raw HTML removed in latex version }
+
 *** Output of to_md ***
 
 *** Output of to_s ***
@@ -34,5 +34,5 @@ md_el(:document,[
 
 *** Output of Markdown.pl (parsed) ***
 <div markdown='1'>Test **bold**</div
-    ><p markdown='1'>Test **bold**</p
-  >
+   ><p markdown='1'>Test **bold**</p
+ >

data/tests/unittest/links.md

@@ -107,15 +107,15 @@ Search on \href{http://www.google.com}{Google}
 
 Search on \href{http://images.google.com}{Google images}
 
-Inline: 
+Inline: \href{http://google.com}{Google images}
 
-Inline with title: 
+Inline with title: \href{http://google.com}{Google images}
 
-Inline with title: 
+Inline with title: \href{http://google.com}{Google images}
 
-Search on \href{http://www.gogole.com}{http://www.gogole.com} or \href{http://Here.com}{http://Here.com} or ask \href{mailto:bill@google.com}{\char98\char105\char108\char108\char64\char103\char111\char111\char103\char108\char101\char46\char99\char111\char109} or you might ask bill@google.com.
+Search on  or  or ask \href{mailto:bill@google.com}{\char98\char105\char108\char108\char64\char103\char111\char111\char103\char108\char101\char46\char99\char111\char109} or you might ask bill@google.com.
 
-If all else fails, ask 
+If all else fails, ask \href{http://www.google.com}{Google}
 
 
 *** Output of to_md ***
@@ -168,7 +168,7 @@ Search on GoogleSearch on GoogleSearch on GoogleSearch on GoogleSearch on Google
 
 <p>Inline with title: <a href="http://google.com  "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="&#109;&#x61;&#105;&#x6C;&#x74;o:&#98;&#x69;&#108;l&#64;&#x67;&#111;&#x6F;&#103;&#x6C;&#101;&#46;&#x63;&#111;m">&#98;&#x69;&#108;l&#64;&#x67;&#111;&#x6F;&#103;&#x6C;&#101;&#46;&#x63;&#111;m</a>
+<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="&#109;&#97;&#105;&#x6C;&#x74;&#x6F;:&#x62;&#105;&#108;&#108;&#64;&#x67;&#111;&#111;&#103;&#x6C;&#x65;&#x2E;&#99;&#111;&#109;">&#x62;&#105;&#108;&#108;&#64;&#x67;&#111;&#111;&#103;&#x6C;&#x65;&#x2E;&#99;&#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>
@@ -176,27 +176,7 @@ or you might ask bill@google.com.</p>
 <p>[google2]: http://www.google.com 'Single quotes'</p>
 
 *** Output of Markdown.pl (parsed) ***
-Error: #<REXML::ParseException: #<REXML::ParseException: Missing end tag for 'p' (got "div")
-Line: 
-Position: 
-Last 80 unconsumed characters:
->
-/Volumes/Alter/Ruby/local/lib/ruby/1.8/rexml/parsers/baseparser.rb:315:in `pull'
-/Volumes/Alter/Ruby/local/lib/ruby/1.8/rexml/parsers/treeparser.rb:21:in `parse'
-/Volumes/Alter/Ruby/local/lib/ruby/1.8/rexml/document.rb:190:in `build'
-/Volumes/Alter/Ruby/local/lib/ruby/1.8/rexml/document.rb:45:in `initialize'
-bin/marutest:171:in `new'
-bin/marutest:171:in `run_test'
-bin/marutest:235:in `marutest'
-bin/marutest:233:in `each'
-bin/marutest:233:in `marutest'
-bin/marutest:303
-...
-Missing end tag for 'p' (got "div")
-Line: 
-Position: 
-Last 80 unconsumed characters:
-
+Error: #<REXML::ParseException: Missing end tag for 'p' (got "div")
 Line: 
 Position: 
 Last 80 unconsumed characters:

data/tests/unittest/list1.md

@@ -70,14 +70,15 @@ A list item with a blockquote:This is a blockquote inside a list item.
 *** Output of Markdown.pl (parsed) ***
 <ul>
 <li
-        ><p>A list item with a blockquote:</p
-        >
+       ><p>A list item with a blockquote:</p
+       >
+
 <blockquote>
- <p>This is a blockquote
- inside a list item.</p
-          >
+  <p>This is a blockquote
+  inside a list item.</p
+         >
 </blockquote
-      ></li
-      >
+     ></li
+     >
 </ul
-  >
+ >

data/tests/unittest/list2.md

@@ -16,7 +16,9 @@ md_el(:document,[
 		md_el(:li,[
 			md_par(["This is a list item with two paragraphs."]),
 			md_par([
-				"This is the second paragraph in the list item. You're only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit"
+				"This is the second paragraph in the list item. You",
+				md_entity("rsquo"),
+				"re only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit"
 			])
 		],{:want_my_paragraph=>true},[]),
 		md_el(:li,[md_par(["other"])],{:want_my_paragraph=>false},[])
@@ -28,7 +30,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&apos;re only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit</p>
+<p>This is the second paragraph in the list item. You&rsquo;re only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit</p>
 </li>
 
 <li>
@@ -51,12 +53,12 @@ This is the second paragraph in the list item. You're only required to indent th
 
 *** Output of to_md ***
 -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 dolo sit amet, consectetuer adipiscing elit
+This is the second paragraph in the list item. Youre only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit
 -ther
 
 
 *** Output of to_s ***
-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 dolo sit amet, consectetuer adipiscing elitother
+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 dolo sit amet, consectetuer adipiscing elitother
 *** EOF ***
 
 
@@ -78,16 +80,17 @@ sit amet, consectetuer adipiscing elit.</p></li>
 *** Output of Markdown.pl (parsed) ***
 <ul>
 <li
-        ><p>This is a list item with two paragraphs.</p
-        >
+       ><p>This is a list item with two paragraphs.</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
+     >
 <li
-        ><p>other</p
-      ></li
-      >
+       ><p>other</p
+     ></li
+     >
 </ul
-  >
+ >

data/tests/unittest/list3.md

@@ -90,23 +90,25 @@ A list item with a blockquote:This is a blockquote inside a list item.A list ite
 *** Output of Markdown.pl (parsed) ***
 <ul>
 <li
-        ><p>A list item with a blockquote:</p
-        >
+       ><p>A list item with a blockquote:</p
+       >
+
 <blockquote>
- <p>This is a blockquote
- inside a list item.</p
-          >
+  <p>This is a blockquote
+  inside a list item.</p
+         >
 </blockquote
-      ></li
-      >
+     ></li
+     >
 <li
-        ><p>A list item with a code block:</p
-        >
+       ><p>A list item with a code block:</p
+       >
+
 <pre
-          ><code>&lt;code goes here&gt;
+         ><code>&lt;code goes here&gt;
 </code
-        ></pre
-      ></li
-      >
+       ></pre
+     ></li
+     >
 </ul
-  >
+ >

data/tests/unittest/list4.md

@@ -122,13 +122,13 @@ ciao</p>
 <p>This is a list:
 * one
 * two</p
-    ><p>This is not a list:
+   ><p>This is not a list:
 * one
 ciao</p
-    ><p>This is a list:
+   ><p>This is a list:
 1. one
 1. two</p
-    ><p>This is not a list:
+   ><p>This is not a list:
 1987. one
 ciao</p
-  >
+ >

data/tests/unittest/lists.md

@@ -70,7 +70,9 @@ md_el(:document,[
 		md_el(:li,[
 			md_par(["This is a list item with two paragraphs."]),
 			md_par([
-				"This is the second paragraph in the list item. You're only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit"
+				"This is the second paragraph in the list item. You",
+				md_entity("rsquo"),
+				"re only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit"
 			])
 		],{:want_my_paragraph=>true},[]),
 		md_el(:li,[md_par(["Another item in the same list."])],{:want_my_paragraph=>false},[])
@@ -110,7 +112,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&apos;re only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit</p>
+<p>This is the second paragraph in the list item. You&rsquo;re only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit</p>
 </li>
 
 <li>
@@ -187,12 +189,12 @@ ATTENZIONE!
 Ancora
 
 -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 dolo sit amet, consectetuer adipiscing elit
+This is the second paragraph in the list item. Youre only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit
 -nother 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 adipiscingDonec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscingDonec 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. You're only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elitAnother item in the same list.
+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 adipiscingDonec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscingDonec 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 dolo sit amet, consectetuer adipiscing elitAnother item in the same list.
 *** EOF ***
 
 
@@ -245,51 +247,53 @@ sit amet, consectetuer adipiscing elit.</p></li>
 <li>Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
 Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,
 viverra nec, fringilla in, laoreet vitae, risus.</li
-      >
+     >
 <li>Donec sit amet nisl. Aliquam semper ipsum sit amet velit.
 Suspendisse id sem consectetuer libero luctus adipiscing.</li
-      >
+     >
 <li>Donec sit amet nisl. Aliquam semper ipsum sit amet velit.
 Suspendisse id sem consectetuer libero luctus adipiscing.
 <ul>
 <li>Donec sit amet nisl. Aliquam semper ipsum sit amet velit.
 Suspendisse id sem consectetuer libero luctus adipiscing.</li
-          >
+         >
 <li>Donec sit amet nisl. Aliquam semper ipsum sit amet velit.
 Suspendisse id sem consectetuer libero luctus adipiscing.</li
-          >
+         >
 </ul
-      ></li
-      >
+     ></li
+     >
 </ul
-    ><p>Ancora</p
-    ><ul>
+   ><p>Ancora</p
+   ><ul>
 <li
-        ><p>This is a list item with two paragraphs. Lorem ipsum dolor
+       ><p>This is a list item with two paragraphs. Lorem ipsum dolor
 sit amet, consectetuer adipiscing elit. Aliquam hendrerit
 mi posuere lectus.</p
-        >
+       >
+
 <p>ATTENZIONE!</p
-      ></li
-      >
+     ></li
+     >
 <li
-        ><p>Suspendisse id sem consectetuer libero luctus adipiscing.</p
-      ></li
-      >
+       ><p>Suspendisse id sem consectetuer libero luctus adipiscing.</p
+     ></li
+     >
 </ul
-    ><p>Ancora</p
-    ><ul>
+   ><p>Ancora</p
+   ><ul>
 <li
-        ><p>This is a list item with two paragraphs.</p
-        >
+       ><p>This is a list item with two paragraphs.</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
+     >
 <li
-        ><p>Another item in the same list.</p
-      ></li
-      >
+       ><p>Another item in the same list.</p
+     ></li
+     >
 </ul
-  >
+ >

data/tests/unittest/lists_after_paragraph.md

@@ -164,11 +164,11 @@ Paragraph with header on two lines:
 
 Paragraph with html after
 
-{\bf Raw HTML removed in latex version }Paragraph with html after, indented: {\bf Raw HTML removed in latex version }
+Paragraph with html after, indented: 
 
-Paragraph with html after, indented: {\bf Raw HTML removed in latex version } {\em tralla} {\bf Raw HTML removed in latex version }
+Paragraph with html after, indented:  {\em tralla} 
 
-Paragraph with html after, indented: {\bf Raw HTML removed in latex version }
+Paragraph with html after, indented: 
 
 
 *** Output of to_md ***
@@ -274,41 +274,41 @@ Paragraph, list with no space: * ciaoParagraph, list with 1 space: * ciaoParagra
 *** Output of Markdown.pl (parsed) ***
 <p>Paragraph, list with no space:
 * ciao</p
-    ><p>Paragraph, list with 1 space:
+   ><p>Paragraph, list with 1 space:
  * ciao</p
-    ><p>Paragraph, list with 3 space:
- * ciao</p
-    ><p>Paragraph, list with 4 spaces:
- * ciao</p
-    ><p>Paragraph, list with 1 tab:
- * ciao</p
-    ><p>Paragraph (1 space after), list with no space: 
+   ><p>Paragraph, list with 3 space:
+   * ciao</p
+   ><p>Paragraph, list with 4 spaces:
+    * ciao</p
+   ><p>Paragraph, list with 1 tab:
+    * ciao</p
+   ><p>Paragraph (1 space after), list with no space: 
 * ciao</p
-    ><p>Paragraph (2 spaces after), list with no space: <br
-      />
+   ><p>Paragraph (2 spaces after), list with no space: <br/
+     >
 * ciao</p
-    ><p>Paragraph (3 spaces after), list with no space: <br
-      />
+   ><p>Paragraph (3 spaces after), list with no space: <br/
+     >
 * ciao</p
-    ><p>Paragraph with block quote:</p
-    ><blockquote>
- <p>Quoted</p
-      >
+   ><p>Paragraph with block quote:</p
+   ><blockquote>
+  <p>Quoted</p
+     >
 </blockquote
-    ><p>Paragraph with header:</p
-    ><h3>header</h3
-    ><p>Paragraph with header on two lines:</p
-    ><h2>header</h2
-    ><p>Paragraph with html after</p
-    ><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 <em>tralla</em
-        > Emph</em
-    ></p
-  >
+   ><p>Paragraph with header:</p
+   ><h3>header</h3
+   ><p>Paragraph with header on two lines:</p
+   ><h2>header</h2
+   ><p>Paragraph with html after</p
+   ><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 <em>tralla</em
+       > Emph</em
+   ></p
+ >