maruku 0.5.4 → 0.5.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/bin/maruku +2 -2
- data/docs/changelog.html +37 -51
- data/docs/changelog.md +40 -46
- data/docs/div_syntax.md +36 -0
- data/docs/other_stuff.md +51 -0
- data/lib/maruku/helpers.rb +1 -2
- data/lib/maruku/input/html_helper.rb +22 -8
- data/lib/maruku/input/parse_block.rb +9 -2
- data/lib/maruku/input/parse_span_better.rb +31 -13
- data/lib/maruku/input/type_detection.rb +6 -3
- data/lib/maruku/output/s5/to_s5.rb +50 -41
- data/lib/maruku/output/to_html.rb +4 -4
- data/lib/maruku/string_utils.rb +1 -1
- data/lib/maruku/version.rb +1 -1
- data/tests/s5/a.md +13 -0
- data/tests/s5/instiki+s5.md +105 -0
- data/tests/unittest/alt.md +39 -0
- data/tests/unittest/email.md +2 -2
- data/tests/unittest/hex_entities.md +57 -0
- data/tests/unittest/html2.md +49 -0
- data/tests/unittest/html3.md +61 -0
- data/tests/unittest/html4.md +47 -0
- data/tests/unittest/html5.md +45 -0
- data/tests/unittest/images.md +5 -5
- data/tests/unittest/images2.md +2 -2
- data/tests/unittest/links.md +1 -1
- data/tests/unittest/lists8.md +109 -0
- data/tests/unittest/lists9.md +105 -0
- data/tests/unittest/lists_after_paragraph.md +5 -6
- data/tests/unittest/loss.md +32 -0
- metadata +15 -2
@@ -0,0 +1,49 @@
|
|
1
|
+
Write a comment here
|
2
|
+
*** Parameters: ***
|
3
|
+
{} # params
|
4
|
+
*** Markdown input: ***
|
5
|
+
One
|
6
|
+
<div></div>123
|
7
|
+
|
8
|
+
<div></div>123
|
9
|
+
*** Output of inspect ***
|
10
|
+
md_el(:document,[
|
11
|
+
md_par(["One ", md_html("<div></div>"), "123"]),
|
12
|
+
md_html("<div></div>")
|
13
|
+
],{},[])
|
14
|
+
*** Output of to_html ***
|
15
|
+
|
16
|
+
<p>One <div />123</p>
|
17
|
+
<div />
|
18
|
+
*** Output of to_latex ***
|
19
|
+
One 123
|
20
|
+
|
21
|
+
|
22
|
+
*** Output of to_md ***
|
23
|
+
One 123
|
24
|
+
|
25
|
+
|
26
|
+
*** Output of to_s ***
|
27
|
+
One 123
|
28
|
+
*** EOF ***
|
29
|
+
|
30
|
+
|
31
|
+
|
32
|
+
OK!
|
33
|
+
|
34
|
+
|
35
|
+
|
36
|
+
*** Output of Markdown.pl ***
|
37
|
+
<p>One
|
38
|
+
<div></div>123</p>
|
39
|
+
|
40
|
+
<p><div></div>123</p>
|
41
|
+
|
42
|
+
*** Output of Markdown.pl (parsed) ***
|
43
|
+
<p>One
|
44
|
+
<div/
|
45
|
+
>123</p
|
46
|
+
><p
|
47
|
+
><div/
|
48
|
+
>123</p
|
49
|
+
>
|
@@ -0,0 +1,61 @@
|
|
1
|
+
Write a comment here
|
2
|
+
*** Parameters: ***
|
3
|
+
{} # params
|
4
|
+
*** Markdown input: ***
|
5
|
+
taking part in <a href="http://sied.dis.uniroma1.it/">some arcane conspirations</a> which
|
6
|
+
involve <b href="http://www.flickr.com/photos/censi/70893277/">coffee</b>,
|
7
|
+
<a href="http://flickr.com/photos/censi/42775664/in/set-936677/">robots</a>,
|
8
|
+
<a href="http://www.flickr.com/photos/censi/42775888/in/set-936677/">sushi</a>,
|
9
|
+
|
10
|
+
*** Output of inspect ***
|
11
|
+
md_el(:document,[
|
12
|
+
md_par([
|
13
|
+
"taking part in ",
|
14
|
+
md_html("<a href=\"http://sied.dis.uniroma1.it/\">some arcane conspirations</a>"),
|
15
|
+
" which involve ",
|
16
|
+
md_html("<b href=\"http://www.flickr.com/photos/censi/70893277/\">coffee</b>"),
|
17
|
+
", ",
|
18
|
+
md_html("<a href=\"http://flickr.com/photos/censi/42775664/in/set-936677/\">robots</a>"),
|
19
|
+
", ",
|
20
|
+
md_html("<a href=\"http://www.flickr.com/photos/censi/42775888/in/set-936677/\">sushi</a>"),
|
21
|
+
","
|
22
|
+
])
|
23
|
+
],{},[])
|
24
|
+
*** Output of to_html ***
|
25
|
+
|
26
|
+
<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>
|
27
|
+
|
28
|
+
*** Output of to_latex ***
|
29
|
+
taking part in which involve , , ,
|
30
|
+
|
31
|
+
|
32
|
+
*** Output of to_md ***
|
33
|
+
taking part in which involve , , ,
|
34
|
+
|
35
|
+
|
36
|
+
*** Output of to_s ***
|
37
|
+
taking part in which involve , , ,
|
38
|
+
*** EOF ***
|
39
|
+
|
40
|
+
|
41
|
+
|
42
|
+
OK!
|
43
|
+
|
44
|
+
|
45
|
+
|
46
|
+
*** Output of Markdown.pl ***
|
47
|
+
<p>taking part in <a href="http://sied.dis.uniroma1.it/">some arcane conspirations</a> which
|
48
|
+
involve <b href="http://www.flickr.com/photos/censi/70893277/">coffee</b>,
|
49
|
+
<a href="http://flickr.com/photos/censi/42775664/in/set-936677/">robots</a>,
|
50
|
+
<a href="http://www.flickr.com/photos/censi/42775888/in/set-936677/">sushi</a>,</p>
|
51
|
+
|
52
|
+
*** Output of Markdown.pl (parsed) ***
|
53
|
+
<p>taking part in <a href='http://sied.dis.uniroma1.it/'>some arcane conspirations</a
|
54
|
+
> which
|
55
|
+
involve <b href='http://www.flickr.com/photos/censi/70893277/'>coffee</b
|
56
|
+
>,
|
57
|
+
<a href='http://flickr.com/photos/censi/42775664/in/set-936677/'>robots</a
|
58
|
+
>,
|
59
|
+
<a href='http://www.flickr.com/photos/censi/42775888/in/set-936677/'>sushi</a
|
60
|
+
>,</p
|
61
|
+
>
|
@@ -0,0 +1,47 @@
|
|
1
|
+
Write a comment here
|
2
|
+
*** Parameters: ***
|
3
|
+
{} # params
|
4
|
+
*** Markdown input: ***
|
5
|
+
<div class="frame">
|
6
|
+
<a class="photo" href="http://www.flickr.com/photos/censi/54757256/"><img alt=""
|
7
|
+
moz-do-not-send="true"
|
8
|
+
src="http://static.flickr.com/27/54757256_1a2c1d2a95_m.jpg" /></a>
|
9
|
+
</div>
|
10
|
+
|
11
|
+
|
12
|
+
*** Output of inspect ***
|
13
|
+
md_el(:document,[
|
14
|
+
md_html("<div class=\"frame\">\n\t<a class=\"photo\" href=\"http://www.flickr.com/photos/censi/54757256/\"><img alt=\"\"\n moz-do-not-send=\"true\"\n src=\"http://static.flickr.com/27/54757256_1a2c1d2a95_m.jpg\" /></a>\n</div>")
|
15
|
+
],{},[])
|
16
|
+
*** Output of to_html ***
|
17
|
+
<div class='frame'>
|
18
|
+
<a href='http://www.flickr.com/photos/censi/54757256/' class='photo'><img src='http://static.flickr.com/27/54757256_1a2c1d2a95_m.jpg' moz-do-not-send='true' alt='' /></a>
|
19
|
+
</div>
|
20
|
+
*** Output of to_latex ***
|
21
|
+
|
22
|
+
*** Output of to_md ***
|
23
|
+
|
24
|
+
*** Output of to_s ***
|
25
|
+
|
26
|
+
*** EOF ***
|
27
|
+
|
28
|
+
|
29
|
+
|
30
|
+
OK!
|
31
|
+
|
32
|
+
|
33
|
+
|
34
|
+
*** Output of Markdown.pl ***
|
35
|
+
<div class="frame">
|
36
|
+
<a class="photo" href="http://www.flickr.com/photos/censi/54757256/"><img alt=""
|
37
|
+
moz-do-not-send="true"
|
38
|
+
src="http://static.flickr.com/27/54757256_1a2c1d2a95_m.jpg" /></a>
|
39
|
+
</div>
|
40
|
+
|
41
|
+
*** Output of Markdown.pl (parsed) ***
|
42
|
+
<div class='frame'
|
43
|
+
><a href='http://www.flickr.com/photos/censi/54757256/' class='photo'
|
44
|
+
><img src='http://static.flickr.com/27/54757256_1a2c1d2a95_m.jpg' moz-do-not-send='true' alt=''/
|
45
|
+
></a
|
46
|
+
></div
|
47
|
+
>
|
@@ -0,0 +1,45 @@
|
|
1
|
+
Write a comment here
|
2
|
+
*** Parameters: ***
|
3
|
+
{} # params
|
4
|
+
*** Markdown input: ***
|
5
|
+
<div class="frame">
|
6
|
+
<a class="photo" href="http://www.flickr.com/photos/censi/88561568/" ><img moz-do-not-send="true" src="http://static.flickr.com/28/88561568_ab84d28245_m.jpg" width="240" height="180" alt="Aperitif" /></a>
|
7
|
+
</div>
|
8
|
+
|
9
|
+
|
10
|
+
*** Output of inspect ***
|
11
|
+
md_el(:document,[
|
12
|
+
md_html(" <div class=\"frame\">\n <a class=\"photo\" href=\"http://www.flickr.com/photos/censi/88561568/\" ><img moz-do-not-send=\"true\" src=\"http://static.flickr.com/28/88561568_ab84d28245_m.jpg\" width=\"240\" height=\"180\" alt=\"Aperitif\" /></a>\n </div>")
|
13
|
+
],{},[])
|
14
|
+
*** Output of to_html ***
|
15
|
+
<div class='frame'>
|
16
|
+
<a href='http://www.flickr.com/photos/censi/88561568/' class='photo'><img src='http://static.flickr.com/28/88561568_ab84d28245_m.jpg' height='180' moz-do-not-send='true' alt='Aperitif' width='240' /></a>
|
17
|
+
</div>
|
18
|
+
*** Output of to_latex ***
|
19
|
+
|
20
|
+
*** Output of to_md ***
|
21
|
+
|
22
|
+
*** Output of to_s ***
|
23
|
+
|
24
|
+
*** EOF ***
|
25
|
+
|
26
|
+
|
27
|
+
|
28
|
+
OK!
|
29
|
+
|
30
|
+
|
31
|
+
|
32
|
+
*** Output of Markdown.pl ***
|
33
|
+
<p><div class="frame">
|
34
|
+
<a class="photo" href="http://www.flickr.com/photos/censi/88561568/" ><img moz-do-not-send="true" src="http://static.flickr.com/28/88561568_ab84d28245_m.jpg" width="240" height="180" alt="Aperitif" /></a>
|
35
|
+
</div></p>
|
36
|
+
|
37
|
+
*** Output of Markdown.pl (parsed) ***
|
38
|
+
<p
|
39
|
+
><div class='frame'
|
40
|
+
><a href='http://www.flickr.com/photos/censi/88561568/' class='photo'
|
41
|
+
><img src='http://static.flickr.com/28/88561568_ab84d28245_m.jpg' height='180' moz-do-not-send='true' alt='Aperitif' width='240'/
|
42
|
+
></a
|
43
|
+
></div
|
44
|
+
></p
|
45
|
+
>
|
data/tests/unittest/images.md
CHANGED
@@ -53,15 +53,15 @@ md_el(:document,[
|
|
53
53
|
],{},[])
|
54
54
|
*** Output of to_html ***
|
55
55
|
|
56
|
-
<p>This page does not uilizes <img src='http://jigsaw.w3.org/css-validator/images/vcss' alt='' /></p>
|
56
|
+
<p>This page does not uilizes <img src='http://jigsaw.w3.org/css-validator/images/vcss' alt='Cascading Style Sheets' /></p>
|
57
57
|
|
58
|
-
<p>Please mouseover to see the title: <img src='http://jigsaw.w3.org/css-validator/images/vcss' alt='
|
58
|
+
<p>Please mouseover to see the title: <img src='http://jigsaw.w3.org/css-validator/images/vcss' alt='Cascading Style Sheets' /></p>
|
59
59
|
|
60
|
-
<p>Please mouseover to see the title: <img src='http://jigsaw.w3.org/css-validator/images/vcss' alt='
|
60
|
+
<p>Please mouseover to see the title: <img src='http://jigsaw.w3.org/css-validator/images/vcss' alt='Cascading Style Sheets' /></p>
|
61
61
|
|
62
|
-
<p>I’ll say it one more time: this page does not use <img src='http://jigsaw.w3.org/css-validator/images/vcss' alt='
|
62
|
+
<p>I’ll say it one more time: this page does not use <img src='http://jigsaw.w3.org/css-validator/images/vcss' alt='Cascading Style Sheets' /></p>
|
63
63
|
|
64
|
-
<p>This is double size: <img src='http://jigsaw.w3.org/css-validator/images/vcss' alt='
|
64
|
+
<p>This is double size: <img src='http://jigsaw.w3.org/css-validator/images/vcss' alt='Cascading Style Sheets' /></p>
|
65
65
|
|
66
66
|
*** Output of to_latex ***
|
67
67
|
This page does not uilizes
|
data/tests/unittest/images2.md
CHANGED
@@ -17,9 +17,9 @@ md_el(:document,[
|
|
17
17
|
],{},[])
|
18
18
|
*** Output of to_html ***
|
19
19
|
|
20
|
-
<p>This is an <img src='image.jpg' alt='' />.</p>
|
20
|
+
<p>This is an <img src='image.jpg' alt='image' />.</p>
|
21
21
|
|
22
|
-
<p>This is an <img src='image.jpg' alt='' />.</p>
|
22
|
+
<p>This is an <img src='image.jpg' alt='image' />.</p>
|
23
23
|
|
24
24
|
*** Output of to_latex ***
|
25
25
|
This is an .
|
data/tests/unittest/links.md
CHANGED
@@ -168,7 +168,7 @@ Search on GoogleSearch on GoogleSearch on GoogleSearch on GoogleSearch on Google
|
|
168
168
|
|
169
169
|
<p>Inline with title: <a href="http://google.com "Title"">Google images</a></p>
|
170
170
|
|
171
|
-
<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="&#
|
171
|
+
<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="mailto:bill@google.com">bill@google.com</a>
|
172
172
|
or you might ask bill@google.com.</p>
|
173
173
|
|
174
174
|
<p>If all else fails, ask <a href="http://www.google.com">Google</a></p>
|
@@ -0,0 +1,109 @@
|
|
1
|
+
Write a comment here
|
2
|
+
*** Parameters: ***
|
3
|
+
{} # params
|
4
|
+
*** Markdown input: ***
|
5
|
+
Here is a paragraph.
|
6
|
+
|
7
|
+
|
8
|
+
* Item 1
|
9
|
+
* Item 2
|
10
|
+
* Item 3
|
11
|
+
|
12
|
+
*** Output of inspect ***
|
13
|
+
md_el(:document,[
|
14
|
+
md_par(["Here is a paragraph."]),
|
15
|
+
md_el(:ul,[
|
16
|
+
md_el(:li_span,["Item 1"],{:want_my_paragraph=>false},[]),
|
17
|
+
md_el(:li_span,["Item 2"],{:want_my_paragraph=>false},[]),
|
18
|
+
md_el(:li_span,["Item 3"],{:want_my_paragraph=>false},[])
|
19
|
+
],{},[])
|
20
|
+
],{},[])
|
21
|
+
*** Output of to_html ***
|
22
|
+
|
23
|
+
<p>Here is a paragraph.</p>
|
24
|
+
|
25
|
+
<ul>
|
26
|
+
<li>Item 1</li>
|
27
|
+
|
28
|
+
<li>Item 2</li>
|
29
|
+
|
30
|
+
<li>Item 3</li>
|
31
|
+
</ul>
|
32
|
+
|
33
|
+
*** Output of to_latex ***
|
34
|
+
Here is a paragraph.
|
35
|
+
|
36
|
+
\begin{itemize}%
|
37
|
+
\item Item 1
|
38
|
+
\item Item 2
|
39
|
+
\item Item 3
|
40
|
+
|
41
|
+
\end{itemize}
|
42
|
+
|
43
|
+
*** Output of to_md ***
|
44
|
+
Here is a paragraph.
|
45
|
+
|
46
|
+
-tem 1
|
47
|
+
-tem 2
|
48
|
+
-tem 3
|
49
|
+
|
50
|
+
|
51
|
+
*** Output of to_s ***
|
52
|
+
Here is a paragraph.Item 1Item 2Item 3
|
53
|
+
*** EOF ***
|
54
|
+
|
55
|
+
|
56
|
+
|
57
|
+
|
58
|
+
Failed tests: [:inspect, :to_html, :to_latex, :to_md, :to_s]
|
59
|
+
|
60
|
+
*** Output of inspect ***
|
61
|
+
-----| WARNING | -----
|
62
|
+
md_el(:document,[
|
63
|
+
md_par(["Here is a paragraph."]),
|
64
|
+
md_par(["* Item 1 * Item 2 * Item 3"])
|
65
|
+
],{},[])
|
66
|
+
*** Output of to_html ***
|
67
|
+
-----| WARNING | -----
|
68
|
+
|
69
|
+
<p>Here is a paragraph.</p>
|
70
|
+
|
71
|
+
<p>* Item 1 * Item 2 * Item 3</p>
|
72
|
+
|
73
|
+
*** Output of to_latex ***
|
74
|
+
-----| WARNING | -----
|
75
|
+
Here is a paragraph.
|
76
|
+
|
77
|
+
* Item 1 * Item 2 * Item 3
|
78
|
+
|
79
|
+
|
80
|
+
*** Output of to_md ***
|
81
|
+
-----| WARNING | -----
|
82
|
+
Here is a paragraph.
|
83
|
+
|
84
|
+
* Item 1 * Item 2 * Item 3
|
85
|
+
|
86
|
+
|
87
|
+
*** Output of to_s ***
|
88
|
+
-----| WARNING | -----
|
89
|
+
Here is a paragraph.* Item 1 * Item 2 * Item 3
|
90
|
+
*** Output of Markdown.pl ***
|
91
|
+
<p>Here is a paragraph.</p>
|
92
|
+
|
93
|
+
<ul>
|
94
|
+
<li>Item 1</li>
|
95
|
+
<li>Item 2</li>
|
96
|
+
<li>Item 3</li>
|
97
|
+
</ul>
|
98
|
+
|
99
|
+
*** Output of Markdown.pl (parsed) ***
|
100
|
+
<p>Here is a paragraph.</p
|
101
|
+
><ul>
|
102
|
+
<li>Item 1</li
|
103
|
+
>
|
104
|
+
<li>Item 2</li
|
105
|
+
>
|
106
|
+
<li>Item 3</li
|
107
|
+
>
|
108
|
+
</ul
|
109
|
+
>
|
@@ -0,0 +1,105 @@
|
|
1
|
+
Write a comment here
|
2
|
+
*** Parameters: ***
|
3
|
+
{} # params
|
4
|
+
*** Markdown input: ***
|
5
|
+
- Due
|
6
|
+
1. tre
|
7
|
+
1. tre
|
8
|
+
1. tre
|
9
|
+
- Due
|
10
|
+
*** Output of inspect ***
|
11
|
+
md_el(:document,[
|
12
|
+
md_el(:ul,[
|
13
|
+
md_el(:li,[
|
14
|
+
md_par(["Due"]),
|
15
|
+
md_el(:ol,[
|
16
|
+
md_el(:li_span,["tre"],{:want_my_paragraph=>false},[]),
|
17
|
+
md_el(:li_span,["tre"],{:want_my_paragraph=>false},[]),
|
18
|
+
md_el(:li_span,["tre"],{:want_my_paragraph=>false},[])
|
19
|
+
],{},[])
|
20
|
+
],{:want_my_paragraph=>true},[]),
|
21
|
+
md_el(:li,[md_par(["Due"])],{:want_my_paragraph=>false},[])
|
22
|
+
],{},[])
|
23
|
+
],{},[])
|
24
|
+
*** Output of to_html ***
|
25
|
+
|
26
|
+
<ul>
|
27
|
+
<li>
|
28
|
+
<p>Due</p>
|
29
|
+
|
30
|
+
<ol>
|
31
|
+
<li>tre</li>
|
32
|
+
|
33
|
+
<li>tre</li>
|
34
|
+
|
35
|
+
<li>tre</li>
|
36
|
+
</ol>
|
37
|
+
</li>
|
38
|
+
|
39
|
+
<li>
|
40
|
+
<p>Due</p>
|
41
|
+
</li>
|
42
|
+
</ul>
|
43
|
+
|
44
|
+
*** Output of to_latex ***
|
45
|
+
\begin{itemize}%
|
46
|
+
\item Due
|
47
|
+
|
48
|
+
\begin{enumerate}%
|
49
|
+
\item tre
|
50
|
+
\item tre
|
51
|
+
\item tre
|
52
|
+
|
53
|
+
\end{enumerate}
|
54
|
+
|
55
|
+
\item Due
|
56
|
+
|
57
|
+
|
58
|
+
|
59
|
+
\end{itemize}
|
60
|
+
|
61
|
+
*** Output of to_md ***
|
62
|
+
-ue* tre
|
63
|
+
* tre
|
64
|
+
* tre
|
65
|
+
-ue
|
66
|
+
|
67
|
+
|
68
|
+
*** Output of to_s ***
|
69
|
+
DuetretretreDue
|
70
|
+
*** EOF ***
|
71
|
+
|
72
|
+
|
73
|
+
|
74
|
+
OK!
|
75
|
+
|
76
|
+
|
77
|
+
|
78
|
+
*** Output of Markdown.pl ***
|
79
|
+
<ul>
|
80
|
+
<li>Due
|
81
|
+
<ol>
|
82
|
+
<li>tre</li>
|
83
|
+
<li>tre</li>
|
84
|
+
<li>tre</li>
|
85
|
+
</ol></li>
|
86
|
+
<li>Due</li>
|
87
|
+
</ul>
|
88
|
+
|
89
|
+
*** Output of Markdown.pl (parsed) ***
|
90
|
+
<ul>
|
91
|
+
<li>Due
|
92
|
+
<ol>
|
93
|
+
<li>tre</li
|
94
|
+
>
|
95
|
+
<li>tre</li
|
96
|
+
>
|
97
|
+
<li>tre</li
|
98
|
+
>
|
99
|
+
</ol
|
100
|
+
></li
|
101
|
+
>
|
102
|
+
<li>Due</li
|
103
|
+
>
|
104
|
+
</ul
|
105
|
+
>
|