maruku 0.6.0 → 0.7.3

data/spec/block_docs/div_without_newline.md

@@ -0,0 +1,16 @@
+Handle blocks of block HTML without a newline. https://github.com/bhollis/maruku/issues/123
+REXML won't clean up the HTML the way Nokogiri will...
+*** Parameters: ***
+{ }
+*** Markdown input: ***
+Heres some HTML.
+<div>
+Foo
+</div>
+*** Output of inspect ***
+
+*** Output of to_html ***
+<p>Heres some HTML.</p>
+<div>
+Foo
+</div>

data/{tests/unittest → spec/block_docs}/divs/div1.md

@@ -165,15 +165,3 @@ text
 text
 *** Output of to_s ***
 texttexttexttexttexttexttexttexttexttexttexttext
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

data/{tests/unittest → spec/block_docs}/divs/div2.md

@@ -19,15 +19,3 @@ ciao
 ciao
 *** Output of to_s ***
 ciao
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

data/{tests/unittest → spec/block_docs}/divs/div3_nest.md

@@ -1,4 +1,4 @@
-Write a comment here
+JRUBY PENDING - This is just crazy, and crashes JRuby with its crazy regexes
 *** Parameters: ***
 require 'maruku/ext/div'; {} # params 
 *** Markdown input: ***
@@ -20,12 +20,12 @@ md_el(:document,[
 	],{:label=>nil,:num=>nil,:type=>nil},[[:class, "warning"]])
 ],{},[])
 *** Output of to_html ***
-<div class='warning'>
+<div class="warning">
 <p>this is the last warning!</p>
 
 <p>please, go away!</p>
 
-<div class='menace'>
+<div class="menace">
 <p>or else terrible things will happen</p>
 </div>
 </div>
@@ -43,15 +43,3 @@ please, go away!
 or else terrible things will happen
 *** Output of to_s ***
 this is the last warning!please, go away!or else terrible things will happen
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

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

