maruku 0.6.0 → 0.7.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (290) hide show
  1. checksums.yaml +7 -0
  2. data/MIT-LICENSE.txt +20 -0
  3. data/bin/maruku +153 -152
  4. data/bin/marutex +2 -29
  5. data/data/entities.xml +261 -0
  6. data/docs/markdown_syntax.md +9 -21
  7. data/docs/math.md +14 -18
  8. data/lib/maruku.rb +65 -78
  9. data/lib/maruku/attributes.rb +109 -214
  10. data/lib/maruku/defaults.rb +45 -67
  11. data/lib/maruku/document.rb +44 -0
  12. data/lib/maruku/element.rb +138 -0
  13. data/lib/maruku/errors.rb +80 -0
  14. data/lib/maruku/ext/div.rb +105 -113
  15. data/lib/maruku/ext/fenced_code.rb +97 -0
  16. data/lib/maruku/ext/math.rb +22 -26
  17. data/lib/maruku/ext/math/elements.rb +20 -26
  18. data/lib/maruku/ext/math/mathml_engines/blahtex.rb +92 -104
  19. data/lib/maruku/ext/math/mathml_engines/itex2mml.rb +33 -26
  20. data/lib/maruku/ext/math/mathml_engines/none.rb +11 -19
  21. data/lib/maruku/ext/math/mathml_engines/ritex.rb +2 -4
  22. data/lib/maruku/ext/math/parsing.rb +121 -115
  23. data/lib/maruku/ext/math/to_html.rb +202 -187
  24. data/lib/maruku/ext/math/to_latex.rb +34 -21
  25. data/lib/maruku/helpers.rb +158 -257
  26. data/lib/maruku/html.rb +251 -0
  27. data/lib/maruku/input/charsource.rb +272 -319
  28. data/lib/maruku/input/extensions.rb +62 -63
  29. data/lib/maruku/input/html_helper.rb +233 -189
  30. data/lib/maruku/input/linesource.rb +90 -110
  31. data/lib/maruku/input/mdline.rb +131 -0
  32. data/lib/maruku/input/parse_block.rb +736 -613
  33. data/lib/maruku/input/parse_doc.rb +145 -217
  34. data/lib/maruku/input/parse_span.rb +740 -0
  35. data/lib/maruku/inspect_element.rb +60 -0
  36. data/lib/maruku/maruku.rb +14 -30
  37. data/lib/maruku/output/entity_table.rb +37 -0
  38. data/lib/maruku/output/s5/fancy.rb +462 -462
  39. data/lib/maruku/output/s5/to_s5.rb +115 -135
  40. data/lib/maruku/output/to_html.rb +907 -983
  41. data/lib/maruku/output/to_latex.rb +571 -563
  42. data/lib/maruku/output/to_markdown.rb +207 -162
  43. data/lib/maruku/output/to_s.rb +10 -52
  44. data/lib/maruku/string_utils.rb +129 -179
  45. data/lib/maruku/toc.rb +185 -196
  46. data/lib/maruku/version.rb +33 -38
  47. data/spec/block_docs/abbrev.md +776 -0
  48. data/{tests/unittest → spec/block_docs}/abbreviations.md +11 -20
  49. data/spec/block_docs/abbreviations2.md +27 -0
  50. data/{tests/unittest → spec/block_docs}/alt.md +2 -14
  51. data/{tests/unittest/pending → spec/block_docs}/amps.md +1 -13
  52. data/spec/block_docs/attribute_sanitize.md +22 -0
  53. data/{tests/unittest → spec/block_docs}/attributes/att2.md +0 -12
  54. data/{tests/unittest → spec/block_docs}/attributes/att3.md +2 -14
  55. data/{tests/unittest → spec/block_docs}/attributes/attributes.md +12 -16
  56. data/{tests/unittest → spec/block_docs}/attributes/circular.md +0 -12
  57. data/{tests/unittest → spec/block_docs}/attributes/default.md +1 -13
  58. data/spec/block_docs/atx_headers.md +22 -0
  59. data/spec/block_docs/auto_cdata.md +48 -0
  60. data/spec/block_docs/bad_cites.md +30 -0
  61. data/spec/block_docs/bad_divrefs.md +30 -0
  62. data/{tests/unittest → spec/block_docs}/blank.md +0 -12
  63. data/{tests/unittest → spec/block_docs}/blanks_in_code.md +16 -15
  64. data/spec/block_docs/block_quotes.md +66 -0
  65. data/{tests/unittest/loss.md → spec/block_docs/bug_def.md} +6 -18
  66. data/{tests/unittest → spec/block_docs}/bug_table.md +7 -19
  67. data/spec/block_docs/cites.md +37 -0
  68. data/{tests/unittest → spec/block_docs}/code.md +7 -14
  69. data/{tests/unittest → spec/block_docs}/code2.md +4 -14
  70. data/{tests/unittest → spec/block_docs}/code3.md +12 -16
  71. data/spec/block_docs/code4.md +79 -0
  72. data/{tests/unittest → spec/block_docs}/data_loss.md +2 -14
  73. data/spec/block_docs/div_without_newline.md +16 -0
  74. data/{tests/unittest → spec/block_docs}/divs/div1.md +0 -12
  75. data/{tests/unittest → spec/block_docs}/divs/div2.md +0 -12
  76. data/{tests/unittest → spec/block_docs}/divs/div3_nest.md +3 -15
  77. data/{tests/unittest → spec/block_docs}/easy.md +1 -13
  78. data/spec/block_docs/email.md +29 -0
  79. data/spec/block_docs/empty_cells.md +31 -0
  80. data/{tests/unittest → spec/block_docs}/encoding/iso-8859-1.md +1 -14
  81. data/{tests/unittest → spec/block_docs}/encoding/utf-8.md +0 -12
  82. data/{tests/unittest → spec/block_docs}/entities.md +33 -41
  83. data/{tests/unittest/notyet → spec/block_docs}/escape.md +2 -14
  84. data/{tests/unittest → spec/block_docs}/escaping.md +11 -22
  85. data/{tests/unittest → spec/block_docs}/extra_dl.md +2 -13
  86. data/{tests/unittest → spec/block_docs}/extra_header_id.md +14 -20
  87. data/{tests/unittest → spec/block_docs}/extra_table1.md +9 -21
  88. data/spec/block_docs/fenced_code_blocks.md +58 -0
  89. data/spec/block_docs/fenced_code_blocks_highlighted.md +17 -0
  90. data/{tests/unittest → spec/block_docs}/footnotes.md +12 -24
  91. data/spec/block_docs/footnotes2.md +82 -0
  92. data/spec/block_docs/hard.md +25 -0
  93. data/spec/block_docs/header_after_par.md +62 -0
  94. data/{tests/unittest → spec/block_docs}/headers.md +10 -18
  95. data/{tests/unittest → spec/block_docs}/hex_entities.md +7 -18
  96. data/{tests/unittest → spec/block_docs}/hrule.md +5 -12
  97. data/{tests/unittest → spec/block_docs}/html3.md +1 -13
  98. data/{tests/unittest → spec/block_docs}/html4.md +2 -14
  99. data/{tests/unittest → spec/block_docs}/html5.md +2 -14
  100. data/spec/block_docs/html_block_in_para.md +22 -0
  101. data/spec/block_docs/html_inline.md +25 -0
  102. data/spec/block_docs/html_trailing.md +31 -0
  103. data/spec/block_docs/ie.md +62 -0
  104. data/spec/block_docs/iframe.md +29 -0
  105. data/spec/block_docs/ignore_bad_header.md +9 -0
  106. data/{tests/unittest → spec/block_docs}/images.md +22 -28
  107. data/{tests/unittest → spec/block_docs}/images2.md +7 -17
  108. data/{tests/unittest → spec/block_docs}/inline_html.md +37 -67
  109. data/{tests/unittest → spec/block_docs}/inline_html2.md +1 -13
  110. data/spec/block_docs/inline_html_beginning.md +10 -0
  111. data/spec/block_docs/issue106.md +78 -0
  112. data/spec/block_docs/issue115.md +20 -0
  113. data/spec/block_docs/issue117.md +13 -0
  114. data/spec/block_docs/issue120.md +48 -0
  115. data/spec/block_docs/issue123.md +11 -0
  116. data/spec/block_docs/issue124.md +16 -0
  117. data/spec/block_docs/issue126.md +9 -0
  118. data/spec/block_docs/issue130.md +11 -0
  119. data/spec/block_docs/issue20.md +9 -0
  120. data/spec/block_docs/issue26.md +22 -0
  121. data/spec/block_docs/issue29.md +9 -0
  122. data/spec/block_docs/issue30.md +30 -0
  123. data/spec/block_docs/issue31.md +25 -0
  124. data/spec/block_docs/issue40.md +52 -0
  125. data/spec/block_docs/issue64.md +55 -0
  126. data/spec/block_docs/issue67.md +19 -0
  127. data/spec/block_docs/issue70.md +11 -0
  128. data/spec/block_docs/issue72.md +17 -0
  129. data/spec/block_docs/issue74.md +38 -0
  130. data/spec/block_docs/issue79.md +15 -0
  131. data/spec/block_docs/issue83.md +13 -0
  132. data/spec/block_docs/issue85.md +25 -0
  133. data/spec/block_docs/issue88.md +19 -0
  134. data/spec/block_docs/issue89.md +12 -0
  135. data/spec/block_docs/issue90.md +38 -0
  136. data/{tests/unittest/pending → spec/block_docs}/link.md +21 -18
  137. data/{tests/unittest → spec/block_docs}/links.md +33 -32
  138. data/spec/block_docs/links2.md +21 -0
  139. data/{tests/unittest → spec/block_docs}/list1.md +0 -12
  140. data/{tests/unittest → spec/block_docs}/list12.md +2 -14
  141. data/{tests/unittest → spec/block_docs}/list2.md +2 -14
  142. data/spec/block_docs/list_multipara.md +42 -0
  143. data/{tests/unittest → spec/block_docs}/lists.md +28 -29
  144. data/{tests/unittest → spec/block_docs}/lists10.md +2 -14
  145. data/spec/block_docs/lists11.md +23 -0
  146. data/spec/block_docs/lists12.md +43 -0
  147. data/spec/block_docs/lists13.md +55 -0
  148. data/spec/block_docs/lists14.md +61 -0
  149. data/spec/block_docs/lists15.md +36 -0
  150. data/spec/block_docs/lists6.md +88 -0
  151. data/spec/block_docs/lists7b.md +58 -0
  152. data/spec/block_docs/lists9.md +53 -0
  153. data/{tests/unittest → spec/block_docs}/lists_after_paragraph.md +19 -25
  154. data/spec/block_docs/lists_blank.md +35 -0
  155. data/{tests/unittest/list3.md → spec/block_docs/lists_blockquote_code.md} +2 -14
  156. data/{tests/unittest/list4.md → spec/block_docs/lists_need_blank_line.md} +44 -29
  157. data/spec/block_docs/lists_nested.md +44 -0
  158. data/spec/block_docs/lists_nested_blankline.md +34 -0
  159. data/spec/block_docs/lists_nested_deep.md +43 -0
  160. data/spec/block_docs/lists_ol.md +129 -0
  161. data/spec/block_docs/lists_ol2.md +147 -0
  162. data/spec/block_docs/lists_paraindent.md +42 -0
  163. data/spec/block_docs/lists_tab.md +54 -0
  164. data/spec/block_docs/loss.md +17 -0
  165. data/spec/block_docs/math-blahtex/equations.md +29 -0
  166. data/spec/block_docs/math-blahtex/inline.md +48 -0
  167. data/spec/block_docs/math-blahtex/math2.md +52 -0
  168. data/spec/block_docs/math-blahtex/table.md +25 -0
  169. data/spec/block_docs/math/embedded_invalid_svg.md +108 -0
  170. data/spec/block_docs/math/embedded_svg.md +136 -0
  171. data/spec/block_docs/math/equations.md +49 -0
  172. data/spec/block_docs/math/inline.md +46 -0
  173. data/spec/block_docs/math/math2.md +53 -0
  174. data/{tests/unittest → spec/block_docs}/math/notmath.md +0 -12
  175. data/spec/block_docs/math/raw_mathml.md +87 -0
  176. data/spec/block_docs/math/spaces_after_inline_math.md +17 -0
  177. data/spec/block_docs/math/table.md +25 -0
  178. data/{tests/unittest → spec/block_docs}/math/table2.md +11 -23
  179. data/{tests/unittest → spec/block_docs}/misc_sw.md +184 -121
  180. data/{tests/unittest → spec/block_docs}/olist.md +6 -18
  181. data/{tests/unittest → spec/block_docs}/one.md +0 -12
  182. data/{tests/unittest → spec/block_docs}/paragraph.md +0 -12
  183. data/{tests/unittest → spec/block_docs}/paragraph_rules/dont_merge_ref.md +4 -12
  184. data/{tests/unittest → spec/block_docs}/paragraph_rules/tab_is_blank.md +0 -12
  185. data/{tests/unittest → spec/block_docs}/paragraphs.md +1 -13
  186. data/{tests/unittest → spec/block_docs}/recover/recover_links.md +4 -16
  187. data/{tests/unittest/pending/ref.md → spec/block_docs/ref_with_period.md} +7 -16
  188. data/spec/block_docs/ref_with_title.md +22 -0
  189. data/{tests/unittest → spec/block_docs}/references/long_example.md +16 -23
  190. data/{tests/unittest → spec/block_docs}/references/spaces_and_numbers.md +0 -12
  191. data/{tests/unittest → spec/block_docs}/smartypants.md +24 -31
  192. data/{tests/unittest → spec/block_docs}/syntax_hl.md +13 -17
  193. data/{tests/unittest → spec/block_docs}/table_attributes.md +6 -20
  194. data/spec/block_docs/table_colspan.md +41 -0
  195. data/spec/block_docs/tables.md +47 -0
  196. data/spec/block_docs/tables2.md +74 -0
  197. data/{tests/unittest → spec/block_docs}/test.md +1 -13
  198. data/{tests/unittest/notyet → spec/block_docs}/ticks.md +1 -13
  199. data/spec/block_docs/toc.md +87 -0
  200. data/{tests/unittest/notyet → spec/block_docs}/triggering.md +14 -25
  201. data/{tests/unittest → spec/block_docs}/underscore_in_words.md +0 -12
  202. data/{tests/unittest → spec/block_docs}/wrapping.md +4 -16
  203. data/spec/block_docs/xml.md +33 -0
  204. data/spec/block_docs/xml3.md +24 -0
  205. data/spec/block_docs/xml_comments.md +32 -0
  206. data/{tests/unittest → spec/block_docs}/xml_instruction.md +9 -20
  207. data/spec/block_spec.rb +110 -0
  208. data/spec/cli_spec.rb +8 -0
  209. data/spec/span_spec.rb +263 -0
  210. data/spec/spec_helper.rb +3 -0
  211. data/spec/to_html_utf8_spec.rb +13 -0
  212. metadata +218 -202
  213. data/Rakefile +0 -73
  214. data/bin/marudown +0 -29
  215. data/bin/marutest +0 -345
  216. data/docs/changelog.md +0 -334
  217. data/lib/maruku/errors_management.rb +0 -92
  218. data/lib/maruku/ext/math/latex_fix.rb +0 -12
  219. data/lib/maruku/input/parse_span_better.rb +0 -746
  220. data/lib/maruku/input/rubypants.rb +0 -225
  221. data/lib/maruku/input/type_detection.rb +0 -147
  222. data/lib/maruku/output/to_latex_entities.rb +0 -367
  223. data/lib/maruku/output/to_latex_strings.rb +0 -64
  224. data/lib/maruku/structures.rb +0 -167
  225. data/lib/maruku/structures_inspect.rb +0 -87
  226. data/lib/maruku/structures_iterators.rb +0 -61
  227. data/lib/maruku/tests/benchmark.rb +0 -82
  228. data/lib/maruku/tests/new_parser.rb +0 -373
  229. data/lib/maruku/tests/tests.rb +0 -136
  230. data/lib/maruku/usage/example1.rb +0 -33
  231. data/maruku_gem.rb +0 -33
  232. data/tests/bugs/code_in_links.md +0 -101
  233. data/tests/bugs/complex_escaping.md +0 -38
  234. data/tests/math/syntax.md +0 -46
  235. data/tests/math_usage/document.md +0 -13
  236. data/tests/others/abbreviations.md +0 -11
  237. data/tests/others/blank.md +0 -4
  238. data/tests/others/code.md +0 -5
  239. data/tests/others/code2.md +0 -8
  240. data/tests/others/code3.md +0 -16
  241. data/tests/others/email.md +0 -4
  242. data/tests/others/entities.md +0 -19
  243. data/tests/others/escaping.md +0 -16
  244. data/tests/others/extra_dl.md +0 -101
  245. data/tests/others/extra_header_id.md +0 -13
  246. data/tests/others/extra_table1.md +0 -40
  247. data/tests/others/footnotes.md +0 -17
  248. data/tests/others/headers.md +0 -10
  249. data/tests/others/hrule.md +0 -10
  250. data/tests/others/images.md +0 -20
  251. data/tests/others/inline_html.md +0 -42
  252. data/tests/others/links.md +0 -38
  253. data/tests/others/list1.md +0 -4
  254. data/tests/others/list2.md +0 -5
  255. data/tests/others/list3.md +0 -8
  256. data/tests/others/lists.md +0 -32
  257. data/tests/others/lists_after_paragraph.md +0 -44
  258. data/tests/others/lists_ol.md +0 -39
  259. data/tests/others/misc_sw.md +0 -105
  260. data/tests/others/one.md +0 -1
  261. data/tests/others/paragraphs.md +0 -13
  262. data/tests/others/sss06.md +0 -352
  263. data/tests/others/test.md +0 -4
  264. data/tests/s5/s5profiling.md +0 -48
  265. data/tests/unittest/bug_def.md +0 -28
  266. data/tests/unittest/email.md +0 -32
  267. data/tests/unittest/hang.md +0 -29
  268. data/tests/unittest/html2.md +0 -34
  269. data/tests/unittest/ie.md +0 -61
  270. data/tests/unittest/links2.md +0 -34
  271. data/tests/unittest/lists11.md +0 -28
  272. data/tests/unittest/lists6.md +0 -53
  273. data/tests/unittest/lists9.md +0 -76
  274. data/tests/unittest/lists_ol.md +0 -274
  275. data/tests/unittest/math/equations.md +0 -86
  276. data/tests/unittest/math/inline.md +0 -58
  277. data/tests/unittest/math/math2.md +0 -57
  278. data/tests/unittest/math/table.md +0 -37
  279. data/tests/unittest/notyet/header_after_par.md +0 -70
  280. data/tests/unittest/pending/empty_cells.md +0 -49
  281. data/tests/unittest/red_tests/abbrev.md +0 -1388
  282. data/tests/unittest/red_tests/lists7.md +0 -68
  283. data/tests/unittest/red_tests/lists7b.md +0 -128
  284. data/tests/unittest/red_tests/lists8.md +0 -76
  285. data/tests/unittest/red_tests/xml.md +0 -70
  286. data/tests/unittest/xml2.md +0 -31
  287. data/tests/unittest/xml3.md +0 -38
  288. data/tests/utf8-files/simple.md +0 -1
  289. data/unit_test_block.sh +0 -5
  290. data/unit_test_span.sh +0 -3
