maruku 0.4.0 → 0.4.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (87) hide show
  1. data/bin/maruku +74 -22
  2. data/bin/marutest +15 -3
  3. data/docs/{changelog-0.3.md → changelog.md} +47 -18
  4. data/docs/entity_test.html +253 -0
  5. data/docs/entity_test.md +21 -0
  6. data/docs/index.html +124 -31
  7. data/docs/markdown_syntax.html +46 -46
  8. data/docs/maruku.html +124 -31
  9. data/docs/maruku.md +47 -9
  10. data/docs/proposal.html +4 -4
  11. data/lib/maruku.rb +1 -0
  12. data/lib/maruku/defaults.rb +1 -1
  13. data/lib/maruku/helpers.rb +4 -4
  14. data/lib/maruku/input/parse_block.rb +39 -33
  15. data/lib/maruku/input/parse_doc.rb +57 -3
  16. data/lib/maruku/input/parse_span_better.rb +28 -8
  17. data/lib/maruku/input/rubypants.rb +225 -0
  18. data/lib/maruku/input/type_detection.rb +1 -0
  19. data/lib/maruku/output/to_html.rb +46 -47
  20. data/lib/maruku/output/to_latex.rb +166 -45
  21. data/lib/maruku/output/to_latex_entities.rb +75 -43
  22. data/lib/maruku/string_utils.rb +21 -19
  23. data/lib/maruku/structures.rb +21 -12
  24. data/lib/maruku/structures_inspect.rb +12 -3
  25. data/lib/maruku/tests/new_parser.rb +2 -1
  26. data/lib/maruku/version.rb +1 -1
  27. data/tests/unittest/abbreviations.md +8 -8
  28. data/tests/unittest/attributes/attributes.md +10 -10
  29. data/tests/unittest/attributes/circular.md +4 -4
  30. data/tests/unittest/attributes/default.md +3 -3
  31. data/tests/unittest/blank.md +2 -2
  32. data/tests/unittest/blanks_in_code.md +12 -12
  33. data/tests/unittest/code.md +4 -4
  34. data/tests/unittest/code2.md +7 -6
  35. data/tests/unittest/code3.md +16 -16
  36. data/tests/unittest/easy.md +4 -4
  37. data/tests/unittest/email.md +4 -4
  38. data/tests/unittest/encoding/iso-8859-1.md +2 -2
  39. data/tests/unittest/encoding/utf-8.md +2 -2
  40. data/tests/unittest/entities.md +20 -20
  41. data/tests/unittest/escaping.md +16 -16
  42. data/tests/unittest/extra_dl.md +17 -7
  43. data/tests/unittest/extra_header_id.md +11 -11
  44. data/tests/unittest/extra_table1.md +4 -4
  45. data/tests/unittest/footnotes.md +38 -28
  46. data/tests/unittest/headers.md +6 -6
  47. data/tests/unittest/hrule.md +6 -6
  48. data/tests/unittest/images.md +18 -16
  49. data/tests/unittest/inline_html.md +7 -29
  50. data/tests/unittest/inline_html2.md +3 -3
  51. data/tests/unittest/links.md +7 -27
  52. data/tests/unittest/list1.md +9 -8
  53. data/tests/unittest/list2.md +15 -12
  54. data/tests/unittest/list3.md +16 -14
  55. data/tests/unittest/list4.md +4 -4
  56. data/tests/unittest/lists.md +33 -29
  57. data/tests/unittest/lists_after_paragraph.md +36 -36
  58. data/tests/unittest/lists_ol.md +43 -38
  59. data/tests/unittest/misc_sw.md +172 -156
  60. data/tests/unittest/notyet/escape.md +8 -8
  61. data/tests/unittest/notyet/header_after_par.md +6 -6
  62. data/tests/unittest/notyet/ticks.md +4 -4
  63. data/tests/unittest/notyet/triggering.md +21 -21
  64. data/tests/unittest/olist.md +5 -5
  65. data/tests/unittest/one.md +1 -1
  66. data/tests/unittest/paragraph.md +1 -1
  67. data/tests/unittest/paragraph_rules/dont_merge_ref.md +1 -1
  68. data/tests/unittest/paragraph_rules/tab_is_blank.md +2 -2
  69. data/tests/unittest/paragraphs.md +5 -5
  70. data/tests/unittest/recover/recover_links.md +2 -2
  71. data/tests/unittest/references/long_example.md +27 -19
  72. data/tests/unittest/smartypants.md +148 -0
  73. data/tests/unittest/syntax_hl.md +14 -14
  74. data/tests/unittest/test.md +2 -2
  75. data/tests/unittest/wrapping.md +8 -8
  76. data/tests/unittest/xml_instruction.md +82 -0
  77. metadata +149 -160
  78. data/docs/TOFIX.html +0 -22
  79. data/docs/TOFIX.md +0 -3
  80. data/docs/changelog-0.2.13.html +0 -30
  81. data/docs/changelog-0.2.13.md +0 -6
  82. data/docs/changelog-0.3.html +0 -113
  83. data/docs/faq.html +0 -57
  84. data/docs/faq.md +0 -32
  85. data/docs/hidden_o_n_squared.md +0 -10
  86. data/docs/todo.html +0 -40
  87. data/docs/todo.md +0 -9
data/tests/unittest/test.md CHANGED
@@ -30,5 +30,5 @@ md_el(:document,[md_el(:code,[],{:raw_code=>" $ python "},[])],{},[]
30
30
  <p>$ python </p>
31
31
 
32
32
  *** Output of Markdown.pl (parsed) ***
33
- <p>$ python </p
34
- >
33
+ <p>$ python </p
34
+ >
data/tests/unittest/wrapping.md CHANGED
@@ -90,16 +90,16 @@ Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet</li>
90
90
  </ul>
91
91
 
92
92
  *** Output of Markdown.pl (parsed) ***
93
- <p>Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Break: <br
94
- />
93
+ <p>Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Break: <br/
94
+ >
95
95
  Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. </p
96
- ><ul>
96
+ ><ul>
97
97
  <li>Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet
98
- Lorem ipsum Break: <br
99
- />
98
+ Lorem ipsum Break: <br/
99
+ >
100
100
  Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet</li
101
- >
101
+ >
102
102
  <li>Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet</li
103
- >
103
+ >
104
104
  </ul
105
- >
105
+ >
data/tests/unittest/xml_instruction.md ADDED
@@ -0,0 +1,82 @@
1
+ Directives should be preserved.
2
+ *** Parameters: ***
3
+ {}
4
+ *** Markdown input: ***
5
+
6
+ <? noTarget?>
7
+ <?php ?>
8
+ <?xml ?>
9
+ <?mrk ?>
10
+
11
+ Targets <? noTarget?> <?php ?> <?xml ?> <?mrk ?>
12
+
13
+ Inside: <? puts "Inside: Hello" ?>{exec} last
14
+
15
+
16
+ *** Output of inspect ***
17
+ md_el(:document,[
18
+ md_el(:xml_instr,[],{:code=>" noTarget",:target=>""},[]),
19
+ md_el(:xml_instr,[],{:code=>"",:target=>"php"},[]),
20
+ md_el(:xml_instr,[],{:code=>"",:target=>"xml"},[]),
21
+ md_el(:xml_instr,[],{:code=>"",:target=>"mrk"},[]),
22
+ md_par([
23
+ "Targets ",
24
+ md_el(:xml_instr,[],{:code=>"noTarget",:target=>""},[]),
25
+ " ",
26
+ md_el(:xml_instr,[],{:code=>"",:target=>"php"},[]),
27
+ " ",
28
+ md_el(:xml_instr,[],{:code=>"",:target=>"xml"},[]),
29
+ " ",
30
+ md_el(:xml_instr,[],{:code=>"",:target=>"mrk"},[])
31
+ ]),
32
+ md_par([
33
+ "Inside: ",
34
+ md_el(:xml_instr,[],{:code=>"puts \"Inside: Hello\"",:target=>""},[[:ref, "exec"]]),
35
+ md_ial([[:ref, "exec"]]),
36
+ " last"
37
+ ])
38
+ ],{},[])
39
+ *** Output of to_html ***
40
+ <? noTarget?><?php ?><?xml ?><?mrk ?>
41
+ <p>Targets <? noTarget?> <?php ?> <?xml ?> <?mrk ?></p>
42
+
43
+ <p>Inside: <? puts "Inside: Hello"?> last</p>
44
+
45
+ *** Output of to_latex ***
46
+ Targets
47
+
48
+ Inside: last
49
+
50
+
51
+ *** Output of to_md ***
52
+ Targets
53
+
54
+ Inside: last
55
+
56
+
57
+ *** Output of to_s ***
58
+ Targets Inside: last
59
+ *** EOF ***
60
+
61
+
62
+
63
+ OK!
64
+
65
+
66
+
67
+ *** Output of Markdown.pl ***
68
+ <p><? noTarget?>
69
+ <?php ?>
70
+ <?xml ?>
71
+ <?mrk ?></p>
72
+
73
+ <p>Targets <? noTarget?> <?php ?> <?xml ?> <?mrk ?></p>
74
+
75
+ <p>Inside: <? puts "Inside: Hello" ?>{exec} last</p>
76
+
77
+ *** Output of Markdown.pl (parsed) ***
78
+ <p
79
+ > <? noTarget?> <?php ?> <?xml ?> <?mrk ?></p
80
+ ><p>Targets <? noTarget?> <?php ?> <?xml ?> <?mrk ?></p
81
+ ><p>Inside: <? puts "Inside: Hello"?>{exec} last</p
82
+ >
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
- rubygems_version: 0.9.0
2
+ rubygems_version: 0.8.10
3
3
  specification_version: 1
4
4
  name: maruku
5
5
  version: !ruby/object:Gem::Version
6
- version: 0.4.0
7
- date: 2007-01-06 00:00:00 +01:00
6
+ version: 0.4.1
7
+ date: 2007-01-08
8
8
  summary: A Markdown interpreter in Ruby
9
9
  require_paths:
10
- - lib
10
+ - lib
11
11
  email: andrea@rubyforge.org
12
12
  homepage: http://maruku.rubyforge.org
13
13
  rubyforge_project:
@@ -18,170 +18,159 @@ bindir: bin
18
18
  has_rdoc: false
19
19
  required_ruby_version: !ruby/object:Gem::Version::Requirement
20
20
  requirements:
21
- - - ">"
22
- - !ruby/object:Gem::Version
23
- version: 0.0.0
21
+ -
22
+ - ">"
23
+ - !ruby/object:Gem::Version
24
+ version: 0.0.0
24
25
  version:
25
26
  platform: ruby
26
- signing_key:
27
- cert_chain:
28
- post_install_message:
29
27
  authors:
30
- - Andrea Censi
28
+ - Andrea Censi
31
29
  files:
32
- - lib/maruku.rb
33
- - lib/maruku/attributes.rb
34
- - lib/maruku/defaults.rb
35
- - lib/maruku/errors_management.rb
36
- - lib/maruku/helpers.rb
37
- - lib/maruku/maruku.rb
38
- - lib/maruku/string_utils.rb
39
- - lib/maruku/structures.rb
40
- - lib/maruku/structures_inspect.rb
41
- - lib/maruku/structures_iterators.rb
42
- - lib/maruku/toc.rb
43
- - lib/maruku/version.rb
44
- - lib/maruku/input/charsource.rb
45
- - lib/maruku/input/html_helper.rb
46
- - lib/maruku/input/linesource.rb
47
- - lib/maruku/input/parse_block.rb
48
- - lib/maruku/input/parse_doc.rb
49
- - lib/maruku/input/parse_span_better.rb
50
- - lib/maruku/input/type_detection.rb
51
- - lib/maruku/output/to_html.rb
52
- - lib/maruku/output/to_latex.rb
53
- - lib/maruku/output/to_latex_entities.rb
54
- - lib/maruku/output/to_latex_strings.rb
55
- - lib/maruku/output/to_markdown.rb
56
- - lib/maruku/output/to_s.rb
57
- - lib/maruku/tests/benchmark.rb
58
- - lib/maruku/tests/new_parser.rb
59
- - lib/maruku/tests/tests.rb
60
- - lib/maruku/usage/example1.rb
61
- - docs/changelog-0.2.13.md
62
- - docs/changelog-0.3.md
63
- - docs/faq.md
64
- - docs/hidden_o_n_squared.md
65
- - docs/markdown_syntax.md
66
- - docs/maruku.md
67
- - docs/proposal.md
68
- - docs/todo.md
69
- - docs/TOFIX.md
70
- - docs/changelog-0.2.13.html
71
- - docs/changelog-0.3.html
72
- - docs/faq.html
73
- - docs/index.html
74
- - docs/markdown_syntax.html
75
- - docs/maruku.html
76
- - docs/proposal.html
77
- - docs/todo.html
78
- - docs/TOFIX.html
79
- - tests/bugs/code_in_links.md
80
- - tests/bugs/complex_escaping.md
81
- - tests/others/abbreviations.md
82
- - tests/others/blank.md
83
- - tests/others/code.md
84
- - tests/others/code2.md
85
- - tests/others/code3.md
86
- - tests/others/email.md
87
- - tests/others/entities.md
88
- - tests/others/escaping.md
89
- - tests/others/extra_dl.md
90
- - tests/others/extra_header_id.md
91
- - tests/others/extra_table1.md
92
- - tests/others/footnotes.md
93
- - tests/others/headers.md
94
- - tests/others/hrule.md
95
- - tests/others/images.md
96
- - tests/others/inline_html.md
97
- - tests/others/links.md
98
- - tests/others/list1.md
99
- - tests/others/list2.md
100
- - tests/others/list3.md
101
- - tests/others/lists.md
102
- - tests/others/lists_after_paragraph.md
103
- - tests/others/lists_ol.md
104
- - tests/others/misc_sw.md
105
- - tests/others/one.md
106
- - tests/others/paragraphs.md
107
- - tests/others/sss06.md
108
- - tests/others/test.md
109
- - tests/unittest/abbreviations.md
110
- - tests/unittest/blank.md
111
- - tests/unittest/blanks_in_code.md
112
- - tests/unittest/code.md
113
- - tests/unittest/code2.md
114
- - tests/unittest/code3.md
115
- - tests/unittest/easy.md
116
- - tests/unittest/email.md
117
- - tests/unittest/entities.md
118
- - tests/unittest/escaping.md
119
- - tests/unittest/extra_dl.md
120
- - tests/unittest/extra_header_id.md
121
- - tests/unittest/extra_table1.md
122
- - tests/unittest/footnotes.md
123
- - tests/unittest/headers.md
124
- - tests/unittest/hrule.md
125
- - tests/unittest/images.md
126
- - tests/unittest/inline_html.md
127
- - tests/unittest/inline_html2.md
128
- - tests/unittest/links.md
129
- - tests/unittest/list1.md
130
- - tests/unittest/list2.md
131
- - tests/unittest/list3.md
132
- - tests/unittest/list4.md
133
- - tests/unittest/lists.md
134
- - tests/unittest/lists6.md
135
- - tests/unittest/lists7.md
136
- - tests/unittest/lists_after_paragraph.md
137
- - tests/unittest/lists_ol.md
138
- - tests/unittest/misc_sw.md
139
- - tests/unittest/olist.md
140
- - tests/unittest/one.md
141
- - tests/unittest/paragraph.md
142
- - tests/unittest/paragraphs.md
143
- - tests/unittest/syntax_hl.md
144
- - tests/unittest/test.md
145
- - tests/unittest/wrapping.md
146
- - tests/unittest/attributes/attributes.md
147
- - tests/unittest/attributes/circular.md
148
- - tests/unittest/attributes/default.md
149
- - tests/unittest/encoding/iso-8859-1.md
150
- - tests/unittest/encoding/utf-8.md
151
- - tests/unittest/notyet/escape.md
152
- - tests/unittest/notyet/header_after_par.md
153
- - tests/unittest/notyet/ticks.md
154
- - tests/unittest/notyet/triggering.md
155
- - tests/unittest/paragraph_rules/dont_merge_ref.md
156
- - tests/unittest/paragraph_rules/tab_is_blank.md
157
- - tests/unittest/recover/recover_links.md
158
- - tests/unittest/references/long_example.md
159
- - tests/unittest/references/spaces_and_numbers.md
160
- - tests/utf8-files/simple.md
161
- - bin/marudown
162
- - bin/maruku
163
- - bin/marutest
164
- - bin/marutex
30
+ - lib/maruku.rb
31
+ - lib/maruku/attributes.rb
32
+ - lib/maruku/defaults.rb
33
+ - lib/maruku/errors_management.rb
34
+ - lib/maruku/helpers.rb
35
+ - lib/maruku/maruku.rb
36
+ - lib/maruku/string_utils.rb
37
+ - lib/maruku/structures.rb
38
+ - lib/maruku/structures_inspect.rb
39
+ - lib/maruku/structures_iterators.rb
40
+ - lib/maruku/toc.rb
41
+ - lib/maruku/version.rb
42
+ - lib/maruku/input/charsource.rb
43
+ - lib/maruku/input/html_helper.rb
44
+ - lib/maruku/input/linesource.rb
45
+ - lib/maruku/input/parse_block.rb
46
+ - lib/maruku/input/parse_doc.rb
47
+ - lib/maruku/input/parse_span_better.rb
48
+ - lib/maruku/input/rubypants.rb
49
+ - lib/maruku/input/type_detection.rb
50
+ - lib/maruku/output/to_html.rb
51
+ - lib/maruku/output/to_latex.rb
52
+ - lib/maruku/output/to_latex_entities.rb
53
+ - lib/maruku/output/to_latex_strings.rb
54
+ - lib/maruku/output/to_markdown.rb
55
+ - lib/maruku/output/to_s.rb
56
+ - lib/maruku/tests/benchmark.rb
57
+ - lib/maruku/tests/new_parser.rb
58
+ - lib/maruku/tests/tests.rb
59
+ - lib/maruku/usage/example1.rb
60
+ - docs/changelog.md
61
+ - docs/entity_test.md
62
+ - docs/markdown_syntax.md
63
+ - docs/maruku.md
64
+ - docs/proposal.md
65
+ - docs/entity_test.html
66
+ - docs/index.html
67
+ - docs/markdown_syntax.html
68
+ - docs/maruku.html
69
+ - docs/proposal.html
70
+ - tests/bugs/code_in_links.md
71
+ - tests/bugs/complex_escaping.md
72
+ - tests/others/abbreviations.md
73
+ - tests/others/blank.md
74
+ - tests/others/code.md
75
+ - tests/others/code2.md
76
+ - tests/others/code3.md
77
+ - tests/others/email.md
78
+ - tests/others/entities.md
79
+ - tests/others/escaping.md
80
+ - tests/others/extra_dl.md
81
+ - tests/others/extra_header_id.md
82
+ - tests/others/extra_table1.md
83
+ - tests/others/footnotes.md
84
+ - tests/others/headers.md
85
+ - tests/others/hrule.md
86
+ - tests/others/images.md
87
+ - tests/others/inline_html.md
88
+ - tests/others/links.md
89
+ - tests/others/list1.md
90
+ - tests/others/list2.md
91
+ - tests/others/list3.md
92
+ - tests/others/lists.md
93
+ - tests/others/lists_after_paragraph.md
94
+ - tests/others/lists_ol.md
95
+ - tests/others/misc_sw.md
96
+ - tests/others/one.md
97
+ - tests/others/paragraphs.md
98
+ - tests/others/sss06.md
99
+ - tests/others/test.md
100
+ - tests/unittest/abbreviations.md
101
+ - tests/unittest/blank.md
102
+ - tests/unittest/blanks_in_code.md
103
+ - tests/unittest/code.md
104
+ - tests/unittest/code2.md
105
+ - tests/unittest/code3.md
106
+ - tests/unittest/easy.md
107
+ - tests/unittest/email.md
108
+ - tests/unittest/entities.md
109
+ - tests/unittest/escaping.md
110
+ - tests/unittest/extra_dl.md
111
+ - tests/unittest/extra_header_id.md
112
+ - tests/unittest/extra_table1.md
113
+ - tests/unittest/footnotes.md
114
+ - tests/unittest/headers.md
115
+ - tests/unittest/hrule.md
116
+ - tests/unittest/images.md
117
+ - tests/unittest/inline_html.md
118
+ - tests/unittest/inline_html2.md
119
+ - tests/unittest/links.md
120
+ - tests/unittest/list1.md
121
+ - tests/unittest/list2.md
122
+ - tests/unittest/list3.md
123
+ - tests/unittest/list4.md
124
+ - tests/unittest/lists.md
125
+ - tests/unittest/lists6.md
126
+ - tests/unittest/lists7.md
127
+ - tests/unittest/lists_after_paragraph.md
128
+ - tests/unittest/lists_ol.md
129
+ - tests/unittest/misc_sw.md
130
+ - tests/unittest/olist.md
131
+ - tests/unittest/one.md
132
+ - tests/unittest/paragraph.md
133
+ - tests/unittest/paragraphs.md
134
+ - tests/unittest/smartypants.md
135
+ - tests/unittest/syntax_hl.md
136
+ - tests/unittest/test.md
137
+ - tests/unittest/wrapping.md
138
+ - tests/unittest/xml_instruction.md
139
+ - tests/unittest/attributes/attributes.md
140
+ - tests/unittest/attributes/circular.md
141
+ - tests/unittest/attributes/default.md
142
+ - tests/unittest/encoding/iso-8859-1.md
143
+ - tests/unittest/encoding/utf-8.md
144
+ - tests/unittest/notyet/escape.md
145
+ - tests/unittest/notyet/header_after_par.md
146
+ - tests/unittest/notyet/ticks.md
147
+ - tests/unittest/notyet/triggering.md
148
+ - tests/unittest/paragraph_rules/dont_merge_ref.md
149
+ - tests/unittest/paragraph_rules/tab_is_blank.md
150
+ - tests/unittest/recover/recover_links.md
151
+ - tests/unittest/references/long_example.md
152
+ - tests/unittest/references/spaces_and_numbers.md
153
+ - tests/utf8-files/simple.md
154
+ - bin/marudown
155
+ - bin/maruku
156
+ - bin/marutest
157
+ - bin/marutex
165
158
  test_files: []
166
-
167
159
  rdoc_options: []
168
-
169
160
  extra_rdoc_files: []
170
-
171
161
  executables:
172
- - maruku
173
- - marutex
162
+ - maruku
163
+ - marutex
174
164
  extensions: []
175
-
176
165
  requirements: []
177
-
178
166
  dependencies:
179
- - !ruby/object:Gem::Dependency
180
- name: syntax
181
- version_requirement:
182
- version_requirements: !ruby/object:Gem::Version::Requirement
183
- requirements:
184
- - - ">="
185
- - !ruby/object:Gem::Version
186
- version: 1.0.0
187
- version:
167
+ - !ruby/object:Gem::Dependency
168
+ name: syntax
169
+ version_requirement:
170
+ version_requirements: !ruby/object:Gem::Version::Requirement
171
+ requirements:
172
+ -
173
+ - ">="
174
+ - !ruby/object:Gem::Version
175
+ version: 1.0.0
176
+ version: