maruku 0.6.0 → 0.7.3

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

@@ -3,8 +3,8 @@ Write a comment here
 {} # params 
 *** Markdown input: ***
 
-h         | h
-----------|--
+h         | h 
+----------|---
 {:t}  c1  | c2
 {: summary="Table summary" .class1 style="color:red" border=3 width="50%" frame=lhs rules=cols  cellspacing=2em cellpadding=4px}
 
@@ -12,16 +12,14 @@ h         | h
 *** Output of inspect ***
 md_el(:document,[
 	md_el(:table,[
-		md_el(:head_cell,["h"],{},[]),
-		md_el(:head_cell,["h"],{},[]),
-		md_el(:cell,[" c1"],{},[[:ref, "t"]]),
-		md_el(:cell,["c2"],{},[])
+		[md_el(:head_cell,["h"],{},[]),md_el(:head_cell,["h"],{},[])],
+		[md_el(:cell,[" c1"],{},[[:ref, "t"]]),md_el(:cell,["c2"],{},[])]
 	],{:align=>[:left, :left]},[["summary", "Table summary"], [:class, "class1"], ["style", "color:red"], ["border", "3"], ["width", "50%"], ["frame", "lhs"], ["rules", "cols"], ["cellspacing", "2em"], ["cellpadding", "4px"]]),
 	md_el(:ald,[],{:ald=>[["scope", "row"]],:ald_id=>"t"},[])
 ],{},[])
 *** Output of to_html ***
-<table cellspacing='2em' class='class1' border='3' rules='cols' frame='lhs' summary='Table summary' cellpadding='4px' width='50%' style='color:red'><thead><tr><th>h</th><th>h</th></tr></thead><tbody><tr><th scope='row' style='text-align: left;'> c1</th><td style='text-align: left;'>c2</td>
-</tr></tbody></table>
+<table class="class1" style="color:red" summary="Table summary" width="50%" frame="lhs" rules="cols" border="3" cellspacing="2em" cellpadding="4px"><thead><tr><th>h</th><th>h</th></tr></thead><tbody><tr><th scope="row" style="text-align: left;"> c1</th><td style="text-align: left;">c2</td></tr>
+</tbody></table>
 *** Output of to_latex ***
 \begin{tabular}{l|l}
 h&h\\
@@ -32,15 +30,3 @@ h&h\\
 hh c1c2
 *** Output of to_s ***
 hh c1c2
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

data/spec/block_docs/table_colspan.md

@@ -0,0 +1,41 @@
+Write a comment here
+*** Parameters: ***
+{} # params 
+*** Markdown input: ***
+
+| h1        | h2  |   h3 |
+|:----------|:---:|-----:|
+|c1         | c2  |  c3  |
+|c1         | c2         ||
+|c1         ||       c2  |
+|c1                      |||
+{: summary="Table summary" .class1 style="color:blue" border=1 width="50%" cellspacing=2em cellpadding=4px}
+
+{:t: scope="row"}
+*** Output of inspect ***
+md_el(:document,[
+	md_el(:table, [
+       	[md_el(:head_cell, "h1"), md_el(:head_cell, "h2"), md_el(:head_cell, "h3")],
+       	[md_el(:cell, "c1"), md_el(:cell, "c2"), md_el(:cell, "c3")],
+       	[md_el(:cell, "c1"), md_el(:cell, "c2", {}, [["colspan", "2"]])],
+       	[md_el(:cell, "c1", {}, [["colspan", "2"]]), md_el(:cell, "c2")],
+       	[md_el(:cell, "c1", {}, [["colspan", "3"]])]
+       ],{:align=>[:left, :center, :right]},[["summary", "Table summary"], [:class, "class1"], ["style", "color:blue"], ["border", ""], ["width", "50%"], ["frame", "lhs"], ["rules", "cols"], ["cellspacing", "2em"], ["cellpadding", "4px"]]),
+	md_el(:ald,[],{:ald=>[["scope", "row"]],:ald_id=>"t"},[])
+],{},[])
+*** Output of to_html ***
+<table class="class1" style="color:blue" summary="Table summary" width="50%" border="1" cellspacing="2em" cellpadding="4px">
+<thead><tr><th>h1</th><th>h2</th><th>h3</th></tr></thead>
+<tbody><tr><td style="text-align: left;">c1</td><td style="text-align: center;">c2</td><td style="text-align: right;">c3</td></tr>
+<tr><td style="text-align: left;">c1</td><td colspan="2" style="text-align: center;">c2</td></tr>
+<tr><td colspan="2" style="text-align: left;">c1</td><td style="text-align: center;">c2</td></tr>
+<tr><td colspan="3" style="text-align: left;">c1</td></tr></tbody></table>
+*** Output of to_latex ***
+\begin{tabular}{l|c|r}
+h1&h2&h3\\
+\hline 
+c1&c2&c3\\
+c1&\multicolumn {2}{|l|}{c2}\\
+\multicolumn {2}{|l|}{c1}&c2\\
+\multicolumn {3}{|l|}{c1}\\
+\end{tabular}