@@ -0,0 +1,97 @@
1
+ # fenced_code.rb -- Maruku extension for fenced code blocks
2
+ #
3
+ # Copyright (C) 2009 Jason R. Blevins
4
+ # All rights reserved.
5
+ #
6
+ # Redistribution and use in source and binary forms, with or without
7
+ # modification, are permitted provided that the following conditions are met:
8
+ #
9
+ # * Redistributions of source code must retain the above copyright notice,
10
+ # this list of conditions and the following disclaimer.
11
+ #
12
+ # * Redistributions in binary form must reproduce the above copyright notice,
13
+ # this list of conditions and the following disclaimer in the documentation
14
+ # and/or other materials provided with the distribution.
15
+ #
16
+ # * Neither the names of the copyright holders nor the names of any
17
+ # contributors may be used to endorse or promote products derived from this
18
+ # software without specific prior written permission.
19
+ #
20
+ # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21
+ # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22
+ # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23
+ # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
24
+ # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25
+ # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26
+ # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27
+ # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28
+ # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29
+ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30
+ # POSSIBILITY OF SUCH DAMAGE.
31
+
32
+
33
+ # Fenced code blocks begin with three or more tildes and are terminated
34
+ # by a closing line with at least as many tildes as the opening line.
35
+ # Optionally, an attribute list may appear at the end of the opening
36
+ # line. For example:
37
+ #
38
+ # ~~~~~~~~~~~~~ {: lang=ruby }
39
+ # puts 'Hello world'
40
+ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
41
+ #
42
+ # Or:
43
+ #
44
+ # ```ruby
45
+ # puts 'Hello world'
46
+ # ```
47
+ #
48
+
49
+ #=begin maruku_doc
50
+ # Attribute: :fenced_code_blocks
51
+ # Scope: global, document
52
+ # Summary: Enables fenced code blocks
53
+ #=end
54
+
55
+ module Maruku::In::Markdown
56
+ module FencedCode
57
+ OpenFence = /^([`~]{3,})(\w+)?\s*(\{([^{}]*?|".*?"|'.*?')*\})?\s*$/
58
+ end
59
+ end
60
+
61
+ MaRuKu::In::Markdown::register_block_extension(
62
+ :regexp => Maruku::In::Markdown::FencedCode::OpenFence,
63
+ :handler => lambda do |doc, src, context|
64
+ return false unless doc.get_setting :fenced_code_blocks
65
+
66
+ first = src.shift_line
67
+ first =~ Maruku::In::Markdown::FencedCode::OpenFence
68
+ close_fence = /^#{$1}[`~]*$/
69
+ lang = $2
70
+ ial = $3
71
+
72
+ lines = []
73
+
74
+ # read until CloseFence
75
+ while src.cur_line
76
+ if src.cur_line =~ close_fence
77
+ src.shift_line
78
+ break
79
+ else
80
+ lines << src.shift_line
81
+ end
82
+ end
83
+
84
+ ial = nil unless ial && ial.size > 0
85
+ al = nil
86
+
87
+ if ial =~ /^\{(.*?)\}\s*$/
88
+ inside = $1
89
+ cs = MaRuKu::In::Markdown::SpanLevelParser::CharSource
90
+ al = ial && doc.read_attribute_list(cs.new(inside))
91
+ end
92
+
93
+ source = lines.join("\n")
94
+ context.push doc.md_codeblock(source, lang, al)
95
+ true
96
+ end
97
+ )
@@ -1,5 +1,3 @@
1
-
2
-
3
1
  require 'maruku/ext/math/elements'
4
2
  require 'maruku/ext/math/parsing'
5
3
  require 'maruku/ext/math/to_latex'
@@ -10,32 +8,30 @@ require 'maruku/ext/math/mathml_engines/ritex'
10
8
  require 'maruku/ext/math/mathml_engines/itex2mml'
11
9
  require 'maruku/ext/math/mathml_engines/blahtex'
12
10
 
13
-
14
- =begin maruku_doc
15
- Attribute: math_enabled
16
- Scope: global, document
17
- Summary: Enables parsing of LaTeX math
18
-
19
- To explicitly disable the math parsing:
20
-
21
- Maruku.new(string, {:math_enabled => false})
22
- {:ruby}
23
-
24
- =end
11
+ #=begin maruku_doc
12
+ # Attribute: math_enabled
13
+ # Scope: global, document
14
+ # Summary: Enables parsing of LaTeX math
15
+ #
16
+ # To explicitly disable the math parsing:
17
+ #
18
+ # Maruku.new(string, {:math_enabled => false})
19
+ # {:ruby}
20
+ #
21
+ #=end
25
22
 
26
23
  MaRuKu::Globals[:math_enabled] = true
27
24
 
28
25
 
29
- =begin maruku_doc
30
- Attribute: math_numbered
31
- Scope: global, document
32
- Summary: Math openings which should be numerated
33
-
34
- Array containing any of `'\\['`, `'\\begin{equation}'`, `'$$'`.
35
-
36
- MaRuKu::Globals[:math_numbered] = ['\\[']
37
-
38
- =end
39
-
26
+ #=begin maruku_doc
27
+ # Attribute: math_numbered
28
+ # Scope: global, document
29
+ # Summary: Math openings which should be numerated
30
+ #
31
+ # Array containing any of `'\\['`, `'\\begin{equation}'`, `'$$'`.
32
+ #
33
+ # MaRuKu::Globals[:math_numbered] = ['\\[']
34
+ #
35
+ #=end
40
36
 
41
- MaRuKu::Globals[:math_numbered] = []
37
+ MaRuKu::Globals[:math_numbered] = []
@@ -1,27 +1,21 @@
1
- module MaRuKu; class MDElement
2
-
3
- def md_inline_math(math)
4
- self.md_el(:inline_math, [], meta={:math=>math})
5
- end
1
+ module MaRuKu
2
+ class MDElement
3
+ def md_inline_math(math)
4
+ self.md_el(:inline_math, [], :math => math)
5
+ end
6
6
 
7
- def md_equation(math, label, numerate)
8
- reglabel= /\\label\{(\w+)\}/
9
- if math =~ reglabel
10
- label = $1
11
- math.gsub!(reglabel,'')
12
- end
13
- # puts "Found label = #{label} math #{math.inspect} "
14
- num = nil
15
- if (label || numerate) && @doc #take number
16
- @doc.eqid2eq ||= {}
17
- num = @doc.eqid2eq.size + 1
18
- label = "eq#{num}" if not label # FIXME do id for document
19
- end
20
- e = self.md_el(:equation, [], meta={:math=>math, :label=>label,:num=>num})
21
- if label && @doc #take number
22
- @doc.eqid2eq[label] = e
23
- end
24
- e
25
- end
26
-
27
- end end
7
+ def md_equation(math, label, numerate)
8
+ reglabel = /\\label\{(\w+)\}/
9
+ math = math.gsub(reglabel, '') if label = math[reglabel, 1]
10
+ num = nil
11
+ if (label || numerate) && @doc # take number
12
+ @doc.eqid2eq ||= {}
13
+ num = @doc.eqid2eq.size + 1
14
+ label = "eq#{num}" unless label # TODO do id for document
15
+ end
16
+ e = self.md_el(:equation, [], :math => math, :label => label, :num => num)
17
+ @doc.eqid2eq[label] = e if label && @doc # take number
18
+ e
19
+ end
20
+ end
21
+ end
@@ -1,107 +1,95 @@
1
-
2
- require 'tempfile'
3
1
  require 'fileutils'
4
2
  require 'digest/md5'
5
- require 'pstore'
6
-
7
- module MaRuKu; module Out; module HTML
8
-
9
- PNG = Struct.new(:src,:depth,:height)
10
-
11
- def convert_to_png_blahtex(kind, tex)
12
- begin
13
- FileUtils::mkdir_p get_setting(:html_png_dir)
14
-
15
- # first, we check whether this image has already been processed
16
- md5sum = Digest::MD5.hexdigest(tex+" params: ")
17
- result_file = File.join(get_setting(:html_png_dir), md5sum+".txt")
18
-
19
- if not File.exists?(result_file)
20
- tmp_in = Tempfile.new('maruku_blahtex')
21
- f = tmp_in.open
22
- f.write tex
23
- f.close
24
-
25
- resolution = get_setting(:html_png_resolution)
26
-
27
- options = "--png --use-preview-package --shell-dvipng 'dvipng -D #{resolution}' "
28
- options += "--displaymath " if kind == :equation
29
- options += ("--temp-directory '%s' " % get_setting(:html_png_dir))
30
- options += ("--png-directory '%s'" % get_setting(:html_png_dir))
31
-
32
- cmd = "blahtex #{options} < #{tmp_in.path} > #{result_file}"
33
- #$stderr.puts "$ #{cmd}"
34
- system cmd
35
- tmp_in.delete
36
- end
37
-
3
+ require 'rexml/document'
4
+
5
+ module MaRuKu::Out::HTML
6
+ PNG = Struct.new(:src, :depth, :height)
7
+
8
+ def convert_to_png_blahtex(kind, tex)
9
+ FileUtils.mkdir_p get_setting(:html_png_dir)
10
+
11
+ # first, we check whether this image has already been processed
12
+ md5sum = Digest::MD5.hexdigest(tex + " params: ")
13
+ result_file = File.join(get_setting(:html_png_dir), md5sum + ".txt")
14
+
15
+ if File.exists?(result_file)
38
16
  result = File.read(result_file)
39
- if result.nil? || result.empty?
40
- raise "Blahtex error: empty output"
41
- end
42
-
43
- doc = Document.new(result, {:respect_whitespace =>:all})
44
- png = doc.root.elements[1]
45
- if png.name != 'png'
46
- raise "Blahtex error: \n#{doc}"
47
- end
48
- depth = png.elements['depth'] || (raise "No depth element in:\n #{doc}")
49
- height = png.elements['height'] || (raise "No height element in:\n #{doc}")
50
- md5 = png.elements['md5'] || (raise "No md5 element in:\n #{doc}")
51
-
52
- depth = depth.text.to_f
53
- height = height.text.to_f # XXX check != 0
54
- md5 = md5.text
55
-
56
- dir_url = get_setting(:html_png_url)
57
- return PNG.new("#{dir_url}#{md5}.png", depth, height)
58
- rescue Exception => e
59
- maruku_error "Error: #{e}"
60
- end
61
- nil
62
- end
63
-
64
-
65
- def convert_to_mathml_blahtex(kind, tex)
66
- @@BlahtexCache = PStore.new(get_setting(:latex_cache_file))
67
-
68
- begin
69
- @@BlahtexCache.transaction do
70
- if @@BlahtexCache[tex].nil?
71
- tmp_in = Tempfile.new('maruku_blahtex')
72
- f = tmp_in.open
73
- f.write tex
74
- f.close
75
- tmp_out = Tempfile.new('maruku_blahtex')
76
-
77
- options = "--mathml"
78
- cmd = "blahtex #{options} < #{tmp_in.path} > #{tmp_out.path}"
79
- #$stderr.puts "$ #{cmd}"
80
- system cmd
81
- tmp_in.delete
82
-
83
- result = nil
84
- File.open(tmp_out.path) do |f| result=f.read end
85
- puts result
86
-
87
- @@BlahtexCache[tex] = result
88
- end
89
-
90
- blahtex = @@BlahtexCache[tex]
91
- doc = Document.new(blahtex, {:respect_whitespace =>:all})
92
- mathml = doc.root.elements['mathml']
93
- if not mathml
94
- maruku_error "Blahtex error: \n#{doc}"
95
- return nil
96
- else
97
- return mathml
98
- end
99
- end
100
-
101
- rescue Exception => e
102
- maruku_error "Error: #{e}"
103
- end
104
- nil
105
- end
106
-
107
- end end end
17
+ else
18
+ args = [
19
+ '--png',
20
+ '--use-preview-package',
21
+ '--shell-dvipng',
22
+ "dvipng -D #{Shellwords.shellescape(get_setting(:html_png_resolution).to_s)}",
23
+ "--temp-directory #{Shellwords.shellescape(get_setting(:html_png_dir))}",
24
+ "--png-directory #{Shellwords.shellescape(get_setting(:html_png_dir))}"
25
+ ]
26
+ args << '--displaymath' if kind == :equation
27
+
28
+ result = run_blahtex(tex, args)
29
+ end
30
+
31
+ if result.nil? || result.empty?
32
+ maruku_error "Blahtex error: empty output"
33
+ return
34
+ end
35
+
36
+ doc = REXML::Document.new(result)
37
+ png = doc.root.elements.to_a.first
38
+ if png.name != 'png'
39
+ maruku_error "Blahtex error: \n#{doc}"
40
+ return
41
+ end
42
+
43
+ raise "No depth element in:\n #{doc}" unless depth = png.xpath('//depth')[0]
44
+ raise "No height element in:\n #{doc}" unless height = png.xpath('//height')[0]
45
+ raise "No md5 element in:\n #{doc}" unless md5 = png.xpath('//md5')[0]
46
+
47
+ depth = depth.text.to_f
48
+ height = height.text.to_f
49
+ raise "Height or depth was 0! in \n #{doc}" if height == 0 || depth == 0
50
+
51
+ md5 = md5.text
52
+
53
+ PNG.new("#{get_setting(:html_png_url)}#{md5}.png", depth, height)
54
+ rescue => e
55
+ maruku_error "Error: #{e}"
56
+ nil
57
+ end
58
+
59
+ def convert_to_mathml_blahtex(kind, tex)
60
+ result = run_blahtex(tex, %w[--mathml])
61
+
62
+ doc = REXML::Document.new(result)
63
+ mathml = doc.get_elements('//markup').to_a.first
64
+ unless mathml
65
+ maruku_error "Blahtex error: \n#{doc}"
66
+ return nil
67
+ end
68
+
69
+ mathml.name = 'math'
70
+ mathml.attributes['xmlns'] = "http://www.w3.org/1998/Math/MathML"
71
+ mathml.attributes['display'] = (kind == :inline) ? :inline : :block
72
+
73
+ MaRuKu::HTMLFragment.new(mathml.to_s)
74
+ rescue => e
75
+ maruku_error "Error: #{e}"
76
+ nil
77
+ end
78
+
79
+ private
80
+
81
+ # Run blahtex, return output
82
+ def run_blahtex(tex, args)
83
+ IO.popen(['blahtex', *args].join(' '), 'w+') do |blahtex|
84
+ blahtex.write tex
85
+ blahtex.close_write
86
+
87
+ output = blahtex.read
88
+ blahtex.close_read
89
+
90
+ raise "Error running blahtex" unless $?.success?
91
+
92
+ output
93
+ end
94
+ end
95
+ end
@@ -1,29 +1,36 @@
1
+ module MaRuKu::Out::HTML
2
+ def convert_to_mathml_itex2mml(kind, tex)
3
+ return if $already_warned_itex2mml
4
+ begin
5
+ require 'itextomml'
6
+ rescue LoadError => e
7
+ maruku_error "Could not load package 'itex2mml'.\nPlease install it." unless $already_warned_itex2mml
8
+ $already_warned_itex2mml = true
9
+ return nil
10
+ end
1
11
 
2
- module MaRuKu; module Out; module HTML
12
+ begin
13
+ require 'instiki_stringsupport'
14
+ rescue LoadError
15
+ require 'itex_stringsupport'
16
+ end
3
17
 
4
- def convert_to_mathml_itex2mml(kind, tex)
5
- begin
6
- if not $itex2mml_parser
7
- require 'itextomml'
8
- $itex2mml_parser = Itex2MML::Parser.new
9
- end
10
-
11
- itex_method = {:equation=>:block_filter,:inline=>:inline_filter}
12
-
13
- mathml = $itex2mml_parser.send(itex_method[kind], tex)
14
- doc = Document.new(mathml, {:respect_whitespace =>:all}).root
15
- return doc
16
- rescue LoadError => e
17
- maruku_error "Could not load package 'itex2mml'.\n"+ "Please install it." unless $already_warned_itex2mml
18
- $already_warned_itex2mml = true
19
- rescue REXML::ParseException => e
20
- maruku_error "Invalid MathML TeX: \n#{add_tabs(tex,1,'tex>')}"+
21
- "\n\n #{e.inspect}"
22
- rescue
23
- maruku_error "Could not produce MathML TeX: \n#{tex}"+
24
- "\n\n #{e.inspect}"
25
- end
26
- nil
27
- end
18
+ parser = Itex2MML::Parser.new
19
+ mathml =
20
+ case kind
21
+ when :equation
22
+ parser.block_filter(tex)
23
+ when :inline
24
+ parser.inline_filter(tex)
25
+ else
26
+ maruku_error "Unknown itex2mml kind: #{kind}"
27
+ return
28
+ end
29
+
30
+ MaRuKu::HTMLFragment.new(mathml.to_utf8)
31
+ rescue => e
32
+ maruku_error "Invalid MathML TeX: \n#{tex.gsub(/^/, 'tex>')}\n\n #{e.inspect}"
33
+ nil
34
+ end
35
+ end
28
36
 
29
- end end end