maruku 0.5.6 → 0.5.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (94) hide show
  1. data/bin/maruku +16 -9
  2. data/bin/marutest +2 -0
  3. data/docs/maruku.md +0 -51
  4. data/lib/maruku/input/linesource.rb +1 -0
  5. data/lib/maruku/input/parse_block.rb +28 -19
  6. data/lib/maruku/input/parse_doc.rb +1 -0
  7. data/lib/maruku/output/to_html.rb +24 -8
  8. data/lib/maruku/output/to_latex.rb +1 -1
  9. data/lib/maruku/version.rb +1 -1
  10. data/tests/unittest/abbreviations.md +2 -12
  11. data/tests/unittest/alt.md +1 -10
  12. data/tests/unittest/attributes/att2.md +1 -3
  13. data/tests/unittest/attributes/att3.md +1 -11
  14. data/tests/unittest/attributes/attributes.md +1 -16
  15. data/tests/unittest/attributes/circular.md +1 -9
  16. data/tests/unittest/attributes/default.md +1 -10
  17. data/tests/unittest/blank.md +1 -9
  18. data/tests/unittest/blanks_in_code.md +1 -26
  19. data/tests/unittest/bug_def.md +1 -8
  20. data/tests/unittest/bug_table.md +1 -11
  21. data/tests/unittest/code.md +1 -14
  22. data/tests/unittest/code2.md +1 -16
  23. data/tests/unittest/code3.md +1 -26
  24. data/tests/unittest/data_loss.md +1 -12
  25. data/tests/unittest/easy.md +1 -11
  26. data/tests/unittest/email.md +3 -11
  27. data/tests/unittest/encoding/iso-8859-1.md +1 -9
  28. data/tests/unittest/encoding/utf-8.md +1 -7
  29. data/tests/unittest/entities.md +78 -35
  30. data/tests/unittest/escaping.md +5 -25
  31. data/tests/unittest/extra_dl.md +1 -10
  32. data/tests/unittest/extra_header_id.md +1 -18
  33. data/tests/unittest/extra_table1.md +1 -8
  34. data/tests/unittest/footnotes.md +1 -21
  35. data/tests/unittest/headers.md +1 -11
  36. data/tests/unittest/hex_entities.md +1 -8
  37. data/tests/unittest/hrule.md +1 -8
  38. data/tests/unittest/html2.md +1 -12
  39. data/tests/unittest/html3.md +1 -15
  40. data/tests/unittest/html4.md +1 -6
  41. data/tests/unittest/html5.md +1 -8
  42. data/tests/unittest/ie.md +32 -33
  43. data/tests/unittest/images.md +2 -19
  44. data/tests/unittest/images2.md +1 -10
  45. data/tests/unittest/inline_html.md +22 -145
  46. data/tests/unittest/inline_html2.md +1 -3
  47. data/tests/unittest/links.md +22 -8
  48. data/tests/unittest/links2.md +1 -8
  49. data/tests/unittest/list1.md +1 -19
  50. data/tests/unittest/list12.md +43 -0
  51. data/tests/unittest/list2.md +1 -21
  52. data/tests/unittest/list3.md +1 -29
  53. data/tests/unittest/list4.md +1 -19
  54. data/tests/unittest/lists.md +1 -59
  55. data/tests/unittest/lists10.md +2 -13
  56. data/tests/unittest/lists11.md +2 -28
  57. data/tests/unittest/lists6.md +1 -0
  58. data/tests/unittest/lists7.md +56 -8
  59. data/tests/unittest/lists7b.md +136 -0
  60. data/tests/unittest/lists8.md +1 -22
  61. data/tests/unittest/lists9.md +1 -21
  62. data/tests/unittest/lists_after_paragraph.md +3 -48
  63. data/tests/unittest/lists_ol.md +1 -81
  64. data/tests/unittest/loss.md +1 -4
  65. data/tests/unittest/math/equations.md +1 -14
  66. data/tests/unittest/math/inline.md +1 -15
  67. data/tests/unittest/math/math2.md +38 -12
  68. data/tests/unittest/math/notmath.md +1 -9
  69. data/tests/unittest/math/table.md +1 -9
  70. data/tests/unittest/math/table2.md +33 -10
  71. data/tests/unittest/misc_sw.md +1 -195
  72. data/tests/unittest/notyet/escape.md +3 -13
  73. data/tests/unittest/notyet/header_after_par.md +1 -11
  74. data/tests/unittest/notyet/ticks.md +2 -11
  75. data/tests/unittest/notyet/triggering.md +1 -32
  76. data/tests/unittest/olist.md +1 -15
  77. data/tests/unittest/one.md +1 -8
  78. data/tests/unittest/paragraph.md +1 -8
  79. data/tests/unittest/paragraph_rules/dont_merge_ref.md +1 -10
  80. data/tests/unittest/paragraph_rules/tab_is_blank.md +1 -9
  81. data/tests/unittest/paragraphs.md +1 -14
  82. data/tests/unittest/recover/recover_links.md +1 -6
  83. data/tests/unittest/references/long_example.md +1 -17
  84. data/tests/unittest/references/spaces_and_numbers.md +1 -0
  85. data/tests/unittest/smartypants.md +21 -6
  86. data/tests/unittest/syntax_hl.md +1 -24
  87. data/tests/unittest/table_attributes.md +1 -8
  88. data/tests/unittest/test.md +1 -5
  89. data/tests/unittest/wrapping.md +1 -18
  90. data/tests/unittest/xml.md +1 -15
  91. data/tests/unittest/xml2.md +1 -3
  92. data/tests/unittest/xml3.md +1 -9
  93. data/tests/unittest/xml_instruction.md +1 -10
  94. metadata +211 -215
data/tests/unittest/lists11.md CHANGED
@@ -7,51 +7,25 @@ Write a comment here
7
7
  *** Output of inspect ***
8
8
  md_el(:document,[md_par(["- \316\255\316\275\316\261"])],{},[])
9
9
  *** Output of to_html ***
10
-
11
10
  <p>- ένα</p>
12
-
13
11
  *** Output of to_latex ***
14
12
  - ένα
15
-
16
- Non passa
17
13
  *** Output of to_md ***
18
14
  - ένα
19
-
20
-
21
15
  *** Output of to_s ***
22
16
  - ένα
23
17
  *** EOF ***
24
18
 
25
19
 
26
20
 
21
+ OK!
27
22
 
28
- Failed tests: [:to_latex]
29
23
 
30
- *** Output of inspect ***
31
- md_el(:document,[md_par(["- \316\255\316\275\316\261"])],{},[])
32
- *** Output of to_html ***
33
24
 
34
- <p>- ένα</p>
35
-
36
- *** Output of to_latex ***
37
- -----| WARNING | -----
38
- - ένα
39
-
40
-
41
- *** Output of to_md ***
42
- - ένα
43
-
44
-
45
- *** Output of to_s ***
46
- - ένα
47
25
  *** Output of Markdown.pl ***
48
26
  <ul>
49
27
  <li>ένα</li>
50
28
  </ul>
51
29
 
52
30
  *** Output of Markdown.pl (parsed) ***
53
- <ul>
54
- <li>ένα</li
55
- >
56
- </ul
57
- >
31
+ Error: #<NoMethodError: private method `write_children' called for <div> ... </>:REXML::Element>
data/tests/unittest/lists6.md CHANGED
@@ -51,3 +51,4 @@ md_el(:document,[],{},[])
51
51
 
52
52
 
53
53
  *** Output of Markdown.pl (parsed) ***
54
+ Error: #<NoMethodError: private method `write_children' called for <div/>:REXML::Element>
data/tests/unittest/lists7.md CHANGED
@@ -1,31 +1,79 @@
1
- * Tab
2
- * Tab
3
- * Tab
4
-
1
+ I'm not sure if this should work at all...
5
2
 
6
3
  *** Parameters: ***
7
- {}
4
+ {} # params
8
5
  *** Markdown input: ***
6
+ Ciao
7
+
8
+ * Tab
9
+ * Tab
10
+ * Tab
9
11
 
10
12
  *** Output of inspect ***
11
- md_el(:document,[],{},[])
13
+ nil
12
14
  *** Output of to_html ***
15
+ <p>Ciao</p>
13
16
 
17
+ <ul>
18
+ <li>Tab * Tab * Tab</li>
19
+ </ul>
14
20
  *** Output of to_latex ***
21
+ Ciao
22
+
23
+ \begin{itemize}%
24
+ \item Tab * Tab * Tab
15
25
 
26
+ \end{itemize}
16
27
  *** Output of to_md ***
28
+ Ciao
17
29
 
30
+ -ab * Tab * Tab
18
31
  *** Output of to_s ***
19
-
32
+ CiaoTab * Tab * Tab
20
33
  *** EOF ***
21
34
 
22
35
 
23
36
 
24
- OK!
25
37
 
38
+ Failed tests: [:inspect]
26
39
 
40
+ *** Output of inspect ***
41
+ -----| WARNING | -----
42
+ md_el(:document,[
43
+ md_par(["Ciao"]),
44
+ md_el(:ul,[md_el(:li_span,["Tab * Tab * Tab"],{:want_my_paragraph=>false},[])],{},[])
45
+ ],{},[])
46
+ *** Output of to_html ***
47
+ <p>Ciao</p>
48
+
49
+ <ul>
50
+ <li>Tab * Tab * Tab</li>
51
+ </ul>
52
+ *** Output of to_latex ***
53
+ Ciao
27
54
 
55
+ \begin{itemize}%
56
+ \item Tab * Tab * Tab
57
+
58
+ \end{itemize}
59
+ *** Output of to_md ***
60
+ Ciao
61
+
62
+ -ab * Tab * Tab
63
+ *** Output of to_s ***
64
+ CiaoTab * Tab * Tab
28
65
  *** Output of Markdown.pl ***
66
+ <p>Ciao</p>
29
67
 
68
+ <ul>
69
+ <li>Tab
70
+ <ul>
71
+ <li>Tab
72
+ <ul>
73
+ <li>Tab</li>
74
+ </ul></li>
75
+ </ul></li>
76
+ </ul>
30
77
 
31
78
  *** Output of Markdown.pl (parsed) ***
79
+ Error: #<NoMethodError: private method `write_children' called for <div> ... </>:REXML::Element>
data/tests/unittest/lists7b.md ADDED
@@ -0,0 +1,136 @@
1
+ Test case given by Scott.
2
+
3
+ http://rubyforge.org/tracker/index.php?func=detail&aid=8862&group_id=2795&atid=10735
4
+
5
+ a should not be indented.
6
+
7
+ *** Parameters: ***
8
+ {} # params
9
+ *** Markdown input: ***
10
+ * a
11
+ * a1
12
+ * a2
13
+ * b
14
+
15
+
16
+ *** Output of inspect ***
17
+ md_el(:document,[
18
+ md_el(:ul,[
19
+ md_el(:li,[
20
+ "a",
21
+ md_el(:ul,[
22
+ md_el(:li_span,["a1"],{:want_my_paragraph=>false},[]),
23
+ md_el(:li_span,["a2"],{:want_my_paragraph=>false},[])
24
+ ],{},[])
25
+ ],{:want_my_paragraph=>true},[]),
26
+ md_el(:li,[md_par(["b"])],{:want_my_paragraph=>false},[])
27
+ ],{},[])
28
+ ],{},[])
29
+ *** Output of to_html ***
30
+ <ul>
31
+ <li>
32
+ a
33
+
34
+ <ul>
35
+ <li>a1</li>
36
+
37
+ <li>a2</li>
38
+ </ul>
39
+ </li>
40
+
41
+ <li>
42
+ <p>b</p>
43
+ </li>
44
+ </ul>
45
+ *** Output of to_latex ***
46
+ \begin{itemize}%
47
+ \item a
48
+
49
+ \begin{itemize}%
50
+ \item a1
51
+ \item a2
52
+
53
+ \end{itemize}
54
+
55
+ \item b
56
+
57
+
58
+
59
+ \end{itemize}
60
+ *** Output of to_md ***
61
+ -* a1
62
+ * a2
63
+ -
64
+ *** Output of to_s ***
65
+ aa1a2b
66
+ *** EOF ***
67
+
68
+
69
+
70
+
71
+ Failed tests: [:inspect, :to_html]
72
+
73
+ *** Output of inspect ***
74
+ -----| WARNING | -----
75
+ md_el(:document,[
76
+ md_el(:ul,[
77
+ md_el(:li,[
78
+ md_par(["a"]),
79
+ md_el(:ul,[
80
+ md_el(:li_span,["a1"],{:want_my_paragraph=>false},[]),
81
+ md_el(:li_span,["a2"],{:want_my_paragraph=>false},[])
82
+ ],{},[])
83
+ ],{:want_my_paragraph=>true},[]),
84
+ md_el(:li,[md_par(["b"])],{:want_my_paragraph=>false},[])
85
+ ],{},[])
86
+ ],{},[])
87
+ *** Output of to_html ***
88
+ -----| WARNING | -----
89
+ <ul>
90
+ <li>
91
+ <p>a</p>
92
+
93
+ <ul>
94
+ <li>a1</li>
95
+
96
+ <li>a2</li>
97
+ </ul>
98
+ </li>
99
+
100
+ <li>
101
+ <p>b</p>
102
+ </li>
103
+ </ul>
104
+ *** Output of to_latex ***
105
+ \begin{itemize}%
106
+ \item a
107
+
108
+ \begin{itemize}%
109
+ \item a1
110
+ \item a2
111
+
112
+ \end{itemize}
113
+
114
+ \item b
115
+
116
+
117
+
118
+ \end{itemize}
119
+ *** Output of to_md ***
120
+ -* a1
121
+ * a2
122
+ -
123
+ *** Output of to_s ***
124
+ aa1a2b
125
+ *** Output of Markdown.pl ***
126
+ <ul>
127
+ <li>a
128
+ <ul>
129
+ <li>a1</li>
130
+ <li>a2</li>
131
+ </ul></li>
132
+ <li>b</li>
133
+ </ul>
134
+
135
+ *** Output of Markdown.pl (parsed) ***
136
+ Error: #<NoMethodError: private method `write_children' called for <div> ... </>:REXML::Element>
data/tests/unittest/lists8.md CHANGED
@@ -19,7 +19,6 @@ md_el(:document,[
19
19
  ],{},[])
20
20
  ],{},[])
21
21
  *** Output of to_html ***
22
-
23
22
  <p>Here is a paragraph.</p>
24
23
 
25
24
  <ul>
@@ -29,21 +28,16 @@ md_el(:document,[
29
28
 
30
29
  <li>Item 3</li>
31
30
  </ul>
32
-
33
31
  *** Output of to_latex ***
34
32
  Here is a paragraph.
35
33
 
36
34
  * Item 1 * Item 2 * Item 3
37
-
38
-
39
35
  *** Output of to_md ***
40
36
  Here is a paragraph.
41
37
 
42
38
  -tem 1
43
39
  -tem 2
44
40
  -tem 3
45
-
46
-
47
41
  *** Output of to_s ***
48
42
  Here is a paragraph.Item 1Item 2Item 3
49
43
  *** EOF ***
@@ -61,24 +55,18 @@ md_el(:document,[
61
55
  ],{},[])
62
56
  *** Output of to_html ***
63
57
  -----| WARNING | -----
64
-
65
58
  <p>Here is a paragraph.</p>
66
59
 
67
60
  <p>* Item 1 * Item 2 * Item 3</p>
68
-
69
61
  *** Output of to_latex ***
70
62
  Here is a paragraph.
71
63
 
72
64
  * Item 1 * Item 2 * Item 3
73
-
74
-
75
65
  *** Output of to_md ***
76
66
  -----| WARNING | -----
77
67
  Here is a paragraph.
78
68
 
79
69
  * Item 1 * Item 2 * Item 3
80
-
81
-
82
70
  *** Output of to_s ***
83
71
  -----| WARNING | -----
84
72
  Here is a paragraph.* Item 1 * Item 2 * Item 3
@@ -92,13 +80,4 @@ Here is a paragraph.* Item 1 * Item 2 * Item 3
92
80
  </ul>
93
81
 
94
82
  *** Output of Markdown.pl (parsed) ***
95
- <p>Here is a paragraph.</p
96
- ><ul>
97
- <li>Item 1</li
98
- >
99
- <li>Item 2</li
100
- >
101
- <li>Item 3</li
102
- >
103
- </ul
104
- >
83
+ Error: #<NoMethodError: private method `write_children' called for <div> ... </>:REXML::Element>
data/tests/unittest/lists9.md CHANGED
@@ -22,7 +22,6 @@ md_el(:document,[
22
22
  ],{},[])
23
23
  ],{},[])
24
24
  *** Output of to_html ***
25
-
26
25
  <ul>
27
26
  <li>
28
27
  <p>Due</p>
@@ -40,7 +39,6 @@ md_el(:document,[
40
39
  <p>Due</p>
41
40
  </li>
42
41
  </ul>
43
-
44
42
  *** Output of to_latex ***
45
43
  \begin{itemize}%
46
44
  \item Due
@@ -57,14 +55,11 @@ md_el(:document,[
57
55
 
58
56
 
59
57
  \end{itemize}
60
-
61
58
  *** Output of to_md ***
62
59
  -ue* tre
63
60
  * tre
64
61
  * tre
65
62
  -ue
66
-
67
-
68
63
  *** Output of to_s ***
69
64
  DuetretretreDue
70
65
  *** EOF ***
@@ -87,19 +82,4 @@ DuetretretreDue
87
82
  </ul>
88
83
 
89
84
  *** 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
- >
85
+ Error: #<NoMethodError: private method `write_children' called for <div> ... </>:REXML::Element>
data/tests/unittest/lists_after_paragraph.md CHANGED
@@ -90,7 +90,6 @@ md_el(:document,[
90
90
  ])
91
91
  ],{},[])
92
92
  *** Output of to_html ***
93
-
94
93
  <p>Paragraph, list with no space: * ciao</p>
95
94
 
96
95
  <p>Paragraph, list with 1 space: * ciao</p>
@@ -128,7 +127,6 @@ md_el(:document,[
128
127
  <p>Paragraph with html after, indented: <em>Emphasis</em> <em>tralla</em> <em>Emph</em></p>
129
128
 
130
129
  <p>Paragraph with html after, indented: <em>Emphasis *tralla* Emph</em></p>
131
-
132
130
  *** Output of to_latex ***
133
131
  Paragraph, list with no space: * ciao
134
132
 
@@ -167,9 +165,7 @@ Paragraph with html after, indented:
167
165
 
168
166
  Paragraph with html after, indented: \emph{tralla}
169
167
 
170
- Paragraph with html after, indented:
171
-
172
-
168
+ Paragraph with html after, indented:
173
169
  *** Output of to_md ***
174
170
  Paragraph, list with no space: * ciao
175
171
 
@@ -208,10 +204,8 @@ Paragraph with html after, indented:
208
204
  tralla
209
205
 
210
206
  Paragraph with html after, indented:
211
-
212
-
213
207
  *** Output of to_s ***
214
- 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:headerParagraph with html after Paragraph with html after, indented: Paragraph with html after, indented: tralla Paragraph with html after, indented:
208
+ 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:headerParagraph with html after Paragraph with html after, indented: Paragraph with html after, indented: tralla Paragraph with html after, indented:
215
209
  *** EOF ***
216
210
 
217
211
 
@@ -271,43 +265,4 @@ Paragraph, list with no space: * ciaoParagraph, list with 1 space: * ciaoParagra
271
265
  <p>Paragraph with html after, indented: <em>Emphasis <em>tralla</em> Emph</em></p>
272
266
 
273
267
  *** Output of Markdown.pl (parsed) ***
274
- <p>Paragraph, list with no space:
275
- * ciao</p
276
- ><p>Paragraph, list with 1 space:
277
- * ciao</p
278
- ><p>Paragraph, list with 3 space:
279
- * ciao</p
280
- ><p>Paragraph, list with 4 spaces:
281
- * ciao</p
282
- ><p>Paragraph, list with 1 tab:
283
- * ciao</p
284
- ><p>Paragraph (1 space after), list with no space:
285
- * ciao</p
286
- ><p>Paragraph (2 spaces after), list with no space: <br/
287
- >
288
- * ciao</p
289
- ><p>Paragraph (3 spaces after), list with no space: <br/
290
- >
291
- * ciao</p
292
- ><p>Paragraph with block quote:</p
293
- ><blockquote>
294
- <p>Quoted</p
295
- >
296
- </blockquote
297
- ><p>Paragraph with header:</p
298
- ><h3>header</h3
299
- ><p>Paragraph with header on two lines:</p
300
- ><h2>header</h2
301
- ><p>Paragraph with html after</p
302
- ><div/
303
- ><p>Paragraph with html after, indented:
304
- <em>Emphasis</em
305
- ></p
306
- ><p>Paragraph with html after, indented: <em>Emphasis</em
307
- ><em>tralla</em
308
- ><em>Emph</em
309
- ></p
310
- ><p>Paragraph with html after, indented: <em>Emphasis <em>tralla</em
311
- > Emph</em
312
- ></p
313
- >
268
+ Error: #<NoMethodError: private method `write_children' called for <div> ... </>:REXML::Element>