maruku 0.5.3 → 0.5.4
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 +14 -6
- data/bin/marutest +19 -10
- data/docs/changelog.html +49 -8
- data/docs/changelog.md +26 -1
- data/docs/entity_test.html +1 -1
- data/docs/exd.html +43 -24
- data/docs/index.html +4 -6
- data/docs/markdown_syntax.html +81 -170
- data/docs/maruku.html +4 -6
- data/docs/maruku.md +1 -1
- data/docs/proposal.html +21 -41
- data/lib/maruku.rb +5 -0
- data/lib/maruku/attributes.rb +3 -2
- data/lib/maruku/defaults.rb +3 -1
- data/lib/maruku/ext/math.rb +30 -0
- data/lib/maruku/ext/math/elements.rb +3 -2
- data/lib/maruku/ext/math/parsing.rb +81 -58
- data/lib/maruku/ext/math/to_html.rb +5 -5
- data/lib/maruku/helpers.rb +2 -0
- data/lib/maruku/input/charsource.rb +1 -1
- data/lib/maruku/input/extensions.rb +6 -5
- data/lib/maruku/input/parse_block.rb +7 -8
- data/lib/maruku/input/parse_doc.rb +1 -1
- data/lib/maruku/input/parse_span_better.rb +4 -4
- data/lib/maruku/input_textile2/t2_parser.rb +163 -0
- data/lib/maruku/maruku.rb +1 -1
- data/lib/maruku/output/s5/fancy.rb +756 -0
- data/lib/maruku/output/s5/to_s5.rb +104 -0
- data/lib/maruku/output/to_html.rb +103 -49
- data/lib/maruku/string_utils.rb +1 -1
- data/lib/maruku/textile2.rb +1 -0
- data/lib/maruku/version.rb +3 -1
- data/maruku_gem.rb +33 -0
- data/tests/s5/s5profiling.md +48 -0
- data/tests/unittest/blanks_in_code.md +6 -12
- data/tests/unittest/code3.md +3 -5
- data/tests/unittest/data_loss.md +53 -0
- data/tests/unittest/email.md +2 -2
- data/tests/unittest/entities.md +3 -5
- data/tests/unittest/footnotes.md +5 -5
- data/tests/unittest/ie.md +1 -1
- data/tests/unittest/images.md +2 -2
- data/tests/unittest/inline_html.md +6 -10
- data/tests/unittest/links.md +1 -1
- data/tests/unittest/list2.md +5 -5
- data/tests/unittest/lists.md +13 -13
- data/tests/unittest/lists_ol.md +13 -13
- data/tests/unittest/math/math2.md +84 -0
- data/tests/unittest/math/notmath.md +48 -0
- data/tests/unittest/syntax_hl.md +3 -5
- metadata +11 -2
@@ -27,9 +27,9 @@ This block is composed of 2
|
|
27
27
|
*** Output of inspect ***
|
28
28
|
md_el(:document,[
|
29
29
|
md_par(["This block is composed of three lines:"]),
|
30
|
-
md_el(:code,[],{:raw_code=>"one\n\nthree
|
30
|
+
md_el(:code,[],{:raw_code=>"one\n\nthree"},[]),
|
31
31
|
md_par(["This block is composed of 5"]),
|
32
|
-
md_el(:code,[],{:raw_code=>"one\n\n\nfour
|
32
|
+
md_el(:code,[],{:raw_code=>"one\n\n\nfour"},[]),
|
33
33
|
md_par(["This block is composed of 2"]),
|
34
34
|
md_el(:code,[],{:raw_code=>"two"},[])
|
35
35
|
],{},[])
|
@@ -39,17 +39,14 @@ md_el(:document,[
|
|
39
39
|
|
40
40
|
<pre><code>one
|
41
41
|
|
42
|
-
three
|
43
|
-
</code></pre>
|
42
|
+
three</code></pre>
|
44
43
|
|
45
44
|
<p>This block is composed of 5</p>
|
46
45
|
|
47
46
|
<pre><code>one
|
48
47
|
|
49
48
|
|
50
|
-
four
|
51
|
-
|
52
|
-
</code></pre>
|
49
|
+
four</code></pre>
|
53
50
|
|
54
51
|
<p>This block is composed of 2</p>
|
55
52
|
|
@@ -60,16 +57,13 @@ This block is composed of three lines:
|
|
60
57
|
|
61
58
|
\begin{verbatim}one
|
62
59
|
|
63
|
-
three
|
64
|
-
\end{verbatim}
|
60
|
+
three\end{verbatim}
|
65
61
|
This block is composed of 5
|
66
62
|
|
67
63
|
\begin{verbatim}one
|
68
64
|
|
69
65
|
|
70
|
-
four
|
71
|
-
|
72
|
-
\end{verbatim}
|
66
|
+
four\end{verbatim}
|
73
67
|
This block is composed of 2
|
74
68
|
|
75
69
|
\begin{verbatim}two\end{verbatim}
|
data/tests/unittest/code3.md
CHANGED
@@ -24,7 +24,7 @@ md_el(:document,[
|
|
24
24
|
md_par(["This is code (4 spaces):"]),
|
25
25
|
md_el(:code,[],{:raw_code=>"Code"},[]),
|
26
26
|
md_par(["This is not code"]),
|
27
|
-
md_el(:code,[],{:raw_code=>"Code
|
27
|
+
md_el(:code,[],{:raw_code=>"Code"},[]),
|
28
28
|
md_par(["This is code (1 tab):"]),
|
29
29
|
md_el(:code,[],{:raw_code=>"Code"},[]),
|
30
30
|
md_par(["This is not code"]),
|
@@ -38,8 +38,7 @@ md_el(:document,[
|
|
38
38
|
|
39
39
|
<p>This is not code</p>
|
40
40
|
|
41
|
-
<pre><code>Code
|
42
|
-
</code></pre>
|
41
|
+
<pre><code>Code</code></pre>
|
43
42
|
|
44
43
|
<p>This is code (1 tab):</p>
|
45
44
|
|
@@ -55,8 +54,7 @@ This is code (4 spaces):
|
|
55
54
|
\begin{verbatim}Code\end{verbatim}
|
56
55
|
This is not code
|
57
56
|
|
58
|
-
\begin{verbatim}Code
|
59
|
-
\end{verbatim}
|
57
|
+
\begin{verbatim}Code\end{verbatim}
|
60
58
|
This is code (1 tab):
|
61
59
|
|
62
60
|
\begin{verbatim}Code\end{verbatim}
|
@@ -0,0 +1,53 @@
|
|
1
|
+
Write a comment here
|
2
|
+
*** Parameters: ***
|
3
|
+
{} # params
|
4
|
+
*** Markdown input: ***
|
5
|
+
1. abcd
|
6
|
+
efgh
|
7
|
+
ijkl
|
8
|
+
|
9
|
+
*** Output of inspect ***
|
10
|
+
md_el(:document,[
|
11
|
+
md_el(:ol,[md_el(:li_span,["abcd efgh ijkl"],{:want_my_paragraph=>false},[])],{},[])
|
12
|
+
],{},[])
|
13
|
+
*** Output of to_html ***
|
14
|
+
|
15
|
+
<ol>
|
16
|
+
<li>abcd efgh ijkl</li>
|
17
|
+
</ol>
|
18
|
+
|
19
|
+
*** Output of to_latex ***
|
20
|
+
\begin{enumerate}%
|
21
|
+
\item abcd efgh ijkl
|
22
|
+
|
23
|
+
\end{enumerate}
|
24
|
+
|
25
|
+
*** Output of to_md ***
|
26
|
+
1. abcd efgh ijkl
|
27
|
+
|
28
|
+
|
29
|
+
*** Output of to_s ***
|
30
|
+
abcd efgh ijkl
|
31
|
+
*** EOF ***
|
32
|
+
|
33
|
+
|
34
|
+
|
35
|
+
OK!
|
36
|
+
|
37
|
+
|
38
|
+
|
39
|
+
*** Output of Markdown.pl ***
|
40
|
+
<ol>
|
41
|
+
<li>abcd
|
42
|
+
efgh
|
43
|
+
ijkl</li>
|
44
|
+
</ol>
|
45
|
+
|
46
|
+
*** Output of Markdown.pl (parsed) ***
|
47
|
+
<ol>
|
48
|
+
<li>abcd
|
49
|
+
efgh
|
50
|
+
ijkl</li
|
51
|
+
>
|
52
|
+
</ol
|
53
|
+
>
|
data/tests/unittest/email.md
CHANGED
@@ -33,9 +33,9 @@ This is an email address:
|
|
33
33
|
|
34
34
|
|
35
35
|
*** Output of Markdown.pl ***
|
36
|
-
<p>This is an email address: <a href="&#
|
36
|
+
<p>This is an email address: <a href="mailto:andrea@invalid.it">andrea@invalid.it</a></p>
|
37
37
|
|
38
38
|
*** Output of Markdown.pl (parsed) ***
|
39
|
-
<p>This is an email address: <a href='&#
|
39
|
+
<p>This is an email address: <a href='&#x6D;a&#x69;&#108;&#x74;&#x6F;:&#97;&#x6E;&#x64;&#x72;e&#x61;&#64;&#x69;&#110;&#x76;&#97;l&#x69;d&#x2E;&#105;t'>andrea@invalid.it</a
|
40
40
|
></p
|
41
41
|
>
|
data/tests/unittest/entities.md
CHANGED
@@ -43,7 +43,7 @@ md_el(:document,[
|
|
43
43
|
"Entity-substitution does not happen in code blocks or inline code."
|
44
44
|
]),
|
45
45
|
md_par(["The following should not be translated:"]),
|
46
|
-
md_el(:code,[],{:raw_code=>"©
|
46
|
+
md_el(:code,[],{:raw_code=>"©"},[]),
|
47
47
|
md_par(["It should read just like this: ", md_code("©"), "."])
|
48
48
|
],{},[])
|
49
49
|
*** Output of to_html ***
|
@@ -59,8 +59,7 @@ md_el(:document,[
|
|
59
59
|
|
60
60
|
<p>The following should not be translated:</p>
|
61
61
|
|
62
|
-
<pre><code>&copy
|
63
|
-
</code></pre>
|
62
|
+
<pre><code>&copy;</code></pre>
|
64
63
|
|
65
64
|
<p>It should read just like this: <code>&copy;</code>.</p>
|
66
65
|
|
@@ -81,8 +80,7 @@ Entity-substitution does not happen in code blocks or inline code.
|
|
81
80
|
|
82
81
|
The following should not be translated:
|
83
82
|
|
84
|
-
\begin{verbatim}©
|
85
|
-
\end{verbatim}
|
83
|
+
\begin{verbatim}©\end{verbatim}
|
86
84
|
It should read just like this: \colorbox[rgb]{1.00,0.93,1.00}{\tt \char38copy\char59}.
|
87
85
|
|
88
86
|
|
data/tests/unittest/footnotes.md
CHANGED
@@ -44,7 +44,7 @@ md_el(:document,[
|
|
44
44
|
md_par([
|
45
45
|
"And that",
|
46
46
|
md_entity("rsquo"),
|
47
|
-
"s the footnote. This is second sentence (same paragraph)"
|
47
|
+
"s the footnote. This is second sentence (same paragraph)."
|
48
48
|
])
|
49
49
|
],{:footnote_id=>"^b"},[]),
|
50
50
|
md_el(:footnote,[
|
@@ -59,7 +59,7 @@ md_el(:document,[
|
|
59
59
|
|
60
60
|
<p>This is not a footnote.</p>
|
61
61
|
<div class='footnotes'><hr /><ol><li id='fn:1'>
|
62
|
-
<p>And that’s the footnote. This is second sentence (same paragraph)
|
62
|
+
<p>And that’s the footnote. This is second sentence (same paragraph).</p>
|
63
63
|
<a href='#fnref:1' rev='footnote'>↩</a></li><li id='fn:2'>
|
64
64
|
<p>This is the very long one.</p>
|
65
65
|
|
@@ -70,7 +70,7 @@ md_el(:document,[
|
|
70
70
|
<p>That’s the second paragraph of the footnote.</p>
|
71
71
|
<a href='#fnref:3' rev='footnote'>↩</a></li></ol></div>
|
72
72
|
*** Output of to_latex ***
|
73
|
-
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.
|
73
|
+
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.
|
74
74
|
|
75
75
|
That'{}s the second paragraph.} and another \footnote{And that'{}s the footnote.
|
76
76
|
|
@@ -89,7 +89,7 @@ That s the second paragraph of the
|
|
89
89
|
footnote.
|
90
90
|
|
91
91
|
And that s the footnote. This is second
|
92
|
-
sentence (same paragraph)
|
92
|
+
sentence (same paragraph).
|
93
93
|
|
94
94
|
This is the very long one.
|
95
95
|
|
@@ -99,7 +99,7 @@ This is not a footnote.
|
|
99
99
|
|
100
100
|
|
101
101
|
*** Output of to_s ***
|
102
|
-
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.
|
102
|
+
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.
|
103
103
|
*** EOF ***
|
104
104
|
|
105
105
|
|
data/tests/unittest/ie.md
CHANGED
@@ -32,7 +32,7 @@ md_el(:document,[
|
|
32
32
|
|
33
33
|
<pre><code><p>here's an apostrophe & a quote "</p></code></pre>
|
34
34
|
|
35
|
-
<pre><code class='xml' lang='xml'><p>here's an apostrophe & a quote "</p></code></pre>
|
35
|
+
<pre lang='xml'><code class='xml' lang='xml'><p>here's an apostrophe & a quote "</p></code></pre>
|
36
36
|
|
37
37
|
<pre><code class='not_supported' lang='not_supported'><p>here's an apostrophe & a quote "</p></code></pre>
|
38
38
|
|
data/tests/unittest/images.md
CHANGED
@@ -59,9 +59,9 @@ md_el(:document,[
|
|
59
59
|
|
60
60
|
<p>Please mouseover to see the title: <img src='http://jigsaw.w3.org/css-validator/images/vcss' alt='Title ok!' /></p>
|
61
61
|
|
62
|
-
<p>I’ll say it one more time: this page does not use <img
|
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='Optional title attribute' /></p>
|
63
63
|
|
64
|
-
<p>This is double size: <img
|
64
|
+
<p>This is double size: <img src='http://jigsaw.w3.org/css-validator/images/vcss' alt='Optional title attribute' /></p>
|
65
65
|
|
66
66
|
*** Output of to_latex ***
|
67
67
|
This page does not uilizes
|
@@ -55,10 +55,10 @@ The following is invalid HTML, and will generate an error:
|
|
55
55
|
*** Output of inspect ***
|
56
56
|
md_el(:document,[
|
57
57
|
md_par(["Input:"]),
|
58
|
-
md_el(:code,[],{:raw_code=>"<em>Emphasis</em
|
58
|
+
md_el(:code,[],{:raw_code=>"<em>Emphasis</em>"},[]),
|
59
59
|
md_par(["Result: ", md_html("<em>Emphasis</em>")]),
|
60
60
|
md_par(["Input:"]),
|
61
|
-
md_el(:code,[],{:raw_code=>"<img src=\"http://jigsaw.w3.org/css-validator/images/vcss\"
|
61
|
+
md_el(:code,[],{:raw_code=>"<img src=\"http://jigsaw.w3.org/css-validator/images/vcss\"/>"},[]),
|
62
62
|
md_par([
|
63
63
|
"Result on span: ",
|
64
64
|
md_html("<img src=\"http://jigsaw.w3.org/css-validator/images/vcss\" />")
|
@@ -77,15 +77,13 @@ md_el(:document,[
|
|
77
77
|
|
78
78
|
<p>Input:</p>
|
79
79
|
|
80
|
-
<pre><code><em>Emphasis</em>
|
81
|
-
</code></pre>
|
80
|
+
<pre><code><em>Emphasis</em></code></pre>
|
82
81
|
|
83
82
|
<p>Result: <em>Emphasis</em></p>
|
84
83
|
|
85
84
|
<p>Input:</p>
|
86
85
|
|
87
|
-
<pre><code><img src="http://jigsaw.w3.org/css-validator/images/vcss"/>
|
88
|
-
</code></pre>
|
86
|
+
<pre><code><img src="http://jigsaw.w3.org/css-validator/images/vcss"/></code></pre>
|
89
87
|
|
90
88
|
<p>Result on span: <img src='http://jigsaw.w3.org/css-validator/images/vcss' /></p>
|
91
89
|
|
@@ -158,14 +156,12 @@ md_el(:document,[
|
|
158
156
|
*** Output of to_latex ***
|
159
157
|
Input:
|
160
158
|
|
161
|
-
\begin{verbatim}<em>Emphasis</em
|
162
|
-
\end{verbatim}
|
159
|
+
\begin{verbatim}<em>Emphasis</em>\end{verbatim}
|
163
160
|
Result:
|
164
161
|
|
165
162
|
Input:
|
166
163
|
|
167
|
-
\begin{verbatim}<img src="http://jigsaw.w3.org/css-validator/images/vcss"
|
168
|
-
\end{verbatim}
|
164
|
+
\begin{verbatim}<img src="http://jigsaw.w3.org/css-validator/images/vcss"/>\end{verbatim}
|
169
165
|
Result on span:
|
170
166
|
|
171
167
|
Result alone:
|
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>
|
data/tests/unittest/list2.md
CHANGED
@@ -18,7 +18,7 @@ md_el(:document,[
|
|
18
18
|
md_par([
|
19
19
|
"This is the second paragraph in the list item. You",
|
20
20
|
md_entity("rsquo"),
|
21
|
-
"re only required to indent the first line. Lorem ipsum
|
21
|
+
"re only required to indent the first line. Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
|
22
22
|
])
|
23
23
|
],{:want_my_paragraph=>true},[]),
|
24
24
|
md_el(:li,[md_par(["other"])],{:want_my_paragraph=>false},[])
|
@@ -30,7 +30,7 @@ md_el(:document,[
|
|
30
30
|
<li>
|
31
31
|
<p>This is a list item with two paragraphs.</p>
|
32
32
|
|
33
|
-
<p>This is the second paragraph in the list item. You’re only required to indent the first line. Lorem ipsum
|
33
|
+
<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>
|
34
34
|
</li>
|
35
35
|
|
36
36
|
<li>
|
@@ -42,7 +42,7 @@ md_el(:document,[
|
|
42
42
|
\begin{itemize}%
|
43
43
|
\item This is a list item with two paragraphs.
|
44
44
|
|
45
|
-
This is the second paragraph in the list item. You'{}re only required to indent the first line. Lorem ipsum
|
45
|
+
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.
|
46
46
|
|
47
47
|
|
48
48
|
\item other
|
@@ -53,12 +53,12 @@ This is the second paragraph in the list item. You'{}re only required to indent
|
|
53
53
|
|
54
54
|
*** Output of to_md ***
|
55
55
|
-This is a list item with two paragraphs.
|
56
|
-
This is the second paragraph in the list item. Youre only required to indent the first line. Lorem ipsum
|
56
|
+
This is the second paragraph in the list item. Youre only required to indent the first line. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
|
57
57
|
-ther
|
58
58
|
|
59
59
|
|
60
60
|
*** Output of to_s ***
|
61
|
-
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
|
61
|
+
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 dolor sit amet, consectetuer adipiscing elit.other
|
62
62
|
*** EOF ***
|
63
63
|
|
64
64
|
|
data/tests/unittest/lists.md
CHANGED
@@ -44,10 +44,10 @@ md_el(:document,[
|
|
44
44
|
"Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing."
|
45
45
|
],{:want_my_paragraph=>false},[]),
|
46
46
|
md_el(:li_span,[
|
47
|
-
"Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing"
|
47
|
+
"Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing."
|
48
48
|
],{:want_my_paragraph=>false},[]),
|
49
49
|
md_el(:li_span,[
|
50
|
-
"Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing"
|
50
|
+
"Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing."
|
51
51
|
],{:want_my_paragraph=>false},[]),
|
52
52
|
md_el(:li_span,[
|
53
53
|
"Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing."
|
@@ -72,7 +72,7 @@ md_el(:document,[
|
|
72
72
|
md_par([
|
73
73
|
"This is the second paragraph in the list item. You",
|
74
74
|
md_entity("rsquo"),
|
75
|
-
"re only required to indent the first line. Lorem ipsum
|
75
|
+
"re only required to indent the first line. Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
|
76
76
|
])
|
77
77
|
],{:want_my_paragraph=>true},[]),
|
78
78
|
md_el(:li,[md_par(["Another item in the same list."])],{:want_my_paragraph=>false},[])
|
@@ -85,9 +85,9 @@ md_el(:document,[
|
|
85
85
|
|
86
86
|
<li>Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.</li>
|
87
87
|
|
88
|
-
<li>Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing
|
88
|
+
<li>Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.</li>
|
89
89
|
|
90
|
-
<li>Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing
|
90
|
+
<li>Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.</li>
|
91
91
|
|
92
92
|
<li>Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.</li>
|
93
93
|
</ul>
|
@@ -112,7 +112,7 @@ md_el(:document,[
|
|
112
112
|
<li>
|
113
113
|
<p>This is a list item with two paragraphs.</p>
|
114
114
|
|
115
|
-
<p>This is the second paragraph in the list item. You’re only required to indent the first line. Lorem ipsum
|
115
|
+
<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>
|
116
116
|
</li>
|
117
117
|
|
118
118
|
<li>
|
@@ -124,8 +124,8 @@ md_el(:document,[
|
|
124
124
|
\begin{itemize}%
|
125
125
|
\item Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
|
126
126
|
\item Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.
|
127
|
-
\item Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing
|
128
|
-
\item Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing
|
127
|
+
\item Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.
|
128
|
+
\item Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.
|
129
129
|
\item Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.
|
130
130
|
|
131
131
|
\end{itemize}
|
@@ -147,7 +147,7 @@ Ancora
|
|
147
147
|
\begin{itemize}%
|
148
148
|
\item This is a list item with two paragraphs.
|
149
149
|
|
150
|
-
This is the second paragraph in the list item. You'{}re only required to indent the first line. Lorem ipsum
|
150
|
+
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.
|
151
151
|
|
152
152
|
|
153
153
|
\item Another item in the same list.
|
@@ -170,11 +170,11 @@ adipiscing.
|
|
170
170
|
-onec sit amet nisl. Aliquam semper
|
171
171
|
ipsum sit amet velit. Suspendisse
|
172
172
|
id sem consectetuer libero luctus
|
173
|
-
adipiscing
|
173
|
+
adipiscing.
|
174
174
|
-onec sit amet nisl. Aliquam semper
|
175
175
|
ipsum sit amet velit. Suspendisse
|
176
176
|
id sem consectetuer libero luctus
|
177
|
-
adipiscing
|
177
|
+
adipiscing.
|
178
178
|
-onec sit amet nisl. Aliquam semper
|
179
179
|
ipsum sit amet velit. Suspendisse
|
180
180
|
id sem consectetuer libero luctus
|
@@ -189,12 +189,12 @@ ATTENZIONE!
|
|
189
189
|
Ancora
|
190
190
|
|
191
191
|
-This is a list item with two paragraphs.
|
192
|
-
This is the second paragraph in the list item. Youre only required to indent the first line. Lorem ipsum
|
192
|
+
This is the second paragraph in the list item. Youre only required to indent the first line. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
|
193
193
|
-nother item in the same list.
|
194
194
|
|
195
195
|
|
196
196
|
*** Output of to_s ***
|
197
|
-
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
|
197
|
+
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 adipiscing.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 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 dolor sit amet, consectetuer adipiscing elit.Another item in the same list.
|
198
198
|
*** EOF ***
|
199
199
|
|
200
200
|
|
data/tests/unittest/lists_ol.md
CHANGED
@@ -51,10 +51,10 @@ md_el(:document,[
|
|
51
51
|
"Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing."
|
52
52
|
],{:want_my_paragraph=>false},[]),
|
53
53
|
md_el(:li_span,[
|
54
|
-
"Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing"
|
54
|
+
"Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing."
|
55
55
|
],{:want_my_paragraph=>false},[]),
|
56
56
|
md_el(:li_span,[
|
57
|
-
"Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing"
|
57
|
+
"Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing."
|
58
58
|
],{:want_my_paragraph=>false},[]),
|
59
59
|
md_el(:li_span,[
|
60
60
|
"Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing."
|
@@ -91,7 +91,7 @@ md_el(:document,[
|
|
91
91
|
md_par([
|
92
92
|
"This is the second paragraph in the list item. You",
|
93
93
|
md_entity("rsquo"),
|
94
|
-
"re only required to indent the first line. Lorem ipsum
|
94
|
+
"re only required to indent the first line. Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
|
95
95
|
])
|
96
96
|
],{:want_my_paragraph=>true},[]),
|
97
97
|
md_el(:li,[md_par(["Another item in the same list."])],{:want_my_paragraph=>false},[])
|
@@ -104,9 +104,9 @@ md_el(:document,[
|
|
104
104
|
|
105
105
|
<li>Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.</li>
|
106
106
|
|
107
|
-
<li>Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing
|
107
|
+
<li>Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.</li>
|
108
108
|
|
109
|
-
<li>Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing
|
109
|
+
<li>Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.</li>
|
110
110
|
|
111
111
|
<li>Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.</li>
|
112
112
|
</ol>
|
@@ -153,7 +153,7 @@ md_el(:document,[
|
|
153
153
|
<li>
|
154
154
|
<p>This is a list item with two paragraphs.</p>
|
155
155
|
|
156
|
-
<p>This is the second paragraph in the list item. You’re only required to indent the first line. Lorem ipsum
|
156
|
+
<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>
|
157
157
|
</li>
|
158
158
|
|
159
159
|
<li>
|
@@ -165,8 +165,8 @@ md_el(:document,[
|
|
165
165
|
\begin{enumerate}%
|
166
166
|
\item Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
|
167
167
|
\item Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.
|
168
|
-
\item Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing
|
169
|
-
\item Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing
|
168
|
+
\item Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.
|
169
|
+
\item Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.
|
170
170
|
\item Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.
|
171
171
|
|
172
172
|
\end{enumerate}
|
@@ -206,7 +206,7 @@ Ancora
|
|
206
206
|
\begin{itemize}%
|
207
207
|
\item This is a list item with two paragraphs.
|
208
208
|
|
209
|
-
This is the second paragraph in the list item. You'{}re only required to indent the first line. Lorem ipsum
|
209
|
+
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.
|
210
210
|
|
211
211
|
|
212
212
|
\item Another item in the same list.
|
@@ -229,11 +229,11 @@ This is the second paragraph in the list item. You'{}re only required to indent
|
|
229
229
|
3. Donec sit amet nisl. Aliquam semper
|
230
230
|
ipsum sit amet velit. Suspendisse
|
231
231
|
id sem consectetuer libero luctus
|
232
|
-
adipiscing
|
232
|
+
adipiscing.
|
233
233
|
4. Donec sit amet nisl. Aliquam semper
|
234
234
|
ipsum sit amet velit. Suspendisse
|
235
235
|
id sem consectetuer libero luctus
|
236
|
-
adipiscing
|
236
|
+
adipiscing.
|
237
237
|
5. Donec sit amet nisl. Aliquam semper
|
238
238
|
ipsum sit amet velit. Suspendisse
|
239
239
|
id sem consectetuer libero luctus
|
@@ -259,12 +259,12 @@ Ancora
|
|
259
259
|
Ancora
|
260
260
|
|
261
261
|
-This is a list item with two paragraphs.
|
262
|
-
This is the second paragraph in the list item. Youre only required to indent the first line. Lorem ipsum
|
262
|
+
This is the second paragraph in the list item. Youre only required to indent the first line. Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
|
263
263
|
-nother item in the same list.
|
264
264
|
|
265
265
|
|
266
266
|
*** Output of to_s ***
|
267
|
-
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
|
267
|
+
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 adipiscing.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 adipiscing.AncoraThis is a list item with two paragraphs. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.ATTENZIONE!UnoDuetretretreDueSuspendisse 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 dolor sit amet, consectetuer adipiscing elit.Another item in the same list.
|
268
268
|
*** EOF ***
|
269
269
|
|
270
270
|
|