@@ -10,18 +10,6 @@ md_el(:document,[md_par([md_em(["Hello!"]), " how are ", md_strong(["you"]), "?"
 *** Output of to_latex ***
 \emph{Hello!} how are \textbf{you}?
 *** Output of to_md ***
-Hello!how are you?
+*Hello!* how are **you**?
 *** Output of to_s ***
 Hello! how are you?
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

data/spec/block_docs/email.md

@@ -0,0 +1,29 @@
+Write a comment abouth the test here.
+*** Parameters: ***
+{}
+*** Markdown input: ***
+
+
+This is an email address: <andrea@invalid.it>
+	
+Address: <andrea@invalid.it>
+*** Output of inspect ***
+md_el(:document,[
+        md_par(["This is an email address: ", md_email("andrea@invalid.it")]),
+        md_par(["Address: ", md_email("andrea@invalid.it")])
+],{},[])
+*** Output of to_html ***
+<p>This is an email address: <a href="mailto:andrea@invalid.it">&#097;&#110;&#100;&#114;&#101;&#097;&#064;&#105;&#110;&#118;&#097;&#108;&#105;&#100;&#046;&#105;&#116;</a></p>
+
+<p>Address: <a href="mailto:andrea@invalid.it">&#097;&#110;&#100;&#114;&#101;&#097;&#064;&#105;&#110;&#118;&#097;&#108;&#105;&#100;&#046;&#105;&#116;</a></p>
+*** Output of to_latex ***
+This is an email address: \href{mailto:andrea@invalid.it}{andrea\char64invalid\char46it}
+
+Address: \href{mailto:andrea@invalid.it}{andrea\char64invalid\char46it}
+*** Output of to_md ***
+This is an email address:
+<andrea@invalid.it>
+
+Address: <andrea@invalid.it>
+*** Output of to_s ***
+This is an email address: Address:

data/spec/block_docs/empty_cells.md

@@ -0,0 +1,31 @@
+Write a comment here
+*** Parameters: ***
+{} # params 
+*** Markdown input: ***
+|    | 1  | 2  |
+|----|----|----|
+|  A | X  |    |
+|  B |    | X  |
+*** Output of inspect ***
+md_el(:document,[
+	md_el(:table,[
+		[md_el(:head_cell,[],{},[]),md_el(:head_cell,["1"],{},[]),md_el(:head_cell,["2"],{},[])],
+		[md_el(:cell,["A"],{},[]),md_el(:cell,["X"],{},[]),md_el(:cell,[],{},[])],
+		[md_el(:cell,["B"],{},[]),md_el(:cell,[],{},[]),md_el(:cell,["X"],{},[])]
+	],{:align=>[:left, :left, :left]},[])
+],{},[])
+*** Output of to_html ***
+<table><thead><tr><th></th><th>1</th><th>2</th></tr></thead><tbody><tr><td style="text-align: left;">A</td><td style="text-align: left;">X</td><td style="text-align: left;"></td></tr>
+<tr><td style="text-align: left;">B</td><td style="text-align: left;"></td><td style="text-align: left;">X</td></tr>
+</tbody></table>
+*** Output of to_latex ***
+\begin{tabular}{l|l|l}
+&1&2\\
+\hline 
+A&X&\\
+B&&X\\
+\end{tabular}
+*** Output of to_md ***
+12AXBX
+*** Output of to_s ***
+12AXBX

data/{tests/unittest → spec/block_docs}/encoding/iso-8859-1.md

@@ -17,19 +17,6 @@ md_el(:document,[
 *** Output of to_latex ***
 This is iso-8859-1: àèìàù.
 *** Output of to_md ***
-This is iso-8859-1:
-àèìàù.
+This is iso-8859-1: àèìàù.
 *** Output of to_s ***
 This is iso-8859-1: àèìàù.
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

data/{tests/unittest → spec/block_docs}/encoding/utf-8.md

@@ -16,15 +16,3 @@ Japanese: マルク
 Japanese: マルク
 *** Output of to_s ***
 Japanese: マルク
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

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

@@ -19,48 +19,42 @@ The following should not be translated:
 
 	©
 
-It should read just like this: `©`.
+It should read like this: `©`.
 
 
 *** Output of inspect ***
 md_el(:document,[
 	md_par(["Maruku translates HTML entities to the equivalent in LaTeX:"]),
 	md_el(:table,[
-		md_el(:head_cell,["Entity"],{},[]),
-		md_el(:head_cell,["Result"],{},[]),
-		md_el(:cell,[md_code("©")],{},[]),
-		md_el(:cell,[md_entity("copy")],{},[]),
-		md_el(:cell,[md_code("£")],{},[]),
-		md_el(:cell,[md_entity("pound")],{},[]),
-		md_el(:cell,[md_code("a b")],{},[]),
-		md_el(:cell,["a", md_entity("nbsp"), "b"],{},[]),
-		md_el(:cell,[md_code("λ")],{},[]),
-		md_el(:cell,[md_entity("lambda")],{},[]),
-		md_el(:cell,[md_code("—")],{},[]),
-		md_el(:cell,[md_entity("mdash")],{},[])
+		[md_el(:head_cell,["Entity"],{},[]),md_el(:head_cell,["Result"],{},[])],
+		[md_el(:cell,[md_code("©")],{},[]),md_el(:cell,[md_entity("copy")],{},[])],
+		[md_el(:cell,[md_code("£")],{},[]),md_el(:cell,[md_entity("pound")],{},[])],
+		[md_el(:cell,[md_code("a b")],{},[]),md_el(:cell,["a", md_entity("nbsp"), "b"],{},[])],
+		[md_el(:cell,[md_code("λ")],{},[]),md_el(:cell,[md_entity("lambda")],{},[])],
+		[md_el(:cell,[md_code("—")],{},[]),md_el(:cell,[md_entity("mdash")],{},[])]
 	],{:align=>[:left, :left]},[]),
 	md_par([
 		"Entity-substitution does not happen in code blocks or inline code."
 	]),
 	md_par(["The following should not be translated:"]),
-	md_el(:code,[],{:raw_code=>"©"},[]),
-	md_par(["It should read just like this: ", md_code("©"), "."])
+	md_el(:code,[],{:raw_code=>"©", :lang=>nil},[]),
+	md_par(["It should read like this: ", md_code("©"), "."])
 ],{},[])
 *** Output of to_html ***
 <p>Maruku translates HTML entities to the equivalent in LaTeX:</p>
-<table><thead><tr><th>Entity</th><th>Result</th></tr></thead><tbody><tr><td style='text-align: left;'><code>&amp;copy;</code></td><td style='text-align: left;'>&#169;</td>
-</tr><tr><td style='text-align: left;'><code>&amp;pound;</code></td><td style='text-align: left;'>&#163;</td>
-</tr><tr><td style='text-align: left;'><code>a&amp;nbsp;b</code></td><td style='text-align: left;'>a&#160;b</td>
-</tr><tr><td style='text-align: left;'><code>&amp;lambda;</code></td><td style='text-align: left;'>&#955;</td>
-</tr><tr><td style='text-align: left;'><code>&amp;mdash;</code></td><td style='text-align: left;'>&#8212;</td>
-</tr></tbody></table>
+<table><thead><tr><th>Entity</th><th>Result</th></tr></thead><tbody><tr><td style="text-align: left;"><code>&amp;copy;</code></td><td style="text-align: left;">©</td></tr>
+<tr><td style="text-align: left;"><code>&amp;pound;</code></td><td style="text-align: left;">£</td></tr>
+<tr><td style="text-align: left;"><code>a&amp;nbsp;b</code></td><td style="text-align: left;">a b</td></tr>
+<tr><td style="text-align: left;"><code>&amp;lambda;</code></td><td style="text-align: left;">λ</td></tr>
+<tr><td style="text-align: left;"><code>&amp;mdash;</code></td><td style="text-align: left;">—</td></tr>
+</tbody></table>
 <p>Entity-substitution does not happen in code blocks or inline code.</p>
 
 <p>The following should not be translated:</p>
 
 <pre><code>&amp;copy;</code></pre>
 
-<p>It should read just like this: <code>&amp;copy;</code>.</p>
+<p>It should read like this: <code>&amp;copy;</code>.</p>
 *** Output of to_latex ***
 Maruku translates HTML entities to the equivalent in \LaTeX\xspace :
 
@@ -69,9 +63,9 @@ Entity&Result\\
 \hline 
 {\colorbox[rgb]{1.00,0.93,1.00}{\tt \char38copy\char59}}&\copyright{}\\
 {\colorbox[rgb]{1.00,0.93,1.00}{\tt \char38pound\char59}}&\pounds{}\\
-{\colorbox[rgb]{1.00,0.93,1.00}{\tt a\char38nbsp\char59b}}&a~{}b\\
-{\colorbox[rgb]{1.00,0.93,1.00}{\tt \char38lambda\char59}}&$\lambda${}\\
-{\colorbox[rgb]{1.00,0.93,1.00}{\tt \char38mdash\char59}}&---{}\\
+{\colorbox[rgb]{1.00,0.93,1.00}{\tt a\char38nbsp\char59b}}&a~b\\
+{\colorbox[rgb]{1.00,0.93,1.00}{\tt \char38lambda\char59}}&$\lambda$\\
+{\colorbox[rgb]{1.00,0.93,1.00}{\tt \char38mdash\char59}}&---\\
 \end{tabular}
 
 Entity-substitution does not happen in code blocks or inline code.
@@ -79,28 +73,26 @@ Entity-substitution does not happen in code blocks or inline code.
 The following should not be translated:
 
 \begin{verbatim}&copy;\end{verbatim}
-It should read just like this: {\colorbox[rgb]{1.00,0.93,1.00}{\tt \char38copy\char59}}.
+It should read like this: {\colorbox[rgb]{1.00,0.93,1.00}{\tt \char38copy\char59}}.
 *** Output of to_md ***
 Maruku translates HTML entities to the
 equivalent in LaTeX:
 
-EntityResultabEntity-substitution does not happen in
-code blocks or inline code.
-
-The following should not be translated:
-
-It should read just like this: .
-*** Output of to_s ***
-Maruku translates HTML entities to the equivalent in LaTeX:EntityResultabEntity-substitution does not happen in code blocks or inline code.The following should not be translated:It should read just like this: .
-*** EOF ***
-
+Entity      | Result
+------------|----------
+`&copy;`    |  &copy;
+`&pound;`   |  &pound;
+`a&nbsp;b`  |  a&nbsp;b
+`&lambda;`  |  &lambda;
+`&mdash;`   |  &mdash;
 
 
-	OK!
+Entity-substitution does not happen in code blocks or inline code.
 
+The following should not be translated:
 
+     &copy;
 
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)
+It should read like this: `&copy;`.
+*** Output of to_s ***
+Maruku translates HTML entities to the equivalent in LaTeX:EntityResultabEntity-substitution does not happen in code blocks or inline code.The following should not be translated:It should read like this: .

data/{tests/unittest/notyet → spec/block_docs}/escape.md

@@ -12,22 +12,10 @@ md_el(:document,[md_par([md_code("\\\\")]), md_par([md_code("\\")])],{},[])
 
 <p><code>\</code></p>
 *** Output of to_latex ***
-{\colorbox[rgb]{1.00,0.93,1.00}{\tt \char92\char92}}
+{\colorbox[rgb]{1.00,0.93,1.00}{\tt ~~}}
 
-{\colorbox[rgb]{1.00,0.93,1.00}{\tt \char92}}
+{\colorbox[rgb]{1.00,0.93,1.00}{\tt ~}}
 *** Output of to_md ***
 
 *** Output of to_s ***
 
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

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

@@ -44,36 +44,25 @@ md_el(:document,[
 *** Output of to_latex ***
 Hello: ! ! ` \{ \} [ ] ( ) \# . ! * * *
 
-Ora, \emph{emphasis}, \textbf{bold}, * {\tt \char60}- due asterischi-{\tt \char62} * , un underscore-{\tt \char62} \_ , \emph{emphasis}, incre\emph{dible}e!
+Ora, \emph{emphasis}, \textbf{bold}, * {\tt \symbol{60}}- due asterischi-{\tt \symbol{62}} * , un underscore-{\tt \symbol{62}} \_ , \emph{emphasis}, incre\emph{dible}e!
 
-This is {\colorbox[rgb]{1.00,0.93,1.00}{\tt Code~with~a~special\char58~\char45\char62~\char96~\char60\char45}}(after)
+This is {\colorbox[rgb]{1.00,0.93,1.00}{\tt Code\char32with\char32a\char32special\char58\char32\char45\char62\char32\char96\char32\char60\char45}}(after)
 
-{\colorbox[rgb]{1.00,0.93,1.00}{\tt Start~}} of paragraph
+{\colorbox[rgb]{1.00,0.93,1.00}{\tt Start\char32}} of paragraph
 
-End of {\colorbox[rgb]{1.00,0.93,1.00}{\tt paragraph~}}
+End of {\colorbox[rgb]{1.00,0.93,1.00}{\tt paragraph\char32}}
 *** Output of to_md ***
-Hello: ! ! ` { } [ ] ( ) # . ! * * *
+Hello: ! \! \` \{ \} \[ \] \( \) \# \. \! * \* *
 
-Ora, emphasis, bold, * <- due
+
+Ora, *emphasis*, **bold**, * <- due
 asterischi-> * , un underscore-> _ ,
-emphasis, incre diblee!
+*emphasis*, incre*dible*e!
 
-This is (after)
+This is ``Code with a special: -> ` <- ``(after)
 
-of paragraph
+`Start ` of paragraph
 
-End of
+End of `paragraph `
 *** Output of to_s ***
 Hello: ! ! ` { } [ ] ( ) # . ! * * *Ora, emphasis, bold, * <- due asterischi-> * , un underscore-> _ , emphasis, incrediblee!This is (after) of paragraphEnd of
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

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

@@ -1,4 +1,5 @@
-Write a comment abouth the test here.
+Definition lists - only Maruku and Kramdown support this syntax (and only
+Kramdown gets it right.
 *** Parameters: ***
 {:css=>"style.css"}
 *** Markdown input: ***
@@ -50,15 +51,3 @@ md_el(:document,[
 ApplePomaceous fruit of plants of the genus Malus in the family Rosaceae.OrangeThe fruit of an evergreen tree of the genus Citrus.
 *** Output of to_s ***
 ApplePomaceous fruit of plants of the genus Malus in the family Rosaceae.OrangeThe fruit of an evergreen tree of the genus Citrus.
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

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

@@ -33,15 +33,15 @@ md_el(:document,[
 	])
 ],{},[])
 *** Output of to_html ***
-<h1 id='header1'>Header 1</h1>
+<h1 id="header1">Header 1</h1>
 
-<h2 id='header2'>Header 2</h2>
+<h2 id="header2">Header 2</h2>
 
-<h3 id='header3'>Header 3</h3>
+<h3 id="header3">Header 3</h3>
 
 <p>Then you can create links to different parts of the same document like this:</p>
 
-<p><a href='#header1'>Link back to header 1</a>, <a href='#header2'>Link back to header 2</a>, <a href='#header3'>Link back to header 3</a></p>
+<p><a href="#header1">Link back to header 1</a>, <a href="#header2">Link back to header 2</a>, <a href="#header3">Link back to header 3</a></p>
 *** Output of to_latex ***
 \hypertarget{header1}{}\section*{{Header 1}}\label{header1}
 
@@ -53,23 +53,17 @@ Then you can create links to different parts of the same document like this:
 
 \hyperlink{header1}{Link back to header 1}, \hyperlink{header2}{Link back to header 2}, \hyperlink{header3}{Link back to header 3}
 *** Output of to_md ***
-Header 1Header 2Header 3Then you can create links to different
-parts of the same document like this:
-
-Link back to header 1,
-Link back to header 2,
-Link back to header 3
-*** Output of to_s ***
-Header 1Header 2Header 3Then you can create links to different parts of the same document like this:Link back to header 1, Link back to header 2, Link back to header 3
-*** EOF ***
-
-
+# Header 1 #
 
-	OK!
+## Header 2 ##
 
+### Header 3 ###
 
+Then you can create links to different
+parts of the same document like this:
 
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)
+[Link back to header 1](#header1),
+[Link back to header 2](#header2),
+[Link back to header 3](#header3)
+*** Output of to_s ***
+Header 1Header 2Header 3Then you can create links to different parts of the same document like this:Link back to header 1, Link back to header 2, Link back to header 3