data/spec/block_docs/tables.md

@@ -0,0 +1,47 @@
+PHP Markdown Extra table syntax
+*** Parameters: ***
+{} # params 
+*** Markdown input: ***
+
+Col1    | Very very long head | Very very long head|
+------- |:-------------------:|-------------------:|
+cell    | center-align        | right-align        |
+another | cell                | here               |
+
+| First Header  | Second Header |
+| ------------- | ------------- |
+| Content Cell  | Content Cell  |
+| Content Cell  | Content Cell  |
+
+First Header  | Second Header
+------------- | -------------
+Content Cell  | Content Cell
+Content Cell  | Content Cell
+
+*** Output of inspect ***
+md_el(:document, [
+	md_el(:table, [
+	[md_el(:head_cell, "Col1"), md_el(:head_cell, "Very very long head"), md_el(:head_cell, "Very very long head")],
+	[md_el(:cell, "cell"), md_el(:cell, "center-align"), md_el(:cell, "right-align")],
+	[md_el(:cell, "another"), md_el(:cell, "cell"), md_el(:cell, "here")]
+], {:align=>[:left, :center, :right]}),
+	md_el(:table, [
+	[md_el(:head_cell, "First Header"), md_el(:head_cell, "Second Header")],
+	[md_el(:cell, "Content Cell"), md_el(:cell, "Content Cell")],
+	[md_el(:cell, "Content Cell"), md_el(:cell, "Content Cell")]
+], {:align=>[:left, :left]}),
+	md_el(:table, [
+	[md_el(:head_cell, "First Header"), md_el(:head_cell, "Second Header")],
+	[md_el(:cell, "Content Cell"), md_el(:cell, "Content Cell")],
+	[md_el(:cell, "Content Cell"), md_el(:cell, "Content Cell")]
+], {:align=>[:left, :left]})
+])
+*** Output of to_html ***
+<table><thead><tr><th>Col1</th><th>Very very long head</th><th>Very very long head</th></tr></thead><tbody><tr><td style="text-align: left;">cell</td><td style="text-align: center;">center-align</td><td style="text-align: right;">right-align</td></tr>
+<tr><td style="text-align: left;">another</td><td style="text-align: center;">cell</td><td style="text-align: right;">here</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><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>
+

data/spec/block_docs/tables2.md

@@ -0,0 +1,74 @@
+Trailing blanks in table rows
+*** Parameters: ***
+{} # params 
+*** Markdown input: ***
+
+Col1    | Very very long head | Very very long head| 
+------- |:-------------------:|-------------------:|
+cell    | center-align        | right-align        |
+another | cell                | here               |
+
+| First Header  | Second Header |
+| ------------- | ------------- | 
+| Content Cell  | Content Cell  |
+| Content Cell  | Content Cell  |
+
+| First Header  | Second Header |
+| ------------- | ------------- |
+| Content Cell  | Content Cell  | 
+| Content Cell  | Content Cell  |
+
+First Header  | Second Header|
+------------- | -------------|
+Content Cell  | Content Cell| 
+Content Cell  | Content Cell|
+
+First Header  | Second Header
+------------- | -------------
+Content Cell  | Content Cell
+Content Cell  |  
+Content Cell  | Content Cell
+
+*** Output of inspect ***
+md_el(:document, [
+	md_el(:table, [
+	[md_el(:head_cell, "Col1"), md_el(:head_cell, "Very very long head"), md_el(:head_cell, "Very very long head")],
+	[md_el(:cell, "cell"), md_el(:cell, "center-align"), md_el(:cell, "right-align")],
+	[md_el(:cell, "another"), md_el(:cell, "cell"), md_el(:cell, "here")]
+], {:align=>[:left, :center, :right]}),
+	md_el(:table, [
+	[md_el(:head_cell, "First Header"), md_el(:head_cell, "Second Header")],
+	[md_el(:cell, "Content Cell"), md_el(:cell, "Content Cell")],
+	[md_el(:cell, "Content Cell"), md_el(:cell, "Content Cell")]
+], {:align=>[:left, :left]}),
+	md_el(:table, [
+	[md_el(:head_cell, "First Header"), md_el(:head_cell, "Second Header")],
+	[md_el(:cell, "Content Cell"), md_el(:cell, "Content Cell")],
+	[md_el(:cell, "Content Cell"), md_el(:cell, "Content Cell")]
+], {:align=>[:left, :left]}),
+	md_el(:table, [
+	[md_el(:head_cell, "First Header"), md_el(:head_cell, "Second Header")],
+	[md_el(:cell, "Content Cell"), md_el(:cell, "Content Cell")],
+	[md_el(:cell, "Content Cell"), md_el(:cell, "Content Cell")]
+], {:align=>[:left, :left]}),
+	md_el(:table, [
+	[md_el(:head_cell, "First Header"), md_el(:head_cell, "Second Header")],
+	[md_el(:cell, "Content Cell"), md_el(:cell, "Content Cell")],
+	[md_el(:cell, "Content Cell"), md_el(:cell, [])],
+	[md_el(:cell, "Content Cell"), md_el(:cell, "Content Cell")]
+], {:align=>[:left, :left]})
+])
+*** Output of to_html ***
+<table><thead><tr><th>Col1</th><th>Very very long head</th><th>Very very long head</th></tr></thead><tbody><tr><td style="text-align: left;">cell</td><td style="text-align: center;">center-align</td><td style="text-align: right;">right-align</td></tr>
+<tr><td style="text-align: left;">another</td><td style="text-align: center;">cell</td><td style="text-align: right;">here</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><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><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;"></td></tr>
+<tr><td style="text-align: left;">Content Cell</td><td style="text-align: left;">Content Cell</td></tr>
+</tbody></table>
+

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

@@ -8,7 +8,7 @@ Write a comment abouth the test here.
 
 
 *** Output of inspect ***
-md_el(:document,[md_el(:code,[],{:raw_code=>"       $ python       "},[])],{},[])
+md_el(:document,[md_el(:code,[],{:raw_code=>"       $ python       ", :lang=>nil},[])],{},[])
 *** Output of to_html ***
 <pre><code>       $ python       </code></pre>
 *** Output of to_latex ***
@@ -17,15 +17,3 @@ md_el(:document,[md_el(:code,[],{:raw_code=>"       $ python       "},[])],{},[]
 
 *** Output of to_s ***
 
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

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

@@ -11,20 +11,8 @@ md_el(:document,[md_par([md_code("There is a literal backtick (`) here.")])],{},
 *** Output of to_html ***
 <p><code>There is a literal backtick (`) here.</code></p>
 *** Output of to_latex ***
-{\colorbox[rgb]{1.00,0.93,1.00}{\tt There~is~a~literal~backtick~\char40\char96\char41~here\char46}}
+{\colorbox[rgb]{1.00,0.93,1.00}{\tt There\char32is\char32a\char32literal\char32backtick\char32\char40\char96\char41\char32here\char46}}
 *** 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/spec/block_docs/toc.md

@@ -0,0 +1,87 @@
+Write a comment abouth the test here.
+*** Parameters: ***
+{:use_numbered_headers => true}
+*** Markdown input: ***
+
+* Table of Contents
+{:toc}
+
+A title with *emphasis*
+=======================
+
+## Try ## {#try}
+
+First Subheader
+---------------
+{#foo}
+
+Say something.
+
+### A title with *emphasis* ###
+
+Say something else.
+
+Second Subheader
+--------------
+
+You don't say.
+
+*** Output of inspect ***
+md_el(:document,[
+    md_el(:ul, md_el(:li, "Table of Contents", {:want_my_paragraph=>false}), {}, [[:ref, "toc"]]),
+	md_el(:header,["A title with ", md_em(["emphasis"])],{:level=>1},[]),
+	md_el(:header, "Try", {:level=>2}, [[:id, "try"]]),
+	md_el(:header, "First Subheader", {:level=>2}),
+	md_par("Say something."),
+	md_el(:header, ["A title with ", md_em("emphasis")], {:level=>3}),
+	md_par("Say something else."),
+	md_el(:header, "Second Subheader", {:level=>2}),
+	md_par(["You don", md_entity("rsquo"), "t say."])
+],{},[])
+*** Output of to_html ***
+<div class="maruku_toc"><ul><li><span class="maruku_section_number">1. </span><a href="#try">Try</a></li><li><span class="maruku_section_number">2. </span><a href="#foo">First Subheader</a><ul><li><span class="maruku_section_number">2.1. </span><a href="#a_title_with_emphasis_2">A title with <em>emphasis</em></a></li></ul></li><li><span class="maruku_section_number">3. </span><a href="#second_subheader">Second Subheader</a></li></ul></div>
+<h1 id="a_title_with_emphasis">A title with <em>emphasis</em></h1>
+
+<h2 id="try"><span class="maruku_section_number">1. </span>Try</h2>
+
+<h2 id="foo"><span class="maruku_section_number">2. </span>First Subheader</h2>
+
+<p>Say something.</p>
+
+<h3 id="a_title_with_emphasis_2"><span class="maruku_section_number">2.1. </span>A title with <em>emphasis</em></h3>
+
+<p>Say something else.</p>
+
+<h2 id="second_subheader"><span class="maruku_section_number">3. </span>Second Subheader</h2>
+
+<p>You don’t say.</p>
+*** Output of to_latex ***
+\noindent1. \hyperlink{try}{Try}\dotfill \pageref*{try} \linebreak
+\noindent2. \hyperlink{foo}{First Subheader}\dotfill \pageref*{foo} \linebreak
+\noindent2.1. \hyperlink{a_title_with_emphasis_2}{A title with \emph{emphasis}}\dotfill \pageref*{a_title_with_emphasis_2} \linebreak
+\noindent3. \hyperlink{second_subheader}{Second Subheader}\dotfill \pageref*{second_subheader} \linebreak
+
+
+\hypertarget{a_title_with_emphasis}{}\section*{{A title with \emph{emphasis}}}\label{a_title_with_emphasis}
+
+\hypertarget{try}{}\subsection*{{1. Try}}\label{try}
+
+\hypertarget{foo}{}\subsection*{{2. First Subheader}}\label{foo}
+
+Say something.
+
+\hypertarget{a_title_with_emphasis_2}{}\subsubsection*{{2.1. A title with \emph{emphasis}}}\label{a_title_with_emphasis_2}
+
+Say something else.
+
+\hypertarget{second_subheader}{}\subsection*{{3. Second Subheader}}\label{second_subheader}
+
+You don't say.
+*** Output of to_md ***
+# A title with *emphasis* #
+
+## A title with *emphasis* ##
+
+#### A title with *emphasis* ####
+*** Output of to_s ***
+A title with emphasisA title with emphasisA title with emphasis

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

@@ -30,11 +30,11 @@ Paragraph with block quote:
 > Quoted
 
 Paragraph with header:
-### header ###
+### header 1 ###
 
 Paragraph with header on two lines:
-header
-------
+header 2
+--------
 
 *** Output of inspect ***
 md_el(:document,[
@@ -57,9 +57,9 @@ md_el(:document,[
 	md_par(["Paragraph with block quote:"]),
 	md_el(:quote,[md_par(["Quoted"])],{},[]),
 	md_par(["Paragraph with header:"]),
-	md_el(:header,["header"],{:level=>3},[]),
+	md_el(:header,["header 1"],{:level=>3},[]),
 	md_par(["Paragraph with header on two lines:"]),
-	md_el(:header,["header"],{:level=>2},[])
+	md_el(:header,["header 2"],{:level=>2},[])
 ],{},[])
 *** Output of to_html ***
 <p>Paragraph, list with no space: * ciao</p>
@@ -86,11 +86,11 @@ md_el(:document,[
 
 <p>Paragraph with header:</p>
 
-<h3 id='header'>header</h3>
+<h3 id="header_1">header 1</h3>
 
 <p>Paragraph with header on two lines:</p>
 
-<h2 id='header'>header</h2>
+<h2 id="header_2">header 2</h2>
 *** Output of to_latex ***
 Paragraph, list with no space: * ciao
 
@@ -117,11 +117,11 @@ Quoted
 \end{quote}
 Paragraph with header:
 
-\hypertarget{header}{}\subsubsection*{{header}}\label{header}
+\hypertarget{header_1}{}\subsubsection*{{header 1}}\label{header_1}
 
 Paragraph with header on two lines:
 
-\hypertarget{header}{}\subsection*{{header}}\label{header}
+\hypertarget{header_2}{}\subsection*{{header 2}}\label{header_2}
 *** Output of to_md ***
 Paragraph, list with no space: * ciao
 
@@ -146,24 +146,13 @@ no space:
 
 Paragraph with block quote:
 
-Quoted
-
+> Quoted
 Paragraph with header:
 
-headerParagraph with header on two lines:
+### header
 
-header
+Paragraph with header on two lines:
+
+## header
 *** 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:header
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)

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

@@ -13,15 +13,3 @@ Ok, this\_was a\_really\_old bug
 Ok, this_was a_really_old bug
 *** Output of to_s ***
 Ok, this_was a_really_old bug
-*** EOF ***
-
-
-
-	OK!
-
-
-
-*** Output of Markdown.pl ***
-(not used anymore)
-*** Output of Markdown.pl (parsed) ***
-(not used anymore)