maruku 0.6.1 → 0.7.0.beta1

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

@@ -21,9 +21,9 @@ md_el(:document,[
 	],{:align=>[:left, :left]},[])
 ],{},[])
 *** Output of to_html ***
-<table><thead><tr><th>First Header</th><th>Second Header</th></tr></thead><tbody><tr><td style='text-align: left;'>Content Cell</td><td style='text-align: left;'>Content Cell</td>
-</tr><tr><td style='text-align: left;'>Content Cell</td><td style='text-align: left;'>Content Cell</td>
-</tr></tbody></table>
+<table><thead><tr><th>First Header</th><th>Second Header</th></tr></thead><tbody><tr><td style="text-align: left;">Content Cell</td><td style="text-align: left;">Content Cell</td></tr>
+<tr><td style="text-align: left;">Content Cell</td><td style="text-align: left;">Content Cell</td></tr>
+</tbody></table>
 *** Output of to_latex ***
 \begin{tabular}{l|l}
 First Header&Second Header\\
@@ -35,15 +35,3 @@ Content Cell&Content Cell\\
 First HeaderSecond HeaderContent CellContent CellContent CellContent Cell
 *** Output of to_s ***
 First HeaderSecond HeaderContent CellContent CellContent CellContent Cell
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

data/spec/block_docs/fenced_code_blocks.md

@@ -0,0 +1,66 @@
+Fenced code blocks
+*** Parameters: ***
+{ :fenced_code_blocks => true, :html_use_syntax => false }
+*** Markdown input: ***
+```ruby
+john = Twitter::Client.new(
+  :oauth_token => "John's access token",
+  :oauth_token_secret => "John's access secret"
+)
+```
+
+```
+john = Twitter::Client.new(
+  :oauth_token => "John's access token",
+  :oauth_token_secret => "John's access secret"
+)
+```
+
+~~~~~ruby
+john = Twitter::Client.new(
+  :oauth_token => "John's access token",
+  :oauth_token_secret => "John's access secret"
+)
+~~~~~~~
+
+~~~~~
+john = Twitter::Client.new(
+  :oauth_token => "John's access token",
+  :oauth_token_secret => "John's access secret"
+)
+~~~~~
+*** Output of inspect ***
+md_el(:document, [
+	md_el(:code, [], {:raw_code=>"\njohn = Twitter::Client.new(\n  :oauth_token => \"John's access token\",\n  :oauth_token_secret => \"John's access secret\"\n)\n", :lang=>"ruby"}),
+	md_el(:code, [], {:raw_code=>"\njohn = Twitter::Client.new(\n  :oauth_token => \"John's access token\",\n  :oauth_token_secret => \"John's access secret\"\n)\n", :lang=>nil}),
+	md_el(:code, [], {:raw_code=>"\njohn = Twitter::Client.new(\n  :oauth_token => \"John's access token\",\n  :oauth_token_secret => \"John's access secret\"\n)\n", :lang=>"ruby"}),
+	md_el(:code, [], {:raw_code=>"\njohn = Twitter::Client.new(\n  :oauth_token => \"John's access token\",\n  :oauth_token_secret => \"John's access secret\"\n)\n", :lang=>nil})
+])
+*** Output of to_html ***
+<pre class="ruby"><code class="ruby">
+john = Twitter::Client.new(
+  :oauth_token =&gt; "John's access token",
+  :oauth_token_secret =&gt; "John's access secret"
+)
+</code></pre>
+
+<pre><code>
+john = Twitter::Client.new(
+  :oauth_token =&gt; "John's access token",
+  :oauth_token_secret =&gt; "John's access secret"
+)
+</code></pre>
+
+<pre class="ruby"><code class="ruby">
+john = Twitter::Client.new(
+  :oauth_token =&gt; "John's access token",
+  :oauth_token_secret =&gt; "John's access secret"
+)
+</code></pre>
+
+<pre><code>
+john = Twitter::Client.new(
+  :oauth_token =&gt; "John's access token",
+  :oauth_token_secret =&gt; "John's access secret"
+)
+</code></pre>

data/spec/block_docs/fenced_code_blocks_highlighted.md

@@ -0,0 +1,18 @@
+Fenced code blocks
+*** Parameters: ***
+{ :fenced_code_blocks => true, :html_use_syntax => true }
+*** Markdown input: ***
+```ruby
+john = Twitter::Client.new(
+  :oauth_token => "John's access token",
+  :oauth_token_secret => "John's access secret"
+)
+```
+*** Output of inspect ***
+
+*** Output of to_html ***
+<pre class="ruby"><code class="ruby">
+<span class="ident">john</span> <span class="punct">=</span> <span class="constant">Twitter</span><span class="punct">::</span><span class="constant">Client</span><span class="punct">.</span><span class="ident">new</span><span class="punct">(</span>
+  <span class="symbol">:oauth_token</span> <span class="punct">=&gt;</span> <span class="punct">"</span><span class="string">John's access token</span><span class="punct">",</span>
+  <span class="symbol">:oauth_token_secret</span> <span class="punct">=&gt;</span> <span class="punct">"</span><span class="string">John's access secret</span><span class="punct">"</span>
+<span class="punct">)</span></code></pre>

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

@@ -54,26 +54,26 @@ md_el(:document,[
 	md_par(["This is not a footnote."])
 ],{},[])
 *** Output of to_html ***
-<p>That&#8217;s some text with a footnote <sup id='fnref:1'><a href='#fn:1' rel='footnote'>1</a></sup> and another <sup id='fnref:2'><a href='#fn:2' rel='footnote'>2</a></sup> and another <sup id='fnref:3'><a href='#fn:3' rel='footnote'>3</a></sup>.</p>
+<p>That’s some text with a footnote <sup id="fnref:1"><a href="#fn:1" rel="footnote">1</a></sup> and another <sup id="fnref:2"><a href="#fn:2" rel="footnote">2</a></sup> and another <sup id="fnref:3"><a href="#fn:3" rel="footnote">3</a></sup>.</p>
 
 <p>This is not a footnote.</p>
-<div class='footnotes'><hr /><ol><li id='fn:1'>
-<p>And that&#8217;s the footnote. This is second sentence (same paragraph).</p>
-<a href='#fnref:1' rev='footnote'>&#8617;</a></li><li id='fn:2'>
+<div class="footnotes"><hr /><ol><li id="fn:1">
+<p>And that’s the footnote. This is second sentence (same paragraph). <a href="#fnref:1" rev="footnote">&#8617;</a></p>
+</li><li id="fn:2">
 <p>This is the very long one.</p>
 
-<p>That&#8217;s the second paragraph.</p>
-<a href='#fnref:2' rev='footnote'>&#8617;</a></li><li id='fn:3'>
-<p>And that&#8217;s the footnote.</p>
+<p>That’s the second paragraph. <a href="#fnref:2" rev="footnote">&#8617;</a></p>
+</li><li id="fn:3">
+<p>And that’s the footnote.</p>
 
-<p>That&#8217;s the second paragraph of the footnote.</p>
-<a href='#fnref:3' rev='footnote'>&#8617;</a></li></ol></div>
+<p>That’s the second paragraph of the footnote. <a href="#fnref:3" rev="footnote">&#8617;</a></p>
+</li></ol></div>
 *** Output of to_latex ***
-That'{}s some text with a footnote \footnote{And that'{}s the footnote. This is second sentence (same paragraph).}  and another \footnote{This is the very long one.
+That's some text with a footnote \footnote{And that's the footnote. This is second sentence (same paragraph).}  and another \footnote{This is the very long one.
 
-That'{}s the second paragraph.}  and another \footnote{And that'{}s the footnote.
+That's the second paragraph.}  and another \footnote{And that's the footnote.
 
-That'{}s the second paragraph of the footnote.} .
+That's the second paragraph of the footnote.} .
 
 This is not a footnote.
 *** Output of to_md ***
@@ -95,15 +95,3 @@ That s the second paragraph.
 This is not a footnote.
 *** Output of to_s ***
 Thats some text with a footnote  and another  and another .And thats the footnote.Thats the second paragraph of the footnote.And thats the footnote. This is second sentence (same paragraph).This is the very long one.Thats the second paragraph.This is not a footnote.
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

data/spec/block_docs/footnotes2.md

@@ -0,0 +1,78 @@
+Write a comment abouth the test here.
+*** Parameters: ***
+require 'maruku/ext/math';{:html_math_engine => 'itex2mml'}
+*** Markdown input: ***
+Ruby on Rails is a web-framework[^framework]. It uses the MVC[^MVC] architecture pattern. It has its good points[^points].
+
+[^framework]: a reusable set of libraries
+[^MVC]: Model View Controller
+[^points]: Here are its good points
+     1. Ease of use
+     2. Rapid development
+
+That has nothing to do with putting equations in footnotes[^equations].
+
+[^equations]: Like this:
+$$
+  x = r\cos\theta
+$$
+*** Output of inspect ***
+md_el(:document,[
+	md_par([
+		"Ruby on Rails is a web-framework",
+		md_foot_ref("^framework"),
+		". It uses the MVC",
+		md_foot_ref("^MVC"),
+		" architecture pattern. It has its good points",
+		md_foot_ref("^points"),
+		"."
+	]),
+	md_el(:footnote, md_par("a reusable set of libraries"), {:footnote_id=>"^framework"}),
+	md_el(:footnote, md_par("Model View Controller"), {:footnote_id=>"^MVC"}),
+	md_el(:footnote, [
+		md_par("Here are its good points"),
+		md_el(:ol, [md_li("Ease of use", false), md_li("Rapid development", false)])
+		], {:footnote_id=>"^points"}),
+	md_par([
+		"That has nothing to do with putting equations in footnotes",
+		md_foot_ref("^equations"),
+		"."
+		]),
+	md_el(:footnote, [
+		md_par("Like this:"),
+		md_el(:equation, [], {:math=>"\nx = r\\cos\\theta\n\n", :label=>nil, :num=>nil})
+		], {:footnote_id=>"^equations"})
+],{},[])
+*** Output of to_html ***
+<p>Ruby on Rails is a web-framework<sup id="fnref:1"><a href="#fn:1" rel="footnote">1</a></sup>. It uses the MVC<sup id="fnref:2"><a href="#fn:2" rel="footnote">2</a></sup> architecture pattern. It has its good points<sup id="fnref:3"><a href="#fn:3" rel="footnote">3</a></sup>.</p>
+
+<p>That has nothing to do with putting equations in footnotes<sup id="fnref:4"><a href="#fn:4" rel="footnote">4</a></sup>.</p>
+<div class="footnotes"><hr /><ol><li id="fn:1">
+<p>a reusable set of libraries <a href="#fnref:1" rev="footnote">↩</a></p>
+</li><li id="fn:2">
+<p>Model View Controller <a href="#fnref:2" rev="footnote">↩</a></p>
+</li><li id="fn:3">
+<p>Here are its good points</p>
+
+<ol>
+<li>Ease of use</li>
+
+<li>Rapid development</li>
+</ol>
+<a href="#fnref:3" rev="footnote">↩</a></li><li id="fn:4">
+<p>Like this:</p>
+<div class="maruku-equation"><math xmlns="http://www.w3.org/1998/Math/MathML" display="block" class="maruku-mathml"><mi>x</mi><mo>=</mo><mi>r</mi><mi>cos</mi><mi>θ</mi></math><span class="maruku-eq-tex"><code style="display: none">x = r\cos\theta</code></span></div><a href="#fnref:4" rev="footnote">↩</a></li></ol></div>
+*** Output of to_latex ***
+Ruby on Rails is a web-framework\footnote{a reusable set of libraries} . It uses the MVC\footnote{Model View Controller}  architecture pattern. It has its good points\footnote{Here are its good points
+
+\begin{enumerate}%
+\item Ease of use
+\item Rapid development
+
+\end{enumerate}} .
+
+That has nothing to do with putting equations in footnotes\footnote{Like this:
+
+\begin{displaymath}
+x = r\cos\theta
+\end{displaymath}} .

data/spec/block_docs/hard.md

@@ -0,0 +1,25 @@
+More complicated tests for emphasis.
+*** Parameters: ***
+{}
+*** Markdown input: ***
+*This is in italic, and **this is bold italics**.*  But **is this bold and *this bold-italic* **? Or just plain ***bold italics***.
+*** Output of inspect ***
+md_el(:document,
+  [md_par([
+    md_em([
+      "This is in italic, and ", md_strong(["this is bold italics"]), "."
+    ]), " But ", md_strong([
+                   "is this bold and ", md_em(["this bold-italic"])
+                 ]), "? Or just plain ", md_emstrong(["bold italics"]), "."
+   ])
+  ],{},[])
+*** Output of to_html ***
+<p><em>This is in italic, and <strong>this is bold italics</strong>.</em> But <strong>is this bold and <em>this bold-italic</em></strong>? Or just plain <strong><em>bold italics</em></strong>.</p>
+*** Output of to_latex ***
+\emph{This is in italic, and \textbf{this is bold italics}.} But \textbf{is this bold and \emph{this bold-italic}}? Or just plain \textbf{\emph{bold italics}}.
+*** Output of to_md ***
+*This is in italic, and **this is bold italics**.*
+But **is this bold and *this bold-italic* **? Or
+just plain ***bold italics***.
+*** Output of to_s ***
+This is in italic, and this is bold italics. But is this bold and this bold-italic? Or just plain bold italics.

data/spec/block_docs/header_after_par.md

@@ -0,0 +1,62 @@
+Write a comment abouth the test here.
+*** Parameters: ***
+{:title=>"header"}
+*** Markdown input: ***
+Paragraph
+### header 1 ###
+
+Paragraph
+header 2
+--------
+
+Paragraph
+header 3
+========
+
+*** Output of inspect ***
+md_el(:document,[
+	md_par(["Paragraph"]),
+	md_el(:header,["header 1"],{:level=>3},[]),
+	md_par(["Paragraph"]),
+	md_el(:header,["header 2"],{:level=>2},[]),
+	md_par(["Paragraph"]),
+	md_el(:header,["header 3"],{:level=>1},[])
+],{},[])
+*** Output of to_html ***
+<p>Paragraph</p>
+
+<h3 id="header_1">header 1</h3>
+
+<p>Paragraph</p>
+
+<h2 id="header_2">header 2</h2>
+
+<p>Paragraph</p>
+
+<h1 id="header_3">header 3</h1>
+*** Output of to_latex ***
+Paragraph
+
+\hypertarget{header_1}{}\subsubsection*{{header 1}}\label{header_1}
+
+Paragraph
+
+\hypertarget{header_2}{}\subsection*{{header 2}}\label{header_2}
+
+Paragraph
+
+\hypertarget{header_3}{}\section*{{header 3}}\label{header_3}
+*** Output of to_md ***
+Paragraph
+
+### header
+
+Paragraph
+
+## header
+
+Paragraph
+
+# header
+*** Output of to_s ***
+ParagraphheaderParagraphheaderParagraphheader

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

@@ -20,30 +20,22 @@ md_el(:document,[
 	md_el(:header,["A title with ", md_em(["emphasis"])],{:level=>4},[])
 ],{},[])
 *** Output of to_html ***
-<h1 id='a_title_with_emphasis'>A title with <em>emphasis</em></h1>
+<h1 id="a_title_with_emphasis">A title with <em>emphasis</em></h1>
 
-<h2 id='a_title_with_emphasis'>A title with <em>emphasis</em></h2>
+<h2 id="a_title_with_emphasis_2">A title with <em>emphasis</em></h2>
 
-<h4 id='a_title_with_emphasis'>A title with <em>emphasis</em></h4>
+<h4 id="a_title_with_emphasis_3">A title with <em>emphasis</em></h4>
 *** Output of to_latex ***
 \hypertarget{a_title_with_emphasis}{}\section*{{A title with \emph{emphasis}}}\label{a_title_with_emphasis}
 
-\hypertarget{a_title_with_emphasis}{}\subsection*{{A title with \emph{emphasis}}}\label{a_title_with_emphasis}
+\hypertarget{a_title_with_emphasis_2}{}\subsection*{{A title with \emph{emphasis}}}\label{a_title_with_emphasis_2}
 
-\hypertarget{a_title_with_emphasis}{}\paragraph*{{A title with \emph{emphasis}}}\label{a_title_with_emphasis}
+\hypertarget{a_title_with_emphasis_3}{}\paragraph*{{A title with \emph{emphasis}}}\label{a_title_with_emphasis_3}
 *** Output of to_md ***
-A title with emphasisA title with emphasisA title with emphasis
-*** Output of to_s ***
-A title with emphasisA title with emphasisA title with emphasis
-*** EOF ***
-
-
+# A title with *emphasis* #
 
-	OK!
+## A title with *emphasis* ##
 
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)
+#### A title with *emphasis* ####
+*** Output of to_s ***
+A title with emphasisA title with emphasisA title with emphasis

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

@@ -24,26 +24,15 @@ md_el(:document,[
 	])
 ],{},[])
 *** Output of to_html ***
-<p>Examples of numeric character references include &#169; or &#169; for the copyright symbol, &#913; or &#913; for the Greek capital letter alpha, and &#1575; or &#1575; for the Arabic letter alef.</p>
+<p>Examples of numeric character references include © or © for the copyright symbol, Α or Α for the Greek capital letter alpha, and ا or ا for the Arabic letter alef.</p>
 *** Output of to_latex ***
-Examples of numeric character references include \copyright{} or \copyright{} for the copyright symbol, $A${} or $A${} for the Greek capital letter alpha, and  or  for the Arabic letter alef.
+Examples of numeric character references include \copyright{} or \copyright{} for the copyright symbol, $A$ or $A$ for the Greek capital letter alpha, and  or  for the Arabic letter alef.
 *** Output of to_md ***
 Examples of numeric character
-references include or for the copyright
-symbol, or for the Greek capital letter
-alpha, and or for the Arabic letter
-alef.
+references include &169; or &169; for
+the copyright symbol, &913; or &913;
+for the Greek capital letter alpha,
+and &1575; or &1575; for the Arabic
+letter alef.
 *** Output of to_s ***
 Examples of numeric character references include  or  for the copyright symbol,  or  for the Greek capital letter alpha, and  or  for the Arabic letter alef.
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

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

@@ -35,17 +35,10 @@ md_el(:document,[
 \vspace{.5em} \hrule \vspace{.5em}
 *** 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}/html3.md

@@ -22,22 +22,10 @@ md_el(:document,[
 	])
 ],{},[])
 *** Output of to_html ***
-<p>taking part in <a href='http://sied.dis.uniroma1.it/'>some arcane conspirations</a> which involve <b href='http://www.flickr.com/photos/censi/70893277/'>coffee</b>, <a href='http://flickr.com/photos/censi/42775664/in/set-936677/'>robots</a>, <a href='http://www.flickr.com/photos/censi/42775888/in/set-936677/'>sushi</a>,</p>
+<p>taking part in <a href="http://sied.dis.uniroma1.it/">some arcane conspirations</a> which involve <b href="http://www.flickr.com/photos/censi/70893277/">coffee</b>, <a href="http://flickr.com/photos/censi/42775664/in/set-936677/">robots</a>, <a href="http://www.flickr.com/photos/censi/42775888/in/set-936677/">sushi</a>,</p>
 *** Output of to_latex ***
 taking part in  which involve , , ,
 *** Output of to_md ***
 taking part in which involve , , ,
 *** Output of to_s ***
 taking part in  which involve , , ,
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)