From 13a522525c45d532581cb58ae2f26511b4f2c962 Mon Sep 17 00:00:00 2001 From: Jacques Distler Date: Thu, 11 Aug 2011 20:36:44 -0500 Subject: [PATCH] REXML is dead. Long live Nokogiri. Modify Maruku to use Nokogiri instead of REXML. Produces a 3-fold speedup in the #to_html method. --- test/unit/page_renderer_test.rb | 7 + vendor/plugins/maruku/bin/marutest | 350 ----- .../maruku/ext/math/mathml_engines/blahtex.rb | 11 +- .../ext/math/mathml_engines/itex2mml.rb | 6 +- .../maruku/ext/math/mathml_engines/none.rb | 7 +- .../maruku/lib/maruku/ext/math/to_html.rb | 63 +- vendor/plugins/maruku/lib/maruku/helpers.rb | 9 +- .../maruku/lib/maruku/input/charsource.rb | 10 +- .../maruku/lib/maruku/input/html_helper.rb | 2 - .../maruku/lib/maruku/input/parse_doc.rb | 21 +- .../lib/maruku/input/parse_span_better.rb | 2 +- .../maruku/lib/maruku/output/s5/to_s5.rb | 70 +- .../maruku/lib/maruku/output/to_html.rb | 327 ++-- .../lib/maruku/output/to_latex_entities.rb | 16 +- vendor/plugins/maruku/lib/maruku/toc.rb | 18 +- vendor/plugins/maruku/miscs/bug.rb | 3 + vendor/plugins/maruku/miscs/test.rb | 29 + .../block_docs}/abbreviations.md | 14 +- .../unittest => spec/block_docs}/alt.md | 14 +- .../block_docs}/attributes/att2.md | 12 - .../block_docs}/attributes/att3.md | 16 +- .../block_docs}/attributes/attributes.md | 24 +- .../block_docs}/attributes/circular.md | 12 - .../block_docs}/attributes/default.md | 14 +- .../unittest => spec/block_docs}/blank.md | 12 - .../block_docs}/blanks_in_code.md | 12 - .../unittest => spec/block_docs}/bug_def.md | 12 - .../unittest => spec/block_docs}/bug_table.md | 16 +- .../unittest => spec/block_docs}/code.md | 14 +- .../unittest => spec/block_docs}/code2.md | 12 - .../unittest => spec/block_docs}/code3.md | 12 - .../unittest => spec/block_docs}/data_loss.md | 12 - .../unittest => spec/block_docs}/divs/div1.md | 12 - .../unittest => spec/block_docs}/divs/div2.md | 12 - .../block_docs}/divs/div3_nest.md | 16 +- .../unittest => spec/block_docs}/easy.md | 12 - .../unittest => spec/block_docs}/email.md | 12 - .../block_docs}/encoding/iso-8859-1.md | 17 +- .../block_docs}/encoding/utf-8.md | 14 +- .../unittest => spec/block_docs}/entities.md | 22 +- .../unittest => spec/block_docs}/escaping.md | 12 - .../unittest => spec/block_docs}/extra_dl.md | 12 - .../block_docs}/extra_header_id.md | 20 +- .../block_docs}/extra_table1.md | 16 +- .../unittest => spec/block_docs}/footnotes.md | 28 +- .../unittest => spec/block_docs}/headers.md | 24 +- .../block_docs}/hex_entities.md | 12 - .../unittest => spec/block_docs}/hrule.md | 12 - .../unittest => spec/block_docs}/html2.md | 16 +- .../unittest => spec/block_docs}/html3.md | 14 +- .../unittest => spec/block_docs}/html4.md | 16 +- .../unittest => spec/block_docs}/html5.md | 16 +- .../{tests/unittest => spec/block_docs}/ie.md | 22 +- .../unittest => spec/block_docs}/images.md | 22 +- .../unittest => spec/block_docs}/images2.md | 16 +- .../block_docs}/inline_html.md | 36 +- .../block_docs}/inline_html2.md | 12 - .../unittest => spec/block_docs}/links.md | 36 +- .../unittest => spec/block_docs}/links2.md | 12 - .../unittest => spec/block_docs}/list1.md | 12 - .../unittest => spec/block_docs}/list12.md | 14 +- .../unittest => spec/block_docs}/list2.md | 12 - .../unittest => spec/block_docs}/list3.md | 12 - .../unittest => spec/block_docs}/list4.md | 12 - .../unittest => spec/block_docs}/lists.md | 12 - .../unittest => spec/block_docs}/lists10.md | 18 +- .../plugins/maruku/spec/block_docs/lists11.md | 23 + .../unittest => spec/block_docs}/lists6.md | 12 - .../unittest => spec/block_docs}/lists9.md | 12 - .../block_docs}/lists_after_paragraph.md | 26 +- .../unittest => spec/block_docs}/lists_ol.md | 12 - .../unittest => spec/block_docs}/loss.md | 14 +- .../maruku/spec/block_docs/math/equations.md | 45 + .../block_docs}/math/inline.md | 12 - .../maruku/spec/block_docs/math/math2.md | 45 + .../block_docs}/math/notmath.md | 12 - .../block_docs}/math/table.md | 16 +- .../block_docs}/math/table2.md | 16 +- .../unittest => spec/block_docs}/misc_sw.md | 76 +- .../block_docs}/notyet/escape.md | 12 - .../block_docs}/notyet/header_after_par.md | 24 +- .../block_docs}/notyet/ticks.md | 12 - .../block_docs}/notyet/triggering.md | 24 +- .../unittest => spec/block_docs}/olist.md | 12 - .../unittest => spec/block_docs}/one.md | 12 - .../unittest => spec/block_docs}/paragraph.md | 12 - .../paragraph_rules/dont_merge_ref.md | 12 - .../paragraph_rules/tab_is_blank.md | 12 - .../block_docs}/paragraphs.md | 14 +- .../block_docs}/pending/amps.md | 12 - .../block_docs}/pending/empty_cells.md | 16 +- .../block_docs}/pending/link.md | 26 +- .../block_docs}/pending/ref.md | 14 +- .../block_docs}/recover/recover_links.md | 12 - .../spec/block_docs/red_tests/abbrev.md | 679 ++++++++ .../spec/block_docs/red_tests/lists7.md | 32 + .../spec/block_docs/red_tests/lists7b.md | 65 + .../block_docs}/red_tests/lists8.md | 34 - .../maruku/spec/block_docs/red_tests/ref.md | 23 + .../block_docs}/red_tests/xml.html | 0 .../block_docs/red_tests}/xml.md | 14 +- .../block_docs}/references/long_example.md | 14 +- .../references/spaces_and_numbers.md | 12 - .../block_docs}/smartypants.md | 16 +- .../unittest => spec/block_docs}/syntax_hl.md | 16 +- .../block_docs}/table_attributes.md | 14 +- .../unittest => spec/block_docs}/test.md | 12 - .../block_docs}/underscore_in_words.html | 0 .../block_docs}/underscore_in_words.md | 12 - .../unittest => spec/block_docs}/wrapping.md | 16 +- .../unittest => spec/block_docs}/xml2.md | 12 - .../unittest => spec/block_docs}/xml3.md | 12 - .../block_docs}/xml_instruction.md | 14 +- vendor/plugins/maruku/spec/block_spec.rb | 52 + vendor/plugins/maruku/spec/span_spec.rb | 254 +++ vendor/plugins/maruku/spec/spec_helper.rb | 7 + vendor/plugins/maruku/tests/Makefile | 5 - .../tests/MarkdownTest_1.0/MarkdownTest.pl | 157 -- .../Tests/Amps and angle encoding.html | 38 - .../Tests/Amps and angle encoding.html.dist | 17 - .../Tests/Amps and angle encoding.text | 23 - .../MarkdownTest_1.0/Tests/Auto links.html | 36 - .../Tests/Auto links.html.dist | 18 - .../MarkdownTest_1.0/Tests/Auto links.text | 13 - .../Tests/Backslash escapes.html | 122 -- .../Tests/Backslash escapes.html.dist | 102 -- .../Tests/Backslash escapes.text | 104 -- .../Tests/Blockquotes with code blocks.html | 33 - .../Blockquotes with code blocks.html.dist | 15 - .../Tests/Blockquotes with code blocks.text | 11 - ...apped paragraphs with list-like lines.html | 22 - ... paragraphs with list-like lines.html.dist | 8 - ...apped paragraphs with list-like lines.text | 8 - .../Tests/Horizontal rules.html | 91 -- .../Tests/Horizontal rules.html.dist | 71 - .../Tests/Horizontal rules.text | 67 - .../Tests/Inline HTML (Advanced).html | 39 - .../Tests/Inline HTML (Advanced).html.dist | 14 - .../Tests/Inline HTML (Advanced).text | 14 - .../Tests/Inline HTML (Simple).html | 88 -- .../Tests/Inline HTML (Simple).html.dist | 72 - .../Tests/Inline HTML (Simple).text | 69 - .../Tests/Inline HTML comments.html | 26 - .../Tests/Inline HTML comments.html.dist | 13 - .../Tests/Inline HTML comments.text | 13 - .../Tests/Links, inline style.html | 28 - .../Tests/Links, inline style.html.dist | 9 - .../Tests/Links, inline style.text | 9 - .../Tests/Links, reference style.html | 38 - .../Tests/Links, reference style.html.dist | 18 - .../Tests/Links, reference style.text | 31 - .../Tests/Literal quotes in titles.html | 22 - .../Tests/Literal quotes in titles.html.dist | 3 - .../Tests/Literal quotes in titles.text | 7 - .../Markdown Documentation - Basics.html | 322 ---- .../Markdown Documentation - Basics.html.dist | 314 ---- .../Markdown Documentation - Basics.text | 306 ---- .../Markdown Documentation - Syntax.html | 840 ---------- .../Markdown Documentation - Syntax.html.dist | 942 ----------- .../Markdown Documentation - Syntax.text | 888 ----------- .../Tests/Nested blockquotes.html | 28 - .../Tests/Nested blockquotes.html.dist | 9 - .../Tests/Nested blockquotes.text | 5 - .../Tests/Ordered and unordered lists.html | 228 --- .../Ordered and unordered lists.html.dist | 137 -- .../Tests/Ordered and unordered lists.text | 122 -- .../Tests/Strong and em together.html | 26 - .../Tests/Strong and em together.html.dist | 7 - .../Tests/Strong and em together.text | 7 - .../tests/MarkdownTest_1.0/Tests/Tabs.html | 46 - .../MarkdownTest_1.0/Tests/Tabs.html.dist | 25 - .../tests/MarkdownTest_1.0/Tests/Tabs.text | 21 - .../MarkdownTest_1.0/Tests/Tidyness.html | 30 - .../MarkdownTest_1.0/Tests/Tidyness.html.dist | 8 - .../MarkdownTest_1.0/Tests/Tidyness.text | 5 - .../maruku/tests/bugs/code_in_links.md | 16 - .../maruku/tests/bugs/complex_escaping.md | 4 - vendor/plugins/maruku/tests/convert_all.sh | 6 - vendor/plugins/maruku/tests/math/math.css | 40 - vendor/plugins/maruku/tests/math/preamble.tex | 2 - vendor/plugins/maruku/tests/math/run.sh | 7 - vendor/plugins/maruku/tests/math/syntax.md | 46 - vendor/plugins/maruku/tests/math/syntax.xhtml | 37 - vendor/plugins/maruku/tests/math/use_itex.rb | 34 - .../maruku/tests/math_usage/document.md | 13 - .../plugins/maruku/tests/math_usage/math.css | 26 - .../plugins/maruku/tests/math_usage/script.sh | 13 - .../tests/others/Backslash escapes.text | 106 -- .../maruku/tests/others/abbreviations.html | 16 - .../maruku/tests/others/abbreviations.md | 11 - vendor/plugins/maruku/tests/others/blank.html | 16 - vendor/plugins/maruku/tests/others/blank.md | 4 - vendor/plugins/maruku/tests/others/code.html | 18 - vendor/plugins/maruku/tests/others/code.md | 5 - vendor/plugins/maruku/tests/others/code2.html | 26 - vendor/plugins/maruku/tests/others/code2.md | 8 - vendor/plugins/maruku/tests/others/code3.html | 29 - vendor/plugins/maruku/tests/others/code3.md | 16 - vendor/plugins/maruku/tests/others/email.html | 14 - vendor/plugins/maruku/tests/others/email.md | 4 - .../plugins/maruku/tests/others/entities.html | 59 - .../plugins/maruku/tests/others/entities.md | 19 - .../plugins/maruku/tests/others/escaping.html | 26 - .../plugins/maruku/tests/others/escaping.md | 16 - .../plugins/maruku/tests/others/extra_dl.html | 157 -- .../plugins/maruku/tests/others/extra_dl.md | 101 -- .../maruku/tests/others/extra_header_id.html | 22 - .../maruku/tests/others/extra_header_id.md | 13 - .../maruku/tests/others/extra_table1.html | 114 -- .../maruku/tests/others/extra_table1.md | 40 - .../maruku/tests/others/footnotes.html | 38 - .../plugins/maruku/tests/others/footnotes.md | 17 - .../plugins/maruku/tests/others/headers.html | 18 - vendor/plugins/maruku/tests/others/headers.md | 10 - vendor/plugins/maruku/tests/others/hrule.html | 22 - vendor/plugins/maruku/tests/others/hrule.md | 10 - .../plugins/maruku/tests/others/images.html | 22 - vendor/plugins/maruku/tests/others/images.md | 20 - .../maruku/tests/others/inline_html.html | 54 - .../maruku/tests/others/inline_html.md | 42 - vendor/plugins/maruku/tests/others/links.html | 34 - vendor/plugins/maruku/tests/others/links.md | 38 - vendor/plugins/maruku/tests/others/list1.html | 22 - vendor/plugins/maruku/tests/others/list1.md | 4 - vendor/plugins/maruku/tests/others/list2.html | 20 - vendor/plugins/maruku/tests/others/list2.md | 5 - vendor/plugins/maruku/tests/others/list3.html | 28 - vendor/plugins/maruku/tests/others/list3.md | 8 - vendor/plugins/maruku/tests/others/lists.html | 52 - vendor/plugins/maruku/tests/others/lists.md | 32 - .../tests/others/lists_after_paragraph.html | 54 - .../others/lists_after_paragraph.markdown-pl | 23 - .../tests/others/lists_after_paragraph.md | 44 - .../plugins/maruku/tests/others/lists_ol.html | 60 - .../plugins/maruku/tests/others/lists_ol.md | 39 - .../plugins/maruku/tests/others/misc_sw.html | 92 -- vendor/plugins/maruku/tests/others/misc_sw.md | 105 -- vendor/plugins/maruku/tests/others/one.html | 14 - vendor/plugins/maruku/tests/others/one.md | 1 - .../maruku/tests/others/paragraphs.html | 21 - .../plugins/maruku/tests/others/paragraphs.md | 13 - vendor/plugins/maruku/tests/others/sss06.html | 227 --- vendor/plugins/maruku/tests/others/sss06.md | 352 ----- vendor/plugins/maruku/tests/others/style.css | 27 - vendor/plugins/maruku/tests/others/test.html | 24 - vendor/plugins/maruku/tests/others/test.md | 4 - vendor/plugins/maruku/tests/s5/s5profiling.md | 48 - .../maruku/tests/s5/ui/default/blank.gif | Bin 49 -> 0 bytes .../maruku/tests/s5/ui/default/bodybg.gif | Bin 10119 -> 0 bytes .../maruku/tests/s5/ui/default/framing.css | 23 - .../maruku/tests/s5/ui/default/iepngfix.htc | 42 - .../maruku/tests/s5/ui/default/opera.css | 7 - .../maruku/tests/s5/ui/default/outline.css | 15 - .../maruku/tests/s5/ui/default/pretty.css | 86 - .../maruku/tests/s5/ui/default/print.css | 1 - .../maruku/tests/s5/ui/default/s5-core.css | 9 - .../maruku/tests/s5/ui/default/slides.css | 3 - .../maruku/tests/s5/ui/default/slides.js | 552 ------- .../maruku/tests/s5/ui/i18n/00_head.txt | 8 - .../maruku/tests/s5/ui/i18n/bg-shade.png | Bin 594 -> 0 bytes .../maruku/tests/s5/ui/i18n/bg-slide.jpg | Bin 31239 -> 0 bytes .../maruku/tests/s5/ui/i18n/framing.css | 23 - .../maruku/tests/s5/ui/i18n/pretty.css | 44 - .../maruku/tests/s5/ui/i18n/s5-core.css | 9 - .../maruku/tests/s5/ui/i18n/slides.css | 3 - .../maruku/tests/unittest/abbreviations.html | 11 - vendor/plugins/maruku/tests/unittest/alt.html | 9 - .../tests/unittest/attributes/att2.html | 7 - .../tests/unittest/attributes/att3.html | 11 - .../tests/unittest/attributes/attributes.html | 17 - .../tests/unittest/attributes/circular.html | 9 - .../tests/unittest/attributes/default.html | 9 - .../plugins/maruku/tests/unittest/blank.html | 11 - .../maruku/tests/unittest/blanks_in_code.html | 24 - .../maruku/tests/unittest/bug_def.html | 9 - .../maruku/tests/unittest/bug_table.html | 10 - .../plugins/maruku/tests/unittest/code.html | 14 - .../plugins/maruku/tests/unittest/code2.html | 13 - .../plugins/maruku/tests/unittest/code3.html | 23 - .../maruku/tests/unittest/data_loss.html | 11 - .../maruku/tests/unittest/divs/div1.html | 55 - .../maruku/tests/unittest/divs/div2.html | 11 - .../maruku/tests/unittest/divs/div3_nest.html | 17 - .../plugins/maruku/tests/unittest/easy.html | 9 - .../plugins/maruku/tests/unittest/email.html | 9 - .../tests/unittest/encoding/iso-8859-1.html | 9 - .../maruku/tests/unittest/encoding/utf-8.html | 9 - .../maruku/tests/unittest/entities.html | 22 - .../maruku/tests/unittest/escaping.html | 17 - .../maruku/tests/unittest/extra_dl.html | 18 - .../tests/unittest/extra_header_id.html | 17 - .../maruku/tests/unittest/extra_table1.html | 10 - .../maruku/tests/unittest/footnotes.html | 21 - .../maruku/tests/unittest/headers.html | 13 - .../maruku/tests/unittest/hex_entities.html | 9 - .../plugins/maruku/tests/unittest/hrule.html | 7 - .../plugins/maruku/tests/unittest/html2.html | 9 - .../plugins/maruku/tests/unittest/html3.html | 9 - .../plugins/maruku/tests/unittest/html4.html | 7 - .../plugins/maruku/tests/unittest/html5.html | 7 - vendor/plugins/maruku/tests/unittest/ie.html | 17 - .../plugins/maruku/tests/unittest/images.html | 17 - .../maruku/tests/unittest/images2.html | 11 - .../maruku/tests/unittest/inline_html.html | 31 - .../maruku/tests/unittest/inline_html2.html | 7 - .../plugins/maruku/tests/unittest/links.html | 27 - .../plugins/maruku/tests/unittest/list1.html | 17 - .../plugins/maruku/tests/unittest/list2.html | 19 - .../plugins/maruku/tests/unittest/list3.html | 23 - .../plugins/maruku/tests/unittest/list4.html | 27 - .../plugins/maruku/tests/unittest/lists.html | 47 - .../maruku/tests/unittest/lists11.html | 9 - .../plugins/maruku/tests/unittest/lists11.md | 28 - .../plugins/maruku/tests/unittest/lists6.html | 7 - .../plugins/maruku/tests/unittest/lists7.html | 13 - .../plugins/maruku/tests/unittest/lists7.md | 98 -- .../maruku/tests/unittest/lists7b.html | 23 - .../plugins/maruku/tests/unittest/lists7b.md | 153 -- .../plugins/maruku/tests/unittest/lists8.html | 11 - .../plugins/maruku/tests/unittest/lists8.md | 98 -- .../plugins/maruku/tests/unittest/lists9.html | 25 - .../tests/unittest/lists_after_paragraph.html | 45 - .../maruku/tests/unittest/lists_ol.html | 69 - .../plugins/maruku/tests/unittest/loss.html | 7 - .../maruku/tests/unittest/math/equations.html | 15 - .../maruku/tests/unittest/math/equations.md | 86 - .../maruku/tests/unittest/math/inline.html | 17 - .../maruku/tests/unittest/math/math2.html | 17 - .../maruku/tests/unittest/math/math2.md | 57 - .../maruku/tests/unittest/math/notmath.html | 11 - .../maruku/tests/unittest/math/table.html | 7 - .../maruku/tests/unittest/math/table2.html | 9 - .../maruku/tests/unittest/misc_sw.html | 87 -- .../maruku/tests/unittest/notyet/escape.html | 11 - .../unittest/notyet/header_after_par.html | 19 - .../maruku/tests/unittest/notyet/ticks.html | 9 - .../tests/unittest/notyet/triggering.html | 37 - .../plugins/maruku/tests/unittest/olist.html | 17 - vendor/plugins/maruku/tests/unittest/one.html | 9 - .../maruku/tests/unittest/paragraph.html | 9 - .../paragraph_rules/dont_merge_ref.html | 13 - .../paragraph_rules/tab_is_blank.html | 11 - .../maruku/tests/unittest/paragraphs.html | 13 - .../maruku/tests/unittest/pending/amps.html | 9 - .../tests/unittest/pending/empty_cells.html | 9 - .../maruku/tests/unittest/pending/link.html | 25 - .../tests/unittest/recover/recover_links.html | 9 - .../tests/unittest/red_tests/abbrev.html | 101 -- .../maruku/tests/unittest/red_tests/abbrev.md | 1388 ----------------- .../maruku/tests/unittest/red_tests/lists7.md | 68 - .../tests/unittest/red_tests/lists7b.md | 128 -- .../maruku/tests/unittest/red_tests/xml.md | 70 - .../unittest/references/long_example.html | 11 - .../references/spaces_and_numbers.html | 7 - .../maruku/tests/unittest/smartypants.html | 25 - .../maruku/tests/unittest/syntax_hl.html | 19 - .../tests/unittest/table_attributes.html | 8 - .../plugins/maruku/tests/unittest/test.html | 9 - .../maruku/tests/unittest/wrapping.html | 15 - vendor/plugins/maruku/tests/unittest/xml.html | 15 - .../plugins/maruku/tests/unittest/xml2.html | 7 - .../plugins/maruku/tests/unittest/xml3.html | 7 - .../tests/unittest/xml_instruction.html | 11 - .../plugins/maruku/tests/utf8-files/TeX.html | 229 --- .../plugins/maruku/tests/utf8-files/TeX.tex | 219 --- .../plugins/maruku/tests/utf8-files/TeX.txt | 210 --- .../plugins/maruku/tests/utf8-files/simple.md | 1 - .../maruku/tests/utf8-files/simple.tex | 18 - .../plugins/maruku/tests/utf8-files/ucs.sty | 749 --------- 369 files changed, 1703 insertions(+), 16342 deletions(-) delete mode 100644 vendor/plugins/maruku/bin/marutest create mode 100644 vendor/plugins/maruku/miscs/bug.rb create mode 100644 vendor/plugins/maruku/miscs/test.rb rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/abbreviations.md (82%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/alt.md (64%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/attributes/att2.md (71%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/attributes/att3.md (70%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/attributes/attributes.md (73%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/attributes/circular.md (76%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/attributes/default.md (71%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/blank.md (74%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/blanks_in_code.md (90%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/bug_def.md (71%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/bug_table.md (75%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/code.md (80%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/code2.md (79%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/code3.md (90%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/data_loss.md (78%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/divs/div1.md (93%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/divs/div2.md (74%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/divs/div3_nest.md (87%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/easy.md (77%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/email.md (83%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/encoding/iso-8859-1.md (68%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/encoding/utf-8.md (74%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/entities.md (81%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/escaping.md (94%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/extra_dl.md (93%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/extra_header_id.md (84%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/extra_table1.md (74%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/footnotes.md (76%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/headers.md (53%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/hex_entities.md (91%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/hrule.md (83%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/html2.md (69%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/html3.md (71%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/html4.md (67%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/html5.md (67%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/ie.md (64%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/images.md (78%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/images2.md (70%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/inline_html.md (82%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/inline_html2.md (77%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/links.md (79%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/links2.md (80%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/list1.md (87%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/list12.md (75%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/list2.md (93%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/list3.md (91%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/list4.md (91%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/lists.md (98%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/lists10.md (63%) create mode 100644 vendor/plugins/maruku/spec/block_docs/lists11.md rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/lists6.md (75%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/lists9.md (87%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/lists_after_paragraph.md (90%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/lists_ol.md (98%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/loss.md (65%) create mode 100644 vendor/plugins/maruku/spec/block_docs/math/equations.md rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/math/inline.md (89%) create mode 100644 vendor/plugins/maruku/spec/block_docs/math/math2.md rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/math/notmath.md (79%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/math/table.md (56%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/math/table2.md (72%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/misc_sw.md (85%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/notyet/escape.md (77%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/notyet/header_after_par.md (64%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/notyet/ticks.md (79%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/notyet/triggering.md (88%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/olist.md (84%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/one.md (70%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/paragraph.md (71%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/paragraph_rules/dont_merge_ref.md (83%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/paragraph_rules/tab_is_blank.md (77%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/paragraphs.md (79%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/pending/amps.md (76%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/pending/empty_cells.md (63%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/pending/link.md (74%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/pending/ref.md (71%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/recover/recover_links.md (79%) create mode 100644 vendor/plugins/maruku/spec/block_docs/red_tests/abbrev.md create mode 100644 vendor/plugins/maruku/spec/block_docs/red_tests/lists7.md create mode 100644 vendor/plugins/maruku/spec/block_docs/red_tests/lists7b.md rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/red_tests/lists8.md (51%) create mode 100644 vendor/plugins/maruku/spec/block_docs/red_tests/ref.md rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/red_tests/xml.html (100%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs/red_tests}/xml.md (88%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/references/long_example.md (83%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/references/spaces_and_numbers.md (72%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/smartypants.md (91%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/syntax_hl.md (77%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/table_attributes.md (69%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/test.md (76%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/underscore_in_words.html (100%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/underscore_in_words.md (78%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/wrapping.md (89%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/xml2.md (67%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/xml3.md (77%) rename vendor/plugins/maruku/{tests/unittest => spec/block_docs}/xml_instruction.md (87%) create mode 100644 vendor/plugins/maruku/spec/block_spec.rb create mode 100644 vendor/plugins/maruku/spec/span_spec.rb create mode 100644 vendor/plugins/maruku/spec/spec_helper.rb delete mode 100644 vendor/plugins/maruku/tests/Makefile delete mode 100755 vendor/plugins/maruku/tests/MarkdownTest_1.0/MarkdownTest.pl delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Amps and angle encoding.html delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Amps and angle encoding.html.dist delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Amps and angle encoding.text delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Auto links.html delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Auto links.html.dist delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Auto links.text delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Backslash escapes.html delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Backslash escapes.html.dist delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Backslash escapes.text delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Blockquotes with code blocks.html delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Blockquotes with code blocks.html.dist delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Blockquotes with code blocks.text delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Hard-wrapped paragraphs with list-like lines.html delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Hard-wrapped paragraphs with list-like lines.html.dist delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Hard-wrapped paragraphs with list-like lines.text delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Horizontal rules.html delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Horizontal rules.html.dist delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Horizontal rules.text delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Inline HTML (Advanced).html delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Inline HTML (Advanced).html.dist delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Inline HTML (Advanced).text delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Inline HTML (Simple).html delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Inline HTML (Simple).html.dist delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Inline HTML (Simple).text delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Inline HTML comments.html delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Inline HTML comments.html.dist delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Inline HTML comments.text delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Links, inline style.html delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Links, inline style.html.dist delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Links, inline style.text delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Links, reference style.html delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Links, reference style.html.dist delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Links, reference style.text delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Literal quotes in titles.html delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Literal quotes in titles.html.dist delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Literal quotes in titles.text delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Markdown Documentation - Basics.html delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Markdown Documentation - Basics.html.dist delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Markdown Documentation - Basics.text delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Markdown Documentation - Syntax.html delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Markdown Documentation - Syntax.html.dist delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Markdown Documentation - Syntax.text delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Nested blockquotes.html delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Nested blockquotes.html.dist delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Nested blockquotes.text delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Ordered and unordered lists.html delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Ordered and unordered lists.html.dist delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Ordered and unordered lists.text delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Strong and em together.html delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Strong and em together.html.dist delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Strong and em together.text delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Tabs.html delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Tabs.html.dist delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Tabs.text delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Tidyness.html delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Tidyness.html.dist delete mode 100644 vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Tidyness.text delete mode 100644 vendor/plugins/maruku/tests/bugs/code_in_links.md delete mode 100644 vendor/plugins/maruku/tests/bugs/complex_escaping.md delete mode 100755 vendor/plugins/maruku/tests/convert_all.sh delete mode 100644 vendor/plugins/maruku/tests/math/math.css delete mode 100644 vendor/plugins/maruku/tests/math/preamble.tex delete mode 100755 vendor/plugins/maruku/tests/math/run.sh delete mode 100644 vendor/plugins/maruku/tests/math/syntax.md delete mode 100644 vendor/plugins/maruku/tests/math/syntax.xhtml delete mode 100644 vendor/plugins/maruku/tests/math/use_itex.rb delete mode 100644 vendor/plugins/maruku/tests/math_usage/document.md delete mode 100644 vendor/plugins/maruku/tests/math_usage/math.css delete mode 100755 vendor/plugins/maruku/tests/math_usage/script.sh delete mode 100644 vendor/plugins/maruku/tests/others/Backslash escapes.text delete mode 100644 vendor/plugins/maruku/tests/others/abbreviations.html delete mode 100644 vendor/plugins/maruku/tests/others/abbreviations.md delete mode 100644 vendor/plugins/maruku/tests/others/blank.html delete mode 100644 vendor/plugins/maruku/tests/others/blank.md delete mode 100644 vendor/plugins/maruku/tests/others/code.html delete mode 100644 vendor/plugins/maruku/tests/others/code.md delete mode 100644 vendor/plugins/maruku/tests/others/code2.html delete mode 100644 vendor/plugins/maruku/tests/others/code2.md delete mode 100644 vendor/plugins/maruku/tests/others/code3.html delete mode 100644 vendor/plugins/maruku/tests/others/code3.md delete mode 100644 vendor/plugins/maruku/tests/others/email.html delete mode 100644 vendor/plugins/maruku/tests/others/email.md delete mode 100644 vendor/plugins/maruku/tests/others/entities.html delete mode 100644 vendor/plugins/maruku/tests/others/entities.md delete mode 100644 vendor/plugins/maruku/tests/others/escaping.html delete mode 100644 vendor/plugins/maruku/tests/others/escaping.md delete mode 100644 vendor/plugins/maruku/tests/others/extra_dl.html delete mode 100644 vendor/plugins/maruku/tests/others/extra_dl.md delete mode 100644 vendor/plugins/maruku/tests/others/extra_header_id.html delete mode 100644 vendor/plugins/maruku/tests/others/extra_header_id.md delete mode 100644 vendor/plugins/maruku/tests/others/extra_table1.html delete mode 100644 vendor/plugins/maruku/tests/others/extra_table1.md delete mode 100644 vendor/plugins/maruku/tests/others/footnotes.html delete mode 100644 vendor/plugins/maruku/tests/others/footnotes.md delete mode 100644 vendor/plugins/maruku/tests/others/headers.html delete mode 100644 vendor/plugins/maruku/tests/others/headers.md delete mode 100644 vendor/plugins/maruku/tests/others/hrule.html delete mode 100644 vendor/plugins/maruku/tests/others/hrule.md delete mode 100644 vendor/plugins/maruku/tests/others/images.html delete mode 100644 vendor/plugins/maruku/tests/others/images.md delete mode 100644 vendor/plugins/maruku/tests/others/inline_html.html delete mode 100644 vendor/plugins/maruku/tests/others/inline_html.md delete mode 100644 vendor/plugins/maruku/tests/others/links.html delete mode 100644 vendor/plugins/maruku/tests/others/links.md delete mode 100644 vendor/plugins/maruku/tests/others/list1.html delete mode 100644 vendor/plugins/maruku/tests/others/list1.md delete mode 100644 vendor/plugins/maruku/tests/others/list2.html delete mode 100644 vendor/plugins/maruku/tests/others/list2.md delete mode 100644 vendor/plugins/maruku/tests/others/list3.html delete mode 100644 vendor/plugins/maruku/tests/others/list3.md delete mode 100644 vendor/plugins/maruku/tests/others/lists.html delete mode 100644 vendor/plugins/maruku/tests/others/lists.md delete mode 100644 vendor/plugins/maruku/tests/others/lists_after_paragraph.html delete mode 100644 vendor/plugins/maruku/tests/others/lists_after_paragraph.markdown-pl delete mode 100644 vendor/plugins/maruku/tests/others/lists_after_paragraph.md delete mode 100644 vendor/plugins/maruku/tests/others/lists_ol.html delete mode 100644 vendor/plugins/maruku/tests/others/lists_ol.md delete mode 100644 vendor/plugins/maruku/tests/others/misc_sw.html delete mode 100644 vendor/plugins/maruku/tests/others/misc_sw.md delete mode 100644 vendor/plugins/maruku/tests/others/one.html delete mode 100644 vendor/plugins/maruku/tests/others/one.md delete mode 100644 vendor/plugins/maruku/tests/others/paragraphs.html delete mode 100644 vendor/plugins/maruku/tests/others/paragraphs.md delete mode 100644 vendor/plugins/maruku/tests/others/sss06.html delete mode 100644 vendor/plugins/maruku/tests/others/sss06.md delete mode 100644 vendor/plugins/maruku/tests/others/style.css delete mode 100644 vendor/plugins/maruku/tests/others/test.html delete mode 100644 vendor/plugins/maruku/tests/others/test.md delete mode 100644 vendor/plugins/maruku/tests/s5/s5profiling.md delete mode 100644 vendor/plugins/maruku/tests/s5/ui/default/blank.gif delete mode 100755 vendor/plugins/maruku/tests/s5/ui/default/bodybg.gif delete mode 100644 vendor/plugins/maruku/tests/s5/ui/default/framing.css delete mode 100644 vendor/plugins/maruku/tests/s5/ui/default/iepngfix.htc delete mode 100644 vendor/plugins/maruku/tests/s5/ui/default/opera.css delete mode 100644 vendor/plugins/maruku/tests/s5/ui/default/outline.css delete mode 100644 vendor/plugins/maruku/tests/s5/ui/default/pretty.css delete mode 100644 vendor/plugins/maruku/tests/s5/ui/default/print.css delete mode 100644 vendor/plugins/maruku/tests/s5/ui/default/s5-core.css delete mode 100644 vendor/plugins/maruku/tests/s5/ui/default/slides.css delete mode 100644 vendor/plugins/maruku/tests/s5/ui/default/slides.js delete mode 100644 vendor/plugins/maruku/tests/s5/ui/i18n/00_head.txt delete mode 100755 vendor/plugins/maruku/tests/s5/ui/i18n/bg-shade.png delete mode 100755 vendor/plugins/maruku/tests/s5/ui/i18n/bg-slide.jpg delete mode 100644 vendor/plugins/maruku/tests/s5/ui/i18n/framing.css delete mode 100644 vendor/plugins/maruku/tests/s5/ui/i18n/pretty.css delete mode 100644 vendor/plugins/maruku/tests/s5/ui/i18n/s5-core.css delete mode 100644 vendor/plugins/maruku/tests/s5/ui/i18n/slides.css delete mode 100644 vendor/plugins/maruku/tests/unittest/abbreviations.html delete mode 100644 vendor/plugins/maruku/tests/unittest/alt.html delete mode 100644 vendor/plugins/maruku/tests/unittest/attributes/att2.html delete mode 100644 vendor/plugins/maruku/tests/unittest/attributes/att3.html delete mode 100644 vendor/plugins/maruku/tests/unittest/attributes/attributes.html delete mode 100644 vendor/plugins/maruku/tests/unittest/attributes/circular.html delete mode 100644 vendor/plugins/maruku/tests/unittest/attributes/default.html delete mode 100644 vendor/plugins/maruku/tests/unittest/blank.html delete mode 100644 vendor/plugins/maruku/tests/unittest/blanks_in_code.html delete mode 100644 vendor/plugins/maruku/tests/unittest/bug_def.html delete mode 100644 vendor/plugins/maruku/tests/unittest/bug_table.html delete mode 100644 vendor/plugins/maruku/tests/unittest/code.html delete mode 100644 vendor/plugins/maruku/tests/unittest/code2.html delete mode 100644 vendor/plugins/maruku/tests/unittest/code3.html delete mode 100644 vendor/plugins/maruku/tests/unittest/data_loss.html delete mode 100644 vendor/plugins/maruku/tests/unittest/divs/div1.html delete mode 100644 vendor/plugins/maruku/tests/unittest/divs/div2.html delete mode 100644 vendor/plugins/maruku/tests/unittest/divs/div3_nest.html delete mode 100644 vendor/plugins/maruku/tests/unittest/easy.html delete mode 100644 vendor/plugins/maruku/tests/unittest/email.html delete mode 100644 vendor/plugins/maruku/tests/unittest/encoding/iso-8859-1.html delete mode 100644 vendor/plugins/maruku/tests/unittest/encoding/utf-8.html delete mode 100644 vendor/plugins/maruku/tests/unittest/entities.html delete mode 100644 vendor/plugins/maruku/tests/unittest/escaping.html delete mode 100644 vendor/plugins/maruku/tests/unittest/extra_dl.html delete mode 100644 vendor/plugins/maruku/tests/unittest/extra_header_id.html delete mode 100644 vendor/plugins/maruku/tests/unittest/extra_table1.html delete mode 100644 vendor/plugins/maruku/tests/unittest/footnotes.html delete mode 100644 vendor/plugins/maruku/tests/unittest/headers.html delete mode 100644 vendor/plugins/maruku/tests/unittest/hex_entities.html delete mode 100644 vendor/plugins/maruku/tests/unittest/hrule.html delete mode 100644 vendor/plugins/maruku/tests/unittest/html2.html delete mode 100644 vendor/plugins/maruku/tests/unittest/html3.html delete mode 100644 vendor/plugins/maruku/tests/unittest/html4.html delete mode 100644 vendor/plugins/maruku/tests/unittest/html5.html delete mode 100644 vendor/plugins/maruku/tests/unittest/ie.html delete mode 100644 vendor/plugins/maruku/tests/unittest/images.html delete mode 100644 vendor/plugins/maruku/tests/unittest/images2.html delete mode 100644 vendor/plugins/maruku/tests/unittest/inline_html.html delete mode 100644 vendor/plugins/maruku/tests/unittest/inline_html2.html delete mode 100644 vendor/plugins/maruku/tests/unittest/links.html delete mode 100644 vendor/plugins/maruku/tests/unittest/list1.html delete mode 100644 vendor/plugins/maruku/tests/unittest/list2.html delete mode 100644 vendor/plugins/maruku/tests/unittest/list3.html delete mode 100644 vendor/plugins/maruku/tests/unittest/list4.html delete mode 100644 vendor/plugins/maruku/tests/unittest/lists.html delete mode 100644 vendor/plugins/maruku/tests/unittest/lists11.html delete mode 100644 vendor/plugins/maruku/tests/unittest/lists11.md delete mode 100644 vendor/plugins/maruku/tests/unittest/lists6.html delete mode 100644 vendor/plugins/maruku/tests/unittest/lists7.html delete mode 100644 vendor/plugins/maruku/tests/unittest/lists7.md delete mode 100644 vendor/plugins/maruku/tests/unittest/lists7b.html delete mode 100644 vendor/plugins/maruku/tests/unittest/lists7b.md delete mode 100644 vendor/plugins/maruku/tests/unittest/lists8.html delete mode 100644 vendor/plugins/maruku/tests/unittest/lists8.md delete mode 100644 vendor/plugins/maruku/tests/unittest/lists9.html delete mode 100644 vendor/plugins/maruku/tests/unittest/lists_after_paragraph.html delete mode 100644 vendor/plugins/maruku/tests/unittest/lists_ol.html delete mode 100644 vendor/plugins/maruku/tests/unittest/loss.html delete mode 100644 vendor/plugins/maruku/tests/unittest/math/equations.html delete mode 100644 vendor/plugins/maruku/tests/unittest/math/equations.md delete mode 100644 vendor/plugins/maruku/tests/unittest/math/inline.html delete mode 100644 vendor/plugins/maruku/tests/unittest/math/math2.html delete mode 100644 vendor/plugins/maruku/tests/unittest/math/math2.md delete mode 100644 vendor/plugins/maruku/tests/unittest/math/notmath.html delete mode 100644 vendor/plugins/maruku/tests/unittest/math/table.html delete mode 100644 vendor/plugins/maruku/tests/unittest/math/table2.html delete mode 100644 vendor/plugins/maruku/tests/unittest/misc_sw.html delete mode 100644 vendor/plugins/maruku/tests/unittest/notyet/escape.html delete mode 100644 vendor/plugins/maruku/tests/unittest/notyet/header_after_par.html delete mode 100644 vendor/plugins/maruku/tests/unittest/notyet/ticks.html delete mode 100644 vendor/plugins/maruku/tests/unittest/notyet/triggering.html delete mode 100644 vendor/plugins/maruku/tests/unittest/olist.html delete mode 100644 vendor/plugins/maruku/tests/unittest/one.html delete mode 100644 vendor/plugins/maruku/tests/unittest/paragraph.html delete mode 100644 vendor/plugins/maruku/tests/unittest/paragraph_rules/dont_merge_ref.html delete mode 100644 vendor/plugins/maruku/tests/unittest/paragraph_rules/tab_is_blank.html delete mode 100644 vendor/plugins/maruku/tests/unittest/paragraphs.html delete mode 100644 vendor/plugins/maruku/tests/unittest/pending/amps.html delete mode 100644 vendor/plugins/maruku/tests/unittest/pending/empty_cells.html delete mode 100644 vendor/plugins/maruku/tests/unittest/pending/link.html delete mode 100644 vendor/plugins/maruku/tests/unittest/recover/recover_links.html delete mode 100644 vendor/plugins/maruku/tests/unittest/red_tests/abbrev.html delete mode 100644 vendor/plugins/maruku/tests/unittest/red_tests/abbrev.md delete mode 100644 vendor/plugins/maruku/tests/unittest/red_tests/lists7.md delete mode 100644 vendor/plugins/maruku/tests/unittest/red_tests/lists7b.md delete mode 100644 vendor/plugins/maruku/tests/unittest/red_tests/xml.md delete mode 100644 vendor/plugins/maruku/tests/unittest/references/long_example.html delete mode 100644 vendor/plugins/maruku/tests/unittest/references/spaces_and_numbers.html delete mode 100644 vendor/plugins/maruku/tests/unittest/smartypants.html delete mode 100644 vendor/plugins/maruku/tests/unittest/syntax_hl.html delete mode 100644 vendor/plugins/maruku/tests/unittest/table_attributes.html delete mode 100644 vendor/plugins/maruku/tests/unittest/test.html delete mode 100644 vendor/plugins/maruku/tests/unittest/wrapping.html delete mode 100644 vendor/plugins/maruku/tests/unittest/xml.html delete mode 100644 vendor/plugins/maruku/tests/unittest/xml2.html delete mode 100644 vendor/plugins/maruku/tests/unittest/xml3.html delete mode 100644 vendor/plugins/maruku/tests/unittest/xml_instruction.html delete mode 100644 vendor/plugins/maruku/tests/utf8-files/TeX.html delete mode 100644 vendor/plugins/maruku/tests/utf8-files/TeX.tex delete mode 100644 vendor/plugins/maruku/tests/utf8-files/TeX.txt delete mode 100644 vendor/plugins/maruku/tests/utf8-files/simple.md delete mode 100644 vendor/plugins/maruku/tests/utf8-files/simple.tex delete mode 100644 vendor/plugins/maruku/tests/utf8-files/ucs.sty diff --git a/test/unit/page_renderer_test.rb b/test/unit/page_renderer_test.rb index 92a461f2..831612a2 100644 --- a/test/unit/page_renderer_test.rb +++ b/test/unit/page_renderer_test.rb @@ -555,6 +555,13 @@ END_THM "

A class SmartEngine would not mark up

\n
CodeBlocks
\n

would it?

", "A class SmartEngine would not mark up\n\n
CodeBlocks
\n\nwould it?") end + + def test_inline_html + set_web_property :markup, :markdownMML + assert_markup_parsed_as( + "

We discuss the general abstract structures in a cohesive (\u221E,1)-topos realized.

", + "We discuss the general abstract\nstructures in a cohesive (\u221E,1)-topos realized.") + end # def test_content_with_autolink_in_parentheses # assert_markup_parsed_as( diff --git a/vendor/plugins/maruku/bin/marutest b/vendor/plugins/maruku/bin/marutest deleted file mode 100644 index 334f291e..00000000 --- a/vendor/plugins/maruku/bin/marutest +++ /dev/null @@ -1,350 +0,0 @@ -#!/usr/bin/env ruby - -require 'maruku' -#require 'maruku/textile2' -require 'maruku/input_textile2/t2_parser' - -$marutest_language = :markdown - -#MARKER = "\n***EOF***\n" -SPLIT = %r{\n\*\*\*[^\*]+\*\*\*\n}m - -def marker(x) - "\n*** Output of #{x} ***\n" -end - -def write_lines(i, j, lines, prefix, i_star) - i = [i, 0].max - j = [j, lines.size-1].min - for a in i..j - l = lines[a].gsub(/\t/,' ') - puts( ("%s %3d" % [prefix, a]) + - (a==i_star ? " -->" : " ")+lines[a]) - end -end - -# a = expected b = found -def equals(a, b) - a = a.split("\n") - b = b.split("\n") - - for i in 0..([a.size-1,b.size-1].max) - la = a[i] - lb = b[i] - if la != lb - puts "\n" - - - write_lines(i-3, i+3, a, "expected", i ) - write_lines(i-3, i+3, b, " found", i ) - return false - end - end - return true -end - -TOTEST = [:inspect,:to_html,:to_latex,:to_md,:to_s] - -def run_test(filename, its_ok, verbose=true) - # read file content - input = (f=File.open(filename,'r')).read; f.close - - output_html = File.join(File.dirname(filename), - File.basename(filename, File.extname(filename)) + ".html") - - # split the input in sections - - stuff = input.split(SPLIT) - if stuff.size == 1 - stuff[2] = stuff[0] - stuff[0] = "Write a comment here" - stuff[1] = "{} # params " - end - - comment = stuff.shift - params_s = stuff.shift - - params = eval(params_s||'{}') - if params == nil - raise "Null params? #{params_s.inspect}" - end - - markdown = stuff.shift - -# puts "comment: #{markdown.inspect}" -# puts "markdown: #{markdown.inspect}" - - failed = [] - relaxed = [] - crashed = [] - actual = {} - - doc = - if $marutest_language == :markdown - Maruku.new(markdown, params) - else - MaRuKu.textile2(markdown, params) - end - - for s in TOTEST - begin - if s==:to_html - actual[s] = doc.to_html - else - actual[s] = doc.send s - raise "Methods #{s} gave nil" if not actual[s] - end - rescue Exception => e - crashed << s - actual[s] = e.inspect+ "\n"+ e.backtrace.join("\n") - puts actual[s] - end - end - - File.open(output_html, 'w') do |f| - f.write doc.to_html_document - end - - begin - m = Maruku.new - d = m.instance_eval(actual[:inspect]) - rescue Exception => e - s = e.inspect + e.backtrace.join("\n") - raise "Inspect is not correct:\n ========\n#{actual[:inspect]}"+ - "============\n #{s}" - end - - expected = {} - if (stuff.size < TOTEST.size) - $stdout.write " (first time!) " - TOTEST.each do |x| expected[x] = actual[x] end - else - TOTEST.each_index do |i| - symbol = TOTEST[i] - expected[symbol] = stuff[i] -# puts "symbol: #{symbol.inspect} = #{stuff[i].inspect}" - end - end - - m = Maruku.new - - - if not its_ok.include? :inspect - begin - d = m.instance_eval(expected[:inspect]) - # puts "Eval: #{d.inspect}" - expected[:inspect] = d.inspect - rescue Exception => e - s = e.inspect + e.backtrace.join("\n") - raise "Cannot eval user-provided string:\n #{expected[:inspect].to_s}"+ - "\n #{s}" - end - end - -# m.instance_eval(actual[:inspect]) != m.instance_eval(expected[:inspect]) - -# actual[:inspect] = m.instance_eval(actual[:inspect]) -# expected[:inspect] = m.instance_eval(expected[:inspect]) - - - TOTEST.each do |x| - expected[x].strip! - actual[x].strip! - if not equals(expected[x], actual[x]) - if its_ok.include? x - expected[x] = actual[x] - $stdout.write " relax:#{x} " - relaxed << x - else - actual[x] = "-----| WARNING | -----\n" + actual[x].to_s - failed << x - end - end - end - - f = File.open(filename, 'w') - - f.write comment - f.write "\n*** Parameters: ***\n" - f.write params_s - f.write "\n*** Markdown input: ***\n" - f.write markdown - - TOTEST.each do |x| - f.write marker(x) - f.write expected[x] - end - f.write "\n*** EOF ***\n" - - if not failed.empty? or not crashed.empty? - - f.puts "\n\n\n\nFailed tests: #{failed.inspect} \n" - - TOTEST.each do |x| - f.write marker(x) - f.write actual[x] - end - - else - f.puts "\n\n\n\tOK!\n\n\n" - end - - - md_pl = markdown_pl(markdown) - - f.write "\n*** Output of Markdown.pl ***\n" - f.write md_pl - - f.write "\n*** Output of Markdown.pl (parsed) ***\n" - begin - doc = REXML::Document.new("
#{md_pl}
",{ - :compress_whitespace=>['div','p'], - :ignore_whitespace_nodes=>['div','p'], - :respect_whitespace=>['pre','code'] - }) - div = doc.root - xml ="" - indent=1 - if $rexml_new_version - formatter = if indent > -1 - REXML::Formatters::Pretty.new( indent, ie_hack=false ) - else - REXML::Formatters::Default.new( ie_hack=false ) - end - formatter.write( div, xml) - else - div.write(xml,indent,transitive=true,ie_hack=false) - end - xml.gsub!("\A
(.*)
\Z", "\1") - f.write xml - rescue Exception=>e - f.puts "Error: #{e.inspect}" - end - f.close - - - return failed, relaxed, crashed -end - -def markdown_pl(markdown) - tmp1 = "/tmp/marutest1" - tmp2 = "/tmp/marutest2" - File.open(tmp1,'w') do |f| f.puts markdown end - system "bin/Markdown.pl < #{tmp1} > #{tmp2}" - f = File.open(tmp2,'r') - s = f.read - f.close - s -end - -def passed?(args, arg) - if args.include? arg - args.delete arg - true - else - false - end -end - -def marutest(args) - dont_worry = [] - TOTEST.each do |x| - arg = "ok:#{x}" - # puts arg - if passed?(args, arg) - dont_worry << x - end - end - - if passed?(args, 'ok') - dont_worry = TOTEST.clone - end - - if dont_worry.size > 0 - puts "Relaxed on #{dont_worry.inspect}" - end - - - failed = {} - relaxed = {} - - args.each do |f| - $stdout.write f + ' '*(50-f.size) + " " - $stdout.flush - tf, tr, tcrashed = run_test(f, dont_worry) - - tf = tf + tcrashed - - - if tr.size > 0 - $stdout.write " relax #{tr.inspect} " - end - - if tf.size>0 - $stdout.write " failed on #{tf.inspect} " - else - $stdout.write " OK " - end - - if tcrashed.size > 0 - $stdout.write " CRASHED on #{tcrashed.inspect}" - end - - $stdout.write "\n" - - failed[f] = tf - relaxed[f] = tr - end - - num_failed = 0 - failed_cat = {} - - puts "\n\n\n**** FINAL REPORT ****\n\n" - - - if failed.size > 0 - failed.each do |file, fl| - num_failed += fl.size - if fl.size > 0 - puts "\t#{file}\tfailed on #{fl.inspect}" - end - fl.each do |x| - failed_cat[x] = failed_cat[x] || 0 - failed_cat[x] = failed_cat[x] + 1 - end - end - end - - if dont_worry.size > 0 - puts "Relaxed on #{dont_worry.inspect}" - end - - if relaxed.size > 0 - relaxed.each do |file, r| - if r.size > 0 - puts "\t#{file}\t\trelaxed on #{r.inspect}" - end - end - end - - if failed_cat.size > 0 - puts "\nCategories:\n" - - failed_cat.each do |x, num| - puts "\t#{x.inspect} \tfailed #{num}/#{args.size}" - end - end - - return num_failed == 0 -end - -if File.basename(__FILE__) == 'marutest' - if ARGV.empty? - puts "marutest is a tool for running Maruku's unittest." - exit 1 - end - ok = marutest(ARGV.clone) - - exit ok ? 0 : -1 -end - diff --git a/vendor/plugins/maruku/lib/maruku/ext/math/mathml_engines/blahtex.rb b/vendor/plugins/maruku/lib/maruku/ext/math/mathml_engines/blahtex.rb index 4f99796a..c8d87745 100644 --- a/vendor/plugins/maruku/lib/maruku/ext/math/mathml_engines/blahtex.rb +++ b/vendor/plugins/maruku/lib/maruku/ext/math/mathml_engines/blahtex.rb @@ -2,6 +2,7 @@ require 'tempfile' require 'fileutils' require 'digest/md5' require 'pstore' +require 'nokogiri' module MaRuKu module Out @@ -40,16 +41,16 @@ COMMAND return end - doc = Document.new(result, :respect_whitespace => :all) - png = doc.root.elements[1] + doc = Nokogiri::XML::Document.parse(result) + png = doc.root.elements.to_a[0] if png.name != 'png' maruku_error "Blahtex error: \n#{doc}" return end - raise "No depth element in:\n #{doc}" unless depth = png.elements['depth'] - raise "No height element in:\n #{doc}" unless height = png.elements['height'] - raise "No md5 element in:\n #{doc}" unless md5 = png.elements['md5'] + raise "No depth element in:\n #{doc}" unless depth = png.xpath('//depth')[0] + raise "No height element in:\n #{doc}" unless height = png.xpath('//height')[0] + raise "No md5 element in:\n #{doc}" unless md5 = png.xpath('//md5')[0] depth = depth.text.to_f height = height.text.to_f # TODO: check != 0 diff --git a/vendor/plugins/maruku/lib/maruku/ext/math/mathml_engines/itex2mml.rb b/vendor/plugins/maruku/lib/maruku/ext/math/mathml_engines/itex2mml.rb index b17d8e4f..e368b4ba 100644 --- a/vendor/plugins/maruku/lib/maruku/ext/math/mathml_engines/itex2mml.rb +++ b/vendor/plugins/maruku/lib/maruku/ext/math/mathml_engines/itex2mml.rb @@ -25,9 +25,9 @@ module MaRuKu maruku_error "Unknown itex2mml kind: #{kind}" return end - - return Document.new(mathml.to_utf8, :respect_whitespace => :all).root - rescue REXML::ParseException => e + d = Nokogiri::XML::Document.parse(mathml.to_utf8) + return d.root + rescue Exception => e maruku_error "Invalid MathML TeX: \n#{tex.gsub(/^/, 'tex>')}\n\n #{e.inspect}" nil rescue diff --git a/vendor/plugins/maruku/lib/maruku/ext/math/mathml_engines/none.rb b/vendor/plugins/maruku/lib/maruku/ext/math/mathml_engines/none.rb index c427002b..16060795 100644 --- a/vendor/plugins/maruku/lib/maruku/ext/math/mathml_engines/none.rb +++ b/vendor/plugins/maruku/lib/maruku/ext/math/mathml_engines/none.rb @@ -1,15 +1,14 @@ module MaRuKu; module Out; module HTML require 'maruku/string_utils' + require 'nokogiri' def convert_to_mathml_none(kind, tex) - # You can: either return a REXML::Element - # return Element.new 'div' + # You can: either return a nokogiri::XML::Element # or return an empty array on error # return [] - # or have a string parsed by REXML: mathml = "#{html_escape(tex)}" - return Document.new(mathml).root + return Nokogiri::XML::Document.parse(mathml).root end def convert_to_png_none(kind, tex) diff --git a/vendor/plugins/maruku/lib/maruku/ext/math/to_html.rb b/vendor/plugins/maruku/lib/maruku/ext/math/to_html.rb index 602226ba..08333a61 100644 --- a/vendor/plugins/maruku/lib/maruku/ext/math/to_html.rb +++ b/vendor/plugins/maruku/lib/maruku/ext/math/to_html.rb @@ -38,12 +38,14 @@ Same thing as `html_math_engine`, only for PNG output. =end +require 'nokogiri' + module MaRuKu module Out module HTML # Creates an xml Mathml document of this node's TeX code. # - # @return [REXML::Document] + # @return Nokogiri::XML::Document] def render_mathml(kind, tex) engine = get_setting(:html_math_engine) method = "convert_to_mathml_#{engine}" @@ -77,6 +79,7 @@ module MaRuKu end def adjust_png(png, use_depth) + d = Nokogiri::XML::Document.new src = png.src height_in_px = png.height @@ -88,22 +91,23 @@ module MaRuKu style << "vertical-align: -#{depth_in_ex}ex;" if use_depth style << "height: #{total_height_in_ex}ex;" - img = Element.new 'img' - img.attributes['src'] = src - img.attributes['style'] = style - img.attributes['alt'] = "$#{self.math.strip}$" + img = Nokogiri::XML::Element.new('img', d) + img['src'] = src + img['style'] = style + img['alt'] = "$#{self.math.strip}$" img end def to_html_inline_math + d = Nokogiri::XML::Document.new mathml = get_setting(:html_math_output_mathml) && render_mathml(:inline, self.math) png = get_setting(:html_math_output_png) && render_png(:inline, self.math) span = create_html_element 'span' - add_class_to(span, 'maruku-inline') + span['class'] = 'maruku-inline' if mathml - add_class_to(mathml, 'maruku-mathml') + mathml['class'] = 'maruku-mathml' return mathml end @@ -117,18 +121,19 @@ module MaRuKu end def to_html_equation + d = Nokogiri::XML::Document.new mathml = get_setting(:html_math_output_mathml) && render_mathml(:equation, self.math) png = get_setting(:html_math_output_png) && render_png(:equation, self.math) div = create_html_element 'div' - add_class_to(div, 'maruku-equation') + div['class'] = 'maruku-equation' if mathml if self.label # then numerate - span = Element.new 'span' - span.attributes['class'] = 'maruku-eq-number' - span << Text.new("(#{self.num})") + span = Nokogiri::XML::Element.new('span', d) + span['class'] = 'maruku-eq-number' + span << Nokogiri::XML::Text.new("(#{self.num})", d) div << span - div.attributes['id'] = "eq:#{self.label}" + div['id'] = "eq:#{self.label}" end add_class_to(mathml, 'maruku-mathml') div << mathml @@ -139,18 +144,18 @@ module MaRuKu add_class_to(img, 'maruku-png') div << img if self.label # then numerate - span = Element.new 'span' - span.attributes['class'] = 'maruku-eq-number' - span << Text.new("(#{self.num})") + span = Nokogiri::XML::Element.new('span', d) + span['class'] = 'maruku-eq-number' + span << Nokogiri::XML::Text.new("(#{self.num})", d) div << span - div.attributes['id'] = "eq:#{self.label}" + div['id'] = "eq:#{self.label}" end end - source_span = Element.new 'span' + source_span = Nokogiri::XML::Element.new('span', d) add_class_to(source_span, 'maruku-eq-tex') code = convert_to_mathml_none(:equation, self.math.strip) - code.attributes['style'] = 'display: none' + code['style'] = 'display: none' source_span << code div << source_span @@ -158,29 +163,31 @@ module MaRuKu end def to_html_eqref + d = Nokogiri::XML::Document.new unless eq = self.doc.eqid2eq[self.eqid] maruku_error "Cannot find equation #{self.eqid.inspect}" - return Text.new("(eq:#{self.eqid})") + return Nokogiri::XML::Text.new("(eq:#{self.eqid})", d) end - a = Element.new 'a' - a.attributes['class'] = 'maruku-eqref' - a.attributes['href'] = "#eq:#{self.eqid}" - a << Text.new("(#{eq.num})") + a = Nokogiri::XML::Element.new('a', d) + a['class'] = 'maruku-eqref' + a['href'] = "#eq:#{self.eqid}" + a << Nokogiri::XML::Text.new("(#{eq.num})", d) a end def to_html_divref + d = Nokogiri::XML::Document.new unless hash = self.doc.refid2ref.values.find {|h| h.has_key?(self.refid)} maruku_error "Cannot find div #{self.refid.inspect}" - return Text.new("\\ref{#{self.refid}}") + return Nokogiri::XML::Text.new("\\ref{#{self.refid}}", d) end ref= hash[self.refid] - a = Element.new 'a' - a.attributes['class'] = 'maruku-ref' - a.attributes['href'] = "#" + self.refid - a << Text.new(ref.num.to_s) + a = Nokogiri::XML::Element.new('a', d) + a['class'] = 'maruku-ref' + a['href'] = "#" + self.refid + a << Nokogiri::XML::Text.new(ref.num.to_s, d) a end end diff --git a/vendor/plugins/maruku/lib/maruku/helpers.rb b/vendor/plugins/maruku/lib/maruku/helpers.rb index 4fcf4130..dea4d087 100644 --- a/vendor/plugins/maruku/lib/maruku/helpers.rb +++ b/vendor/plugins/maruku/lib/maruku/helpers.rb @@ -18,6 +18,9 @@ module MaRuKu + +require 'nokogiri' + # A collection of helper functions for creating Markdown elements. # They hide the particular internal representations. # @@ -80,11 +83,11 @@ module MaRuKu e = md_el(:raw_html, [], :raw_html => raw_html) begin e.instance_variable_set("@parsed_html", - REXML::Document.new("#{raw_html.strip}")) - rescue REXML::ParseException => ex + Nokogiri::XML::Document.parse("#{raw_html.strip}")) + rescue Nokogiri::XML::Document.errors => ex e.instance_variable_set "@parsed_html", nil maruku_recover < 0 - # puts "Parsing #{s.inspect} as blocks: #{parse_blocks} (#{e.name}, #{e.attributes['markdown']}) " + # puts "Parsing #{s.inspect} as blocks: #{parse_blocks} (#{e.name}, #{e['markdown']}) " el = md_el(:dummy, parse_blocks ? parse_text_as_markdown(s) : parse_lines_as_span([s]) ) p = original_text.parent + #Nokogiri collapses consecutive Text nodes, so replace it by a dummy element + guard = Nokogiri::XML::Element.new('guard', doc) + original_text.replace(guard) el.children_to_html.each do |x| - p.insert_before(original_text, x) + guard.before(x) end - p.delete(original_text) + guard.remove end } # remove 'markdown' attribute - e.delete_attribute 'markdown' + e.delete('markdown') end diff --git a/vendor/plugins/maruku/lib/maruku/input/parse_span_better.rb b/vendor/plugins/maruku/lib/maruku/input/parse_span_better.rb index d0158366..e9b04a70 100644 --- a/vendor/plugins/maruku/lib/maruku/input/parse_span_better.rb +++ b/vendor/plugins/maruku/lib/maruku/input/parse_span_better.rb @@ -818,7 +818,7 @@ SpanContext = SpanContext_String # Seems to be faster s = "Elements read in span: \n" + lines.gsub(/^/, ' -')+"\n" - s += "Current string: \n #{@cur_string_array.join.inspect}\n" unless @cur_string_array.empty? + s += "Current string: \n #{@cur_string.inspect}\n" unless @cur_string.empty? s end end # SpanContext_String diff --git a/vendor/plugins/maruku/lib/maruku/output/s5/to_s5.rb b/vendor/plugins/maruku/lib/maruku/output/s5/to_s5.rb index 36d8d18a..b5709a4c 100644 --- a/vendor/plugins/maruku/lib/maruku/output/s5/to_s5.rb +++ b/vendor/plugins/maruku/lib/maruku/output/s5/to_s5.rb @@ -1,14 +1,8 @@ # This module groups all functions related to HTML export. module MaRuKu -begin - require 'rexml/formatters/pretty' - require 'rexml/formatters/default' - $rexml_new_version = true -rescue LoadError - $rexml_new_version = false -end - require 'maruku/string_utils' +require 'nokogiri' +require 'maruku/string_utils' class MDDocument @@ -22,25 +16,30 @@ end ie_hack = !context[:ie_hack].kind_of?(FalseClass) content_only = !context[:content_only].kind_of?(FalseClass) - doc = Document.new(nil,{:respect_whitespace =>:all}) + doc = Nokogiri::XML::Document.new if content_only - body = Element.new('div', doc) + body = Nokogiri::XML::Element.new('div', doc) else - html = Element.new('html', doc) - html.add_namespace('http://www.w3.org/1999/xhtml') + html = Nokogiri::XML::Element.new('html', doc) + doc << html + html.add_namespace(nil, 'http://www.w3.org/1999/xhtml') html.add_namespace('svg', "http://www.w3.org/2000/svg" ) - head = Element.new('head', html) - me = Element.new 'meta', head - me.attributes['http-equiv'] = 'Content-type' - me.attributes['content'] = 'text/html;charset=utf-8' + head = Nokogiri::XML::Element.new('head', html) + html << head + me = Nokogiri::XML::Element.new('meta', head) + me['http-equiv'] = 'Content-type' + me['content'] = 'text/html;charset=utf-8' + head << meta # Create title element doc_title = self.attributes[:title] || self.attributes[:subject] || "" - title = Element.new 'title', head - title << Text.new(doc_title) - body = Element.new('body', html) + title = Nokogiri::XML::Element.new 'title', head + title << Nokogiri::XML::Text.new(doc_title, head) + head << title + body = Nokogiri::XML::Element.new('body', html) + html << body end @@ -68,10 +67,11 @@ end
#{slide_bottomright}
" - body.add_element Document.new(dummy_layout_slide, {:respect_whitespace =>:all}).root + body << Nokogiri::XML::Document.parse(dummy_layout_slide).root - presentation = Element.new 'div', body - presentation.attributes['class'] = 'presentation' + presentation = Nokogiri::XML::Element.new('div', body) + presentation['class'] = 'presentation' + body << presentation first_slide="
@@ -81,19 +81,21 @@ end

#{self.attributes[:company] ||context[:company]}

" - presentation.add_element Document.new(first_slide).root + presentation << Nokogiri::XML::Document.parse(first_slide).root slide_num = 0 self.toc.section_children.each do |slide| slide_num += 1 @doc.attributes[:doc_prefix] = "s#{slide_num}" - puts "Slide #{slide_num}: " + slide.header_element.to_s - div = Element.new('div', presentation) - div.attributes['class'] = 'slide' +# puts "Slide #{slide_num}: " + slide.header_element.to_s + div = Nokogiri::XML::Element.new('div', presentation) + presentation << div + div['class'] = 'slide' - h1 = Element.new 'h1', div + h1 = Nokogiri::XML::Element.new('h1', div) slide.header_element.children_to_html.each do |e| h1 << e; end + div << h1 array_to_html(slide.immediate_children).each do |e| div << e end @@ -104,23 +106,15 @@ end end end - xml = "" if (content_only) - if $rexml_new_version - formatter = REXML::Formatters::Default.new(ie_hack) - formatter.write(body, xml) - else - body.write(xml,indent,transitive=true,ie_hack); - end + xml = body.to_xml(:indent => (context[:indent] || 2), :save_with => 2 ) else - doc2 = Document.new("
"+S5_external+"
",{:respect_whitespace =>:all}) + doc2 = Nokogiri::XML::Document.parse("
"+S5_external+"
") doc2.root.children.each{ |child| head << child } add_css_to(head) - # REXML Bug? if indent!=-1 whitespace is not respected for 'pre' elements - # containing code. - html.write(xml,indent,transitive=true,ie_hack); + xml = html.to_xml(:indent => (context[:indent] || 2), :save_with => 2 ) Xhtml11_mathml2_svg11 + xml end end diff --git a/vendor/plugins/maruku/lib/maruku/output/to_html.rb b/vendor/plugins/maruku/lib/maruku/output/to_html.rb index 7c4375c1..e8f59182 100644 --- a/vendor/plugins/maruku/lib/maruku/output/to_html.rb +++ b/vendor/plugins/maruku/lib/maruku/output/to_html.rb @@ -18,63 +18,37 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #++ -require 'rexml/document' - -begin - require 'rexml/formatters/pretty' - require 'rexml/formatters/default' - $rexml_new_version = true -rescue LoadError - $rexml_new_version = false -end +require 'nokogiri' +require 'maruku/string_utils' class String # A string is rendered into HTML by creating - # a REXML::Text node. REXML takes care of all the encoding. + # a Nokogiri::XML::Text node. Nokogiri takes care of all the encoding. def to_html - REXML::Text.new(self) + d = Nokogiri::XML::Document.new + Nokogiri::XML::Text.new(self, d) end end # This module groups all functions related to HTML export. module MaRuKu; module Out; module HTML - include REXML # Render as an HTML fragment (no head, just the content of BODY). (returns a string) - def to_html(context={}) - indent = context[:indent] || -1 - ie_hack = context[:ie_hack] || true - - div = Element.new 'dummy' + def to_html(context={}) + d = Nokogiri::XML::Document.parse('') children_to_html.each do |e| - div << e + d.root << e end # render footnotes if @doc.footnotes_order.size > 0 - div << render_footnotes + d.root << render_footnotes end - doc = Document.new(nil,{:respect_whitespace =>:all}) - doc << div - - # REXML Bug? if indent!=-1 whitespace is not respected for 'pre' elements - # containing code. - xml ="" + xml = d.to_xml(:indent => (context[:indent] || 2), :save_with => 2 ) - if $rexml_new_version - formatter = if indent > -1 - REXML::Formatters::Pretty.new( indent, ie_hack ) - else - REXML::Formatters::Default.new( ie_hack ) - end - formatter.write( div, xml) - else - div.write(xml,indent,transitive=true,ie_hack) - end - - xml.gsub!(/\A\s*|\s*<\/dummy>\Z|\A/,'') + xml.gsub!(/\A\s*|\s*<\/dummy>\s*\Z|\A/,'') xml end @@ -85,9 +59,7 @@ module MaRuKu; module Out; module HTML doc = to_html_document_tree xml = "" - # REXML Bug? if indent!=-1 whitespace is not respected for 'pre' elements - # containing code. - doc.write(xml,indent,transitive=true,ie_hack); + xml = doc.to_xml(:indent => (context[:indent] || 2), :save_with => 2 ) Xhtml11_mathml2_svg11 + xml end @@ -113,7 +85,10 @@ Xhtml11_mathml2_svg11 = ' - def xml_newline() Text.new("\n") end + def xml_newline + d = Nokogiri::XML::Document.new + Nokogiri::XML::Text.new("\n", d) + end =begin maruku_doc @@ -155,10 +130,11 @@ Synonim for `title`. =end - # Render to an HTML fragment (returns a REXML document tree) + # Render to an HTML fragment (returns a Nokogiri document tree) def to_html_tree - div = Element.new 'div' - div.attributes['class'] = 'maruku_wrapper_div' + d = Nokogiri::XML::Document.new + div = Nokogiri::XML::Element.new('dummy', d) + div['class'] = 'maruku_wrapper_div' children_to_html.each do |e| div << e end @@ -168,8 +144,7 @@ Synonim for `title`. div << render_footnotes end - doc = Document.new(nil,{:respect_whitespace =>:all}) - doc << div + d << div end =begin maruku_doc @@ -188,56 +163,59 @@ Example: METAS = %w{description keywords author revised} - # Render to a complete HTML document (returns a REXML document tree) + # Render to a complete HTML document (returns a Nokogiri document tree) def to_html_document_tree - doc = Document.new(nil,{:respect_whitespace =>:all}) - # doc << XMLDecl.new + doc = Nokogiri::XML::Document.new - root = Element.new('html', doc) - root.add_namespace('http://www.w3.org/1999/xhtml') + root = Nokogiri::XML::Element.new('html', doc) + root.add_namespace(nil, 'http://www.w3.org/1999/xhtml') root.add_namespace('svg', "http://www.w3.org/2000/svg" ) - lang = self.attributes[:lang] || 'en' - root.attributes['xml:lang'] = lang + lang = self[:lang] || 'en' + root['xml:lang'] = lang + doc << root root << xml_newline - head = Element.new 'head', root + head = Nokogiri::XML::Element.new('head', doc) + root << head # - me = Element.new 'meta', head - me.attributes['http-equiv'] = 'Content-type' -# me.attributes['content'] = 'text/html;charset=utf-8' - me.attributes['content'] = 'application/xhtml+xml;charset=utf-8' + me = Nokogiri::XML::Element.new('meta', doc) + me['http-equiv'] = 'Content-type' + me['content'] = 'application/xhtml+xml;charset=utf-8' + head << me METAS.each do |m| if value = self.attributes[m.to_sym] - meta = Element.new 'meta', head - meta.attributes['name'] = m - meta.attributes['content'] = value.to_s + meta = Nokogiri::XML::Element.new('meta', doc) + meta['name'] = m + meta['content'] = value.to_s + head << meta end end self.attributes.each do |k,v| if k.to_s =~ /\Ameta-(.*)\Z/ - meta = Element.new 'meta', head - meta.attributes['name'] = $1 - meta.attributes['content'] = v.to_s + meta = Nokogiri::XML::Element.new('meta',doc) + meta['name'] = $1 + meta['content'] = v.to_s + head << meta end end # Create title element - doc_title = self.attributes[:title] || self.attributes[:subject] || "" - title = Element.new 'title', head - title << Text.new(doc_title) - + doc_title = self[:title] || self[:subject] || "" + title = Nokogiri::XML::Element.new('title', doc) + title << Nokogiri::XML::Text.new(doc_title, doc) + head << title add_css_to(head) root << xml_newline - body = Element.new 'body' + body = Nokogiri::XML::Element.new('body', doc) children_to_html.each do |e| body << e @@ -245,7 +223,7 @@ Example: # render footnotes if @doc.footnotes_order.size > 0 - body << render_footnotes + body << render_footnotes(@doc) end # When we are rendering a whole document, we add a signature @@ -255,18 +233,18 @@ Example: end root << body - doc end def add_css_to(head) if css_list = self.attributes[:css] + d = Nokogiri::XML::Document.new css_list.split.each do |css| # - link = Element.new 'link' - link.attributes['type'] = 'text/css' - link.attributes['rel'] = 'stylesheet' - link.attributes['href'] = css + link = Nokogiri::XML::Element.new('link', d) + link['type'] = 'text/css' + link['rel'] = 'stylesheet' + link['href'] = css head << link head << xml_newline end @@ -296,50 +274,52 @@ Example: t.strftime(", %Y") end - def maruku_html_signature - div = Element.new 'div' - div.attributes['class'] = 'maruku_signature' - Element.new 'hr', div - span = Element.new 'span', div - span.attributes['style'] = 'font-size: small; font-style: italic' - span << Text.new('Created by ') - a = Element.new('a', span) - a.attributes['href'] = 'http://maruku.rubyforge.org' - a.attributes['title'] = 'Maruku: a Markdown-superset interpreter for Ruby' - a << Text.new('Maruku') - span << Text.new(nice_date+".") + def maruku_html_signature + d = Nokogiri::XML::Document.new + div = Nokogiri::XML::Element.new( 'div', d) + div['class'] = 'maruku_signature' + div << Nokogiri::XML::Element.new('hr', div) + span = Nokogiri::XML::Element.new('span', div) + span['style'] = 'font-size: small; font-style: italic' + div << span << Nokogiri::XML::Text.new('Created by ', div) + a = Nokogiri::XML::Element.new('a', span) + a['href'] = 'http://maruku.rubyforge.org' + a['title'] = 'Maruku: a Markdown-superset interpreter for Ruby' + a << Nokogiri::XML::Text.new('Maruku', div) + span << Nokogiri::XML::Text.new(nice_date+".", div) div end - def render_footnotes() - div = Element.new 'div' - div.attributes['class'] = 'footnotes' - div << Element.new('hr') - ol = Element.new 'ol' + def render_footnotes + d = Nokogiri::XML::Document.new + div = Nokogiri::XML::Element.new('div', d) + div['class'] = 'footnotes' + div << Nokogiri::XML::Element.new('hr', d) + ol = Nokogiri::XML::Element.new('ol', d) @doc.footnotes_order.each_with_index do |fid, i| num = i+1 f = self.footnotes[fid] if f li = f.wrap_as_element('li') - li.attributes['id'] = "#{get_setting(:doc_prefix)}fn:#{num}" + li['id'] = "#{get_setting(:doc_prefix)}fn:#{num}" - a = Element.new 'a' - a.attributes['href'] = "\##{get_setting(:doc_prefix)}fnref:#{num}" - a.attributes['rev'] = 'footnote' - a<< Text.new('↩', true, nil, true) + a = Nokogiri::XML::Element.new('a', d) + a['href'] = "\##{get_setting(:doc_prefix)}fnref:#{num}" + a['rev'] = 'footnote' + a << Nokogiri::XML::EntityReference.new(d, '#8617') last = nil li.children.reverse_each do |child| - if child.node_type != :text + unless child.text? last = child break end end if last and last.name == "p" - last.add_text(' '); - last.add(a); + last << Nokogiri::XML::Text.new(' ', last); + last << a; else - li.insert_after(li.children.last, a) + li.children.last.add_next_sibling(a) end ol << li else @@ -352,8 +332,8 @@ Example: end - def to_html_hrule; create_html_element 'hr' end - def to_html_linebreak; Element.new 'br' end + def to_html_hrule; create_html_element 'hr'; end + def to_html_linebreak; create_html_element 'br'; end # renders children as html and wraps into an element of given name # @@ -362,8 +342,6 @@ Example: m = create_html_element(name, attributes_to_copy) children_to_html.each do |e| m << e; end -# m << Comment.new( "{"+self.al.to_md+"}") if not self.al.empty? -# m << Comment.new( @attributes.inspect) if not @attributes.empty? m end @@ -437,11 +415,12 @@ It is copied as a standard HTML attribute. def create_html_element(name, attributes_to_copy=[]) - m = Element.new name + d = Nokogiri::XML::Document.new + m = Nokogiri::XML::Element.new(name, d) if atts = HTML4Attributes[name] then atts.each do |att| if v = @attributes[att] then - m.attributes[att.to_s] = v.to_s + m[att.to_s] = v.to_s end end else @@ -495,11 +474,12 @@ by Maruku, to have the same results in both HTML and LaTeX. # nil if not applicable, else SPAN element def render_section_number + d = Nokogiri::XML::Document.new # if we are bound to a section, add section number if num = section_number - span = Element.new 'span' - span.attributes['class'] = 'maruku_section_number' - span << Text.new(section_number) + span = Nokogiri::XML::Element.new('span', d) + span['class'] = 'maruku_section_number' + span << Nokogiri::XML::Text.new(section_number, d) span else nil @@ -517,10 +497,8 @@ by Maruku, to have the same results in both HTML and LaTeX. end def source2html(source) -# source = source.gsub(/&/,'&') - source = Text.normalize(source) - source.gsub!(/\'|'/,''') # IE bug - Text.new(source, true, nil, true ) + d = Nokogiri::XML::Document.new + t = Nokogiri::XML::Text.new(source,d) end =begin maruku_doc @@ -566,7 +544,7 @@ and lang = 'css21' if lang == 'css' use_syntax = get_setting :html_use_syntax - + element = if use_syntax && lang begin @@ -582,15 +560,17 @@ and source = source.gsub(/\n*\Z/,'') html = convertor.convert( source ) + html.gsub!(/\'|'/,''') # IE bug # html = html.gsub(/&/,'&') - - code = Document.new(html, {:respect_whitespace =>:all}).root + dd = Nokogiri::XML::Document.new + d = Nokogiri::XML::Document.parse(html) + code = d.root code.name = 'code' - code.attributes['lang'] = lang + code['lang'] = lang - pre = Element.new 'pre' - pre.attributes['class'] = lang + pre = Nokogiri::XML::Element.new('pre', dd) + pre['class'] = lang pre << code pre rescue LoadError => e @@ -612,7 +592,7 @@ and color = get_setting(:code_background_color) if color != Globals[:code_background_color] - element.attributes['style'] = "background-color: #{color};" + element['style'] = "background-color: #{color};" end add_ws element end @@ -638,12 +618,10 @@ of the form `#ff00ff`. def to_html_code_using_pre(source) + d = Nokogiri::XML::Document.new pre = create_html_element 'pre' - code = Element.new 'code', pre + code = Nokogiri::XML::Element.new('code', d) s = source - -# s = s.gsub(/&/,'&') - s = Text.normalize(s).gsub(/\'|'/,''') # IE bug if get_setting(:code_show_spaces) # 187 = raquo @@ -653,13 +631,13 @@ of the form `#ff00ff`. s.gsub!(/ /,'¬') end - text = Text.new(s, respect_ws=true, parent=nil, raw=true ) + text = Nokogiri::XML::Text.new(s, d) if lang = self.attributes[:lang] - code.attributes['lang'] = lang - code.attributes['class'] = lang + code['lang'] = lang + code['class'] = lang end - code << text + pre << code << text pre end @@ -670,15 +648,15 @@ of the form `#ff00ff`. color = get_setting(:code_background_color) if color != Globals[:code_background_color] - pre.attributes['style'] = "background-color: #{color};"+(pre.attributes['style']||"") + pre['style'] = "background-color: #{color};"+(pre['style']||"") end pre end def add_class_to(el, cl) - el.attributes['class'] = - if already = el.attributes['class'] + el['class'] = + if already = el['class'] already + " " + cl else cl @@ -704,11 +682,12 @@ of the form `#ff00ff`. def to_html_immediate_link + d = Nokogiri::XML::Document.new a = create_html_element 'a' url = self.url text = url.gsub(/^mailto:/,'') # don't show mailto - a << Text.new(text) - a.attributes['href'] = url + a << Nokogiri::XML::Text.new(text, d) + a['href'] = url add_class_to_link(a) a end @@ -720,8 +699,8 @@ of the form `#ff00ff`. if ref = @doc.refs[id] url = ref[:url] title = ref[:title] - a.attributes['href'] = url if url - a.attributes['title'] = title if title + a['href'] = url if url + a['title'] = title if title else maruku_error "Could not find ref_id = #{id.inspect} for #{self.inspect}\n"+ "Available refs are #{@doc.refs.keys.inspect}" @@ -737,8 +716,8 @@ of the form `#ff00ff`. if url = self.url title = self.title a = wrap_as_element 'a' - a.attributes['href'] = url - a.attributes['title'] = title if title + a['href'] = url + a['title'] = title if title return a else maruku_error"Could not find url in #{self.inspect}" @@ -748,7 +727,8 @@ of the form `#ff00ff`. end def add_ws(e) - [Text.new("\n"), e, Text.new("\n")] + d = Nokogiri::XML::Document.new + [Nokogiri::XML::Text.new("\n", d), e, Nokogiri::XML::Text.new("\n", d)] end ##### Email address @@ -761,6 +741,7 @@ of the form `#ff00ff`. end def to_html_email_address + d = Nokogiri::XML::Document.new email = self.email a = create_html_element 'a' #a.attributes['href'] = Text.new("mailto:"+obfuscate(email),false,nil,true) @@ -769,7 +750,7 @@ of the form `#ff00ff`. # Sorry, for the moment it doesn't work a.attributes['href'] = "mailto:#{email}" - a << Text.new(obfuscate(email),false,nil,true) + a << Nokogiri::XML::Text.new(obfuscate(email), d) a end @@ -781,8 +762,8 @@ of the form `#ff00ff`. if ref = @doc.refs[id] url = ref[:url] title = ref[:title] - a.attributes['src'] = url.to_s - a.attributes['alt'] = children_to_s + a['src'] = url.to_s + a['alt'] = children_to_s else maruku_error"Could not find id = #{id.inspect} for\n #{self.inspect}" tell_user "Could not create image with ref_id = #{id.inspect};"+ @@ -801,8 +782,8 @@ of the form `#ff00ff`. end title = self.title a = create_html_element 'img' - a.attributes['src'] = url.to_s - a.attributes['alt'] = children_to_s + a['src'] = url.to_s + a['alt'] = children_to_s return a end @@ -815,6 +796,7 @@ If true, raw HTML is discarded from the output. =end def to_html_raw_html + d = Nokogiri::XML::Document.new return [] if get_setting(:filter_html) raw_html = self.raw_html @@ -825,34 +807,35 @@ If true, raw HTML is discarded from the output. "Raw HTML:\n#{raw_html.inspect}" maruku_error s tell_user 'The REXML version you have has a bug, omitting HTML' - div = Element.new 'div' + div = Nokogiri::XML::Element.new('div', d) #div << Text.new(s) return div end # copies the @children array (FIXME is it deep?) - elements = root.to_a - return elements + elements = root.children.to_a else # invalid # Creates red box with offending HTML tell_user "Wrapping bad html in a PRE with class 'markdown-html-error'\n"+ raw_html.gsub(/^/, '|') - pre = Element.new('pre') - pre.attributes['style'] = 'border: solid 3px red; background-color: pink' - pre.attributes['class'] = 'markdown-html-error' - pre << Text.new("REXML could not parse this XML/HTML: \n#{raw_html}", true) + pre = Nokogiri::XML::Element.new('pre', d) + pre['style'] = 'border: solid 3px red; background-color: pink' + pre['class'] = 'markdown-html-error' + pre << Nokogiri::XML::Text.new("Nokogiri could not parse this XML/HTML: \n#{raw_html}", d) return pre end end def to_html_abbr - abbr = Element.new 'abbr' - abbr << Text.new(children[0]) - abbr.attributes['title'] = self.title if self.title + d = Nokogiri::XML::Document.new + abbr = Nokogiri::XML::Element.new('abbr', d) + abbr << Nokogiri::XML::Text.new(children[0], d) + abbr['title'] = self.title if self.title abbr end def to_html_footnote_reference + d = Nokogiri::XML::Document.new id = self.footnote_id # save the order of used footnotes @@ -873,12 +856,12 @@ If true, raw HTML is discarded from the output. #num = order.size; num = order.index(id) + 1 - sup = Element.new 'sup' - sup.attributes['id'] = "#{get_setting(:doc_prefix)}fnref:#{num}" - a = Element.new 'a' - a << Text.new(num.to_s) - a.attributes['href'] = "\##{get_setting(:doc_prefix)}fn:#{num}" - a.attributes['rel'] = 'footnote' + sup = Nokogiri::XML::Element.new('sup', d) + sup['id'] = "#{get_setting(:doc_prefix)}fnref:#{num}" + a = Nokogiri::XML::Element.new('a', d) + a << Nokogiri::XML::Text.new(num.to_s, d) + a['href'] = "\##{get_setting(:doc_prefix)}fn:#{num}" + a['rel'] = 'footnote' sup << a sup @@ -904,21 +887,21 @@ If true, raw HTML is discarded from the output. end table = create_html_element 'table' - thead = Element.new 'thead' - tr = Element.new 'tr' + thead = Nokogiri::XML::Element.new('thead', table) + tr = Nokogiri::XML::Element.new('tr', table) array_to_html(head).each do |x| tr<") diff --git a/vendor/plugins/maruku/lib/maruku/toc.rb b/vendor/plugins/maruku/lib/maruku/toc.rb index 4c4ed299..f727db97 100644 --- a/vendor/plugins/maruku/lib/maruku/toc.rb +++ b/vendor/plugins/maruku/lib/maruku/toc.rb @@ -16,6 +16,7 @@ # along with Maruku; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +require 'nokogiri' module MaRuKu # A section in the table of contents of a document. @@ -87,14 +88,14 @@ module MaRuKu end end - include REXML # Returns an HTML representation of the table of contents. # # This should only be called on the root section. def to_html - div = Element.new 'div' - div.attributes['class'] = 'maruku_toc' + d = Nokogiri::XML::Document.new + div = Nokogiri::XML::Element.new('div', d) + div['class'] = 'maruku_toc' div << _to_html div end @@ -109,18 +110,19 @@ module MaRuKu protected def _to_html - ul = Element.new 'ul' + d = Nokogiri::XML::Document.new + ul = Nokogiri::XML::Element.new('ul', d) # let's remove the bullets - ul.attributes['style'] = 'list-style: none;' + ul['style'] = 'list-style: none;' @section_children.each do |c| - li = Element.new 'li' + li = Nokogiri::XML::Element.new('li', d) if span = c.header_element.render_section_number li << span end a = c.header_element.wrap_as_element('a') - a.delete_attribute 'id' - a.attributes['href'] = "##{c.header_element.attributes[:id]}" + a.delete('id') + a['href'] = "##{c.header_element.attributes[:id]}" li << a li << c._to_html if c.section_children.size > 0 diff --git a/vendor/plugins/maruku/miscs/bug.rb b/vendor/plugins/maruku/miscs/bug.rb new file mode 100644 index 00000000..d0d32e8c --- /dev/null +++ b/vendor/plugins/maruku/miscs/bug.rb @@ -0,0 +1,3 @@ +puts [].each do end # ok (equiv. to "puts nil") +[1].each do end # ok +puts [1].each do end # 3:in `each': no block given (LocalJumpError) diff --git a/vendor/plugins/maruku/miscs/test.rb b/vendor/plugins/maruku/miscs/test.rb new file mode 100644 index 00000000..eb0be934 --- /dev/null +++ b/vendor/plugins/maruku/miscs/test.rb @@ -0,0 +1,29 @@ + +n=100 +$buffer = "blah "*n+"boh"+"beh"*n +$index = n*5 + +def fun1(reg) + r2 = /^.{#{$index}}#{reg}/ + r2.match($buffer) +end + +def fun2(reg) + reg.match($buffer[$index, $buffer.size-$index]) +end + +r = /\w*/ +a = Time.now +1000.times do + fun1(r) +end + +b = Time.now +1000.times do + fun2(r) +end + +c = Time.now + +puts "fun1: #{b-a} sec" +puts "fun2: #{c-b} sec" \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/abbreviations.md b/vendor/plugins/maruku/spec/block_docs/abbreviations.md similarity index 82% rename from vendor/plugins/maruku/tests/unittest/abbreviations.md rename to vendor/plugins/maruku/spec/block_docs/abbreviations.md index 71cfc1cb..33e33a05 100644 --- a/vendor/plugins/maruku/tests/unittest/abbreviations.md +++ b/vendor/plugins/maruku/spec/block_docs/abbreviations.md @@ -32,7 +32,7 @@ md_el(:document,[ md_el(:abbr_def,[],{:abbr=>"Tigra Genesis",:text=>nil},[]) ],{},[]) *** Output of to_html *** -

The HTML specification is maintained by the W3C.

+

The HTML specification is maintained by the W3C.

Operation Tigra Genesis is going well.

*** Output of to_latex *** @@ -50,15 +50,3 @@ Operation Tigra Genesisis going well. *[Tigra Genesis]: *** Output of to_s *** The HTML specification is maintained by the W3C.Operation Tigra Genesis is going well. -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/alt.md b/vendor/plugins/maruku/spec/block_docs/alt.md similarity index 64% rename from vendor/plugins/maruku/tests/unittest/alt.md rename to vendor/plugins/maruku/spec/block_docs/alt.md index 2a9e0316..65ceb57a 100644 --- a/vendor/plugins/maruku/tests/unittest/alt.md +++ b/vendor/plugins/maruku/spec/block_docs/alt.md @@ -8,22 +8,10 @@ Write a comment here *** Output of inspect *** md_el(:document,[md_par([md_im_image(["bar"], "/foo.jpg", nil)])],{},[]) *** Output of to_html *** -

bar

+

bar

*** Output of to_latex *** *** Output of to_md *** bar *** Output of to_s *** bar -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/attributes/att2.md b/vendor/plugins/maruku/spec/block_docs/attributes/att2.md similarity index 71% rename from vendor/plugins/maruku/tests/unittest/attributes/att2.md rename to vendor/plugins/maruku/spec/block_docs/attributes/att2.md index 818d40c9..4018a785 100644 --- a/vendor/plugins/maruku/tests/unittest/attributes/att2.md +++ b/vendor/plugins/maruku/spec/block_docs/attributes/att2.md @@ -18,15 +18,3 @@ md_el(:document,[ *** Output of to_s *** -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/attributes/att3.md b/vendor/plugins/maruku/spec/block_docs/attributes/att3.md similarity index 70% rename from vendor/plugins/maruku/tests/unittest/attributes/att3.md rename to vendor/plugins/maruku/spec/block_docs/attributes/att3.md index fe19cf90..586a7578 100644 --- a/vendor/plugins/maruku/tests/unittest/attributes/att3.md +++ b/vendor/plugins/maruku/spec/block_docs/attributes/att3.md @@ -13,9 +13,9 @@ md_el(:document,[ md_par(["Paragraph2"], [[:id, "par2"]]) ],{},[]) *** Output of to_html *** -

Paragraph1

+

Paragraph1

-

Paragraph2

+

Paragraph2

*** Output of to_latex *** Paragraph1 @@ -26,15 +26,3 @@ Paragraph1 Paragraph2 *** Output of to_s *** Paragraph1Paragraph2 -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/attributes/attributes.md b/vendor/plugins/maruku/spec/block_docs/attributes/attributes.md similarity index 73% rename from vendor/plugins/maruku/tests/unittest/attributes/attributes.md rename to vendor/plugins/maruku/spec/block_docs/attributes/attributes.md index 8e3d69ca..3e1ebbc6 100644 --- a/vendor/plugins/maruku/tests/unittest/attributes/attributes.md +++ b/vendor/plugins/maruku/spec/block_docs/attributes/attributes.md @@ -30,21 +30,21 @@ md_el(:document,[ md_el(:ald,[],{:ald=>[[:class, "chello"]],:ald_id=>"hello"},[]) ],{},[]) *** Output of to_html *** -

Header with attributes

+

Header with attributes

-

Header with attributes

+

Header with attributes

-

Header no attributes

+

Header no attributes

-

Paragraph with a.

+

Paragraph with a.

-

Paragraph with emphasis

+

Paragraph with emphasis

*** Output of to_latex *** \hypertarget{header1}{}\subsection*{{Header with attributes}}\label{header1} \hypertarget{header2}{}\subsubsection*{{Header with attributes}}\label{header2} -\hypertarget{header_no_attributes}{}\subsubsection*{{Header no attributes}}\label{header_no_attributes} +\hypertarget{header_no_attributes_3}{}\subsubsection*{{Header no attributes}}\label{header_no_attributes_3} Paragraph with a. @@ -55,15 +55,3 @@ Header with attributesHeader with attributesHeader no attributesParagraph with a Paragraph with emphasis *** Output of to_s *** Header with attributesHeader with attributesHeader no attributesParagraph with a.Paragraph with emphasis -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/attributes/circular.md b/vendor/plugins/maruku/spec/block_docs/attributes/circular.md similarity index 76% rename from vendor/plugins/maruku/tests/unittest/attributes/circular.md rename to vendor/plugins/maruku/spec/block_docs/attributes/circular.md index 968e587a..de952295 100644 --- a/vendor/plugins/maruku/tests/unittest/attributes/circular.md +++ b/vendor/plugins/maruku/spec/block_docs/attributes/circular.md @@ -24,15 +24,3 @@ Paragraph Paragraph *** Output of to_s *** Paragraph -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/attributes/default.md b/vendor/plugins/maruku/spec/block_docs/attributes/default.md similarity index 71% rename from vendor/plugins/maruku/tests/unittest/attributes/default.md rename to vendor/plugins/maruku/spec/block_docs/attributes/default.md index fa9bedad..29477f32 100644 --- a/vendor/plugins/maruku/tests/unittest/attributes/default.md +++ b/vendor/plugins/maruku/spec/block_docs/attributes/default.md @@ -13,22 +13,10 @@ md_el(:document,[ md_el(:ald,[],{:ald=>[[:class, "maruku-par"]],:ald_id=>"paragraph"},[]) ],{},[]) *** Output of to_html *** -

Paragraph2

+

Paragraph2

*** Output of to_latex *** Paragraph2 *** Output of to_md *** Paragraph2 *** Output of to_s *** Paragraph2 -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/blank.md b/vendor/plugins/maruku/spec/block_docs/blank.md similarity index 74% rename from vendor/plugins/maruku/tests/unittest/blank.md rename to vendor/plugins/maruku/spec/block_docs/blank.md index f54fe7b4..6b0433d2 100644 --- a/vendor/plugins/maruku/tests/unittest/blank.md +++ b/vendor/plugins/maruku/spec/block_docs/blank.md @@ -22,15 +22,3 @@ Linea 1 Linea 2 *** Output of to_s *** Linea 1Linea 2 -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/blanks_in_code.md b/vendor/plugins/maruku/spec/block_docs/blanks_in_code.md similarity index 90% rename from vendor/plugins/maruku/tests/unittest/blanks_in_code.md rename to vendor/plugins/maruku/spec/block_docs/blanks_in_code.md index 898e5383..dbdc7ba3 100644 --- a/vendor/plugins/maruku/tests/unittest/blanks_in_code.md +++ b/vendor/plugins/maruku/spec/block_docs/blanks_in_code.md @@ -73,15 +73,3 @@ This block is composed of 5 This block is composed of 2 *** Output of to_s *** This block is composed of three lines:This block is composed of 5This block is composed of 2 -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/bug_def.md b/vendor/plugins/maruku/spec/block_docs/bug_def.md similarity index 71% rename from vendor/plugins/maruku/tests/unittest/bug_def.md rename to vendor/plugins/maruku/spec/block_docs/bug_def.md index 642c2923..7e8bb636 100644 --- a/vendor/plugins/maruku/tests/unittest/bug_def.md +++ b/vendor/plugins/maruku/spec/block_docs/bug_def.md @@ -14,15 +14,3 @@ test: test: *** Output of to_s *** test: -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/bug_table.md b/vendor/plugins/maruku/spec/block_docs/bug_table.md similarity index 75% rename from vendor/plugins/maruku/tests/unittest/bug_table.md rename to vendor/plugins/maruku/spec/block_docs/bug_table.md index 73a800c3..03eba0eb 100644 --- a/vendor/plugins/maruku/tests/unittest/bug_table.md +++ b/vendor/plugins/maruku/spec/block_docs/bug_table.md @@ -27,8 +27,8 @@ md_el(:document,[ md_el(:ald,[],{:ald=>[["scope", "row"]],:ald_id=>"t"},[]) ],{},[]) *** Output of to_html *** -

hello

- +

hello

+
hh
c1c2
hh
c1c2
*** Output of to_latex *** hello @@ -44,15 +44,3 @@ hello hh c1c2 *** Output of to_s *** hellohh c1c2 -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/code.md b/vendor/plugins/maruku/spec/block_docs/code.md similarity index 80% rename from vendor/plugins/maruku/tests/unittest/code.md rename to vendor/plugins/maruku/spec/block_docs/code.md index 476bc049..fabc2ccb 100644 --- a/vendor/plugins/maruku/tests/unittest/code.md +++ b/vendor/plugins/maruku/spec/block_docs/code.md @@ -17,7 +17,7 @@ md_el(:document,[ *** Output of to_html ***

Here is an example of AppleScript:

-
tell application "Foo"
+
tell application "Foo"
     beep
 end tell
 	tab
@@ -32,15 +32,3 @@ end tell Here is an example of AppleScript: *** Output of to_s *** Here is an example of AppleScript: -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/code2.md b/vendor/plugins/maruku/spec/block_docs/code2.md similarity index 79% rename from vendor/plugins/maruku/tests/unittest/code2.md rename to vendor/plugins/maruku/spec/block_docs/code2.md index 4500db70..a2a194bd 100644 --- a/vendor/plugins/maruku/tests/unittest/code2.md +++ b/vendor/plugins/maruku/spec/block_docs/code2.md @@ -26,15 +26,3 @@ Code Code *** Output of to_s *** Code -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/code3.md b/vendor/plugins/maruku/spec/block_docs/code3.md similarity index 90% rename from vendor/plugins/maruku/tests/unittest/code3.md rename to vendor/plugins/maruku/spec/block_docs/code3.md index dd718f66..d599bc84 100644 --- a/vendor/plugins/maruku/tests/unittest/code3.md +++ b/vendor/plugins/maruku/spec/block_docs/code3.md @@ -69,15 +69,3 @@ This is code (1 tab): This is not code *** Output of to_s *** This is code (4 spaces):This is not codeThis is code (1 tab):This is not code -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/data_loss.md b/vendor/plugins/maruku/spec/block_docs/data_loss.md similarity index 78% rename from vendor/plugins/maruku/tests/unittest/data_loss.md rename to vendor/plugins/maruku/spec/block_docs/data_loss.md index 10a565fc..21142be9 100644 --- a/vendor/plugins/maruku/tests/unittest/data_loss.md +++ b/vendor/plugins/maruku/spec/block_docs/data_loss.md @@ -23,15 +23,3 @@ md_el(:document,[ 1. abcd efgh ijkl *** Output of to_s *** abcd efgh ijkl -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/divs/div1.md b/vendor/plugins/maruku/spec/block_docs/divs/div1.md similarity index 93% rename from vendor/plugins/maruku/tests/unittest/divs/div1.md rename to vendor/plugins/maruku/spec/block_docs/divs/div1.md index 3acd7f90..0efbf620 100644 --- a/vendor/plugins/maruku/tests/unittest/divs/div1.md +++ b/vendor/plugins/maruku/spec/block_docs/divs/div1.md @@ -165,15 +165,3 @@ text text *** Output of to_s *** texttexttexttexttexttexttexttexttexttexttexttext -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/divs/div2.md b/vendor/plugins/maruku/spec/block_docs/divs/div2.md similarity index 74% rename from vendor/plugins/maruku/tests/unittest/divs/div2.md rename to vendor/plugins/maruku/spec/block_docs/divs/div2.md index 38031015..f399337f 100644 --- a/vendor/plugins/maruku/tests/unittest/divs/div2.md +++ b/vendor/plugins/maruku/spec/block_docs/divs/div2.md @@ -19,15 +19,3 @@ ciao ciao *** Output of to_s *** ciao -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/divs/div3_nest.md b/vendor/plugins/maruku/spec/block_docs/divs/div3_nest.md similarity index 87% rename from vendor/plugins/maruku/tests/unittest/divs/div3_nest.md rename to vendor/plugins/maruku/spec/block_docs/divs/div3_nest.md index c4f200d2..9cbdb5a2 100644 --- a/vendor/plugins/maruku/tests/unittest/divs/div3_nest.md +++ b/vendor/plugins/maruku/spec/block_docs/divs/div3_nest.md @@ -20,12 +20,12 @@ md_el(:document,[ ],{:label=>nil,:num=>nil,:type=>nil},[[:class, "warning"]]) ],{},[]) *** Output of to_html *** -
+

this is the last warning!

please, go away!

-
+

or else terrible things will happen

@@ -43,15 +43,3 @@ please, go away! or else terrible things will happen *** Output of to_s *** this is the last warning!please, go away!or else terrible things will happen -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/easy.md b/vendor/plugins/maruku/spec/block_docs/easy.md similarity index 77% rename from vendor/plugins/maruku/tests/unittest/easy.md rename to vendor/plugins/maruku/spec/block_docs/easy.md index 1d9695d2..9f542a16 100644 --- a/vendor/plugins/maruku/tests/unittest/easy.md +++ b/vendor/plugins/maruku/spec/block_docs/easy.md @@ -13,15 +13,3 @@ md_el(:document,[md_par([md_em(["Hello!"]), " how are ", md_strong(["you"]), "?" Hello!how are you? *** Output of to_s *** Hello! how are you? -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/email.md b/vendor/plugins/maruku/spec/block_docs/email.md similarity index 83% rename from vendor/plugins/maruku/tests/unittest/email.md rename to vendor/plugins/maruku/spec/block_docs/email.md index a1815045..ad4d4661 100644 --- a/vendor/plugins/maruku/tests/unittest/email.md +++ b/vendor/plugins/maruku/spec/block_docs/email.md @@ -18,15 +18,3 @@ This is an email address: \href{mailto:andrea@invalid.it}{andrea\char64invalid\c This is an email address: *** Output of to_s *** This is an email address: -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/encoding/iso-8859-1.md b/vendor/plugins/maruku/spec/block_docs/encoding/iso-8859-1.md similarity index 68% rename from vendor/plugins/maruku/tests/unittest/encoding/iso-8859-1.md rename to vendor/plugins/maruku/spec/block_docs/encoding/iso-8859-1.md index 573a430e..b3833693 100644 --- a/vendor/plugins/maruku/tests/unittest/encoding/iso-8859-1.md +++ b/vendor/plugins/maruku/spec/block_docs/encoding/iso-8859-1.md @@ -13,23 +13,10 @@ md_el(:document,[ ]) ],{},[]) *** Output of to_html *** -

This is iso-8859-1: àèìàù.

+

This is iso-8859-1: àèìàù.

*** Output of to_latex *** This is iso-8859-1: àèìàù. *** Output of to_md *** -This is iso-8859-1: -àèìàù. +This is iso-8859-1: àèìàù. *** Output of to_s *** This is iso-8859-1: àèìàù. -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/encoding/utf-8.md b/vendor/plugins/maruku/spec/block_docs/encoding/utf-8.md similarity index 74% rename from vendor/plugins/maruku/tests/unittest/encoding/utf-8.md rename to vendor/plugins/maruku/spec/block_docs/encoding/utf-8.md index b5aab08f..7793188a 100644 --- a/vendor/plugins/maruku/tests/unittest/encoding/utf-8.md +++ b/vendor/plugins/maruku/spec/block_docs/encoding/utf-8.md @@ -9,22 +9,10 @@ Japanese: マルク *** Output of inspect *** md_el(:document,[md_par(["Japanese: \343\203\236\343\203\253\343\202\257"])],{},[]) *** Output of to_html *** -

Japanese: マルク

+

Japanese: マルク

*** Output of to_latex *** Japanese: マルク *** Output of to_md *** Japanese: マルク *** Output of to_s *** Japanese: マルク -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/entities.md b/vendor/plugins/maruku/spec/block_docs/entities.md similarity index 81% rename from vendor/plugins/maruku/tests/unittest/entities.md rename to vendor/plugins/maruku/spec/block_docs/entities.md index bd69b77c..5a2193ff 100644 --- a/vendor/plugins/maruku/tests/unittest/entities.md +++ b/vendor/plugins/maruku/spec/block_docs/entities.md @@ -48,11 +48,11 @@ md_el(:document,[ ],{},[]) *** Output of to_html ***

Maruku translates HTML entities to the equivalent in LaTeX:

- - - - - +
EntityResult
&copy;©
&pound;£
a&nbsp;ba b
&lambda;λ
&mdash;
+ + + +
EntityResult
&copy;©
&pound;£
a&nbsp;ba b
&lambda;λ
&mdash;

Entity-substitution does not happen in code blocks or inline code.

@@ -92,15 +92,3 @@ The following should not be translated: It should read just like this: . *** Output of to_s *** Maruku translates HTML entities to the equivalent in LaTeX:EntityResultabEntity-substitution does not happen in code blocks or inline code.The following should not be translated:It should read just like this: . -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/escaping.md b/vendor/plugins/maruku/spec/block_docs/escaping.md similarity index 94% rename from vendor/plugins/maruku/tests/unittest/escaping.md rename to vendor/plugins/maruku/spec/block_docs/escaping.md index 77cb314a..d27d980e 100644 --- a/vendor/plugins/maruku/tests/unittest/escaping.md +++ b/vendor/plugins/maruku/spec/block_docs/escaping.md @@ -65,15 +65,3 @@ of paragraph End of *** Output of to_s *** Hello: ! ! ` { } [ ] ( ) # . ! * * *Ora, emphasis, bold, * <- due asterischi-> * , un underscore-> _ , emphasis, incrediblee!This is (after) of paragraphEnd of -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/extra_dl.md b/vendor/plugins/maruku/spec/block_docs/extra_dl.md similarity index 93% rename from vendor/plugins/maruku/tests/unittest/extra_dl.md rename to vendor/plugins/maruku/spec/block_docs/extra_dl.md index 3fbab4ad..30c6483c 100644 --- a/vendor/plugins/maruku/tests/unittest/extra_dl.md +++ b/vendor/plugins/maruku/spec/block_docs/extra_dl.md @@ -50,15 +50,3 @@ md_el(:document,[ ApplePomaceous fruit of plants of the genus Malus in the family Rosaceae.OrangeThe fruit of an evergreen tree of the genus Citrus. *** Output of to_s *** ApplePomaceous fruit of plants of the genus Malus in the family Rosaceae.OrangeThe fruit of an evergreen tree of the genus Citrus. -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/extra_header_id.md b/vendor/plugins/maruku/spec/block_docs/extra_header_id.md similarity index 84% rename from vendor/plugins/maruku/tests/unittest/extra_header_id.md rename to vendor/plugins/maruku/spec/block_docs/extra_header_id.md index 720e4fca..0cfcb59b 100644 --- a/vendor/plugins/maruku/tests/unittest/extra_header_id.md +++ b/vendor/plugins/maruku/spec/block_docs/extra_header_id.md @@ -33,15 +33,15 @@ md_el(:document,[ ]) ],{},[]) *** Output of to_html *** -

Header 1

+

Header 1

-

Header 2

+

Header 2

-

Header 3

+

Header 3

Then you can create links to different parts of the same document like this:

-

Link back to header 1, Link back to header 2, Link back to header 3

+

Link back to header 1, Link back to header 2, Link back to header 3

*** Output of to_latex *** \hypertarget{header1}{}\section*{{Header 1}}\label{header1} @@ -61,15 +61,3 @@ Link back to header 2, Link back to header 3 *** Output of to_s *** Header 1Header 2Header 3Then you can create links to different parts of the same document like this:Link back to header 1, Link back to header 2, Link back to header 3 -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/extra_table1.md b/vendor/plugins/maruku/spec/block_docs/extra_table1.md similarity index 74% rename from vendor/plugins/maruku/tests/unittest/extra_table1.md rename to vendor/plugins/maruku/spec/block_docs/extra_table1.md index 0e2ebdc8..225de779 100644 --- a/vendor/plugins/maruku/tests/unittest/extra_table1.md +++ b/vendor/plugins/maruku/spec/block_docs/extra_table1.md @@ -21,8 +21,8 @@ md_el(:document,[ ],{:align=>[:left, :left]},[]) ],{},[]) *** Output of to_html *** - - +
First HeaderSecond Header
Content CellContent Cell
Content CellContent Cell
+
First HeaderSecond Header
Content CellContent Cell
Content CellContent Cell
*** Output of to_latex *** \begin{tabular}{l|l} @@ -35,15 +35,3 @@ Content Cell&Content Cell\\ First HeaderSecond HeaderContent CellContent CellContent CellContent Cell *** Output of to_s *** First HeaderSecond HeaderContent CellContent CellContent CellContent Cell -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/footnotes.md b/vendor/plugins/maruku/spec/block_docs/footnotes.md similarity index 76% rename from vendor/plugins/maruku/tests/unittest/footnotes.md rename to vendor/plugins/maruku/spec/block_docs/footnotes.md index 9ff61128..3fd57bec 100644 --- a/vendor/plugins/maruku/tests/unittest/footnotes.md +++ b/vendor/plugins/maruku/spec/block_docs/footnotes.md @@ -54,20 +54,20 @@ md_el(:document,[ md_par(["This is not a footnote."]) ],{},[]) *** Output of to_html *** -

That’s some text with a footnote 1 and another 2 and another 3.

+

That’s some text with a footnote 1 and another 2 and another 3.

This is not a footnote.

-

  1. -

    And that’s the footnote. This is second sentence (same paragraph).

    -
  2. +

    1. +

      And that’s the footnote. This is second sentence (same paragraph).

      +
    2. This is the very long one.

      -

      That’s the second paragraph.

      -
    3. +

      That’s the second paragraph.

      +
    4. And that’s the footnote.

      -

      That’s the second paragraph of the footnote.

      -
    +

    That’s the second paragraph of the footnote.

    +
*** Output of to_latex *** 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. @@ -95,15 +95,3 @@ That s the second paragraph. This is not a footnote. *** Output of to_s *** 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. -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/headers.md b/vendor/plugins/maruku/spec/block_docs/headers.md similarity index 53% rename from vendor/plugins/maruku/tests/unittest/headers.md rename to vendor/plugins/maruku/spec/block_docs/headers.md index 981739e9..08cd865a 100644 --- a/vendor/plugins/maruku/tests/unittest/headers.md +++ b/vendor/plugins/maruku/spec/block_docs/headers.md @@ -20,30 +20,18 @@ md_el(:document,[ md_el(:header,["A title with ", md_em(["emphasis"])],{:level=>4},[]) ],{},[]) *** Output of to_html *** -

A title with emphasis

+

A title with emphasis

-

A title with emphasis

+

A title with emphasis

-

A title with emphasis

+

A title with emphasis

*** Output of to_latex *** -\hypertarget{a_title_with_emphasis}{}\section*{{A title with \emph{emphasis}}}\label{a_title_with_emphasis} +\hypertarget{a_title_with_emphasis_1}{}\section*{{A title with \emph{emphasis}}}\label{a_title_with_emphasis_1} -\hypertarget{a_title_with_emphasis}{}\subsection*{{A title with \emph{emphasis}}}\label{a_title_with_emphasis} +\hypertarget{a_title_with_emphasis_2}{}\subsection*{{A title with \emph{emphasis}}}\label{a_title_with_emphasis_2} -\hypertarget{a_title_with_emphasis}{}\paragraph*{{A title with \emph{emphasis}}}\label{a_title_with_emphasis} +\hypertarget{a_title_with_emphasis_3}{}\paragraph*{{A title with \emph{emphasis}}}\label{a_title_with_emphasis_3} *** Output of to_md *** A title with emphasisA title with emphasisA title with emphasis *** Output of to_s *** A title with emphasisA title with emphasisA title with emphasis -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/hex_entities.md b/vendor/plugins/maruku/spec/block_docs/hex_entities.md similarity index 91% rename from vendor/plugins/maruku/tests/unittest/hex_entities.md rename to vendor/plugins/maruku/spec/block_docs/hex_entities.md index 04d72abe..c1a60e3d 100644 --- a/vendor/plugins/maruku/tests/unittest/hex_entities.md +++ b/vendor/plugins/maruku/spec/block_docs/hex_entities.md @@ -35,15 +35,3 @@ alpha, and or for the Arabic letter alef. *** Output of to_s *** Examples of numeric character references include or for the copyright symbol, or for the Greek capital letter alpha, and or for the Arabic letter alef. -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/hrule.md b/vendor/plugins/maruku/spec/block_docs/hrule.md similarity index 83% rename from vendor/plugins/maruku/tests/unittest/hrule.md rename to vendor/plugins/maruku/spec/block_docs/hrule.md index 9a637487..61daa8e5 100644 --- a/vendor/plugins/maruku/tests/unittest/hrule.md +++ b/vendor/plugins/maruku/spec/block_docs/hrule.md @@ -37,15 +37,3 @@ md_el(:document,[ *** Output of to_s *** -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/html2.md b/vendor/plugins/maruku/spec/block_docs/html2.md similarity index 69% rename from vendor/plugins/maruku/tests/unittest/html2.md rename to vendor/plugins/maruku/spec/block_docs/html2.md index 72cb5162..5bb70312 100644 --- a/vendor/plugins/maruku/tests/unittest/html2.md +++ b/vendor/plugins/maruku/spec/block_docs/html2.md @@ -12,23 +12,11 @@ md_el(:document,[ md_html("
") ],{},[]) *** Output of to_html *** -

One

123

-
+

One

123

+
*** Output of to_latex *** One 123 *** Output of to_md *** One 123 *** Output of to_s *** One 123 -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/html3.md b/vendor/plugins/maruku/spec/block_docs/html3.md similarity index 71% rename from vendor/plugins/maruku/tests/unittest/html3.md rename to vendor/plugins/maruku/spec/block_docs/html3.md index 6bf2439e..8549bf3c 100644 --- a/vendor/plugins/maruku/tests/unittest/html3.md +++ b/vendor/plugins/maruku/spec/block_docs/html3.md @@ -22,22 +22,10 @@ md_el(:document,[ ]) ],{},[]) *** Output of to_html *** -

taking part in some arcane conspirations which involve coffee, robots, sushi,

+

taking part in some arcane conspirations which involve coffee, robots, sushi,

*** Output of to_latex *** taking part in which involve , , , *** Output of to_md *** taking part in which involve , , , *** Output of to_s *** taking part in which involve , , , -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/html4.md b/vendor/plugins/maruku/spec/block_docs/html4.md similarity index 67% rename from vendor/plugins/maruku/tests/unittest/html4.md rename to vendor/plugins/maruku/spec/block_docs/html4.md index 7a4e87f8..9a25d280 100644 --- a/vendor/plugins/maruku/tests/unittest/html4.md +++ b/vendor/plugins/maruku/spec/block_docs/html4.md @@ -14,8 +14,8 @@ md_el(:document,[ md_html("
\n\t\"\"\n\n
") ],{},[]) *** Output of to_html *** -
- +
+
*** Output of to_latex *** @@ -23,15 +23,3 @@ md_el(:document,[ *** Output of to_s *** -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/html5.md b/vendor/plugins/maruku/spec/block_docs/html5.md similarity index 67% rename from vendor/plugins/maruku/tests/unittest/html5.md rename to vendor/plugins/maruku/spec/block_docs/html5.md index 82a0c60c..253e17f8 100644 --- a/vendor/plugins/maruku/tests/unittest/html5.md +++ b/vendor/plugins/maruku/spec/block_docs/html5.md @@ -12,8 +12,8 @@ md_el(:document,[ md_html("
\n \"Aperitif\"\n
") ],{},[]) *** Output of to_html *** -
- Aperitif +
+ Aperitif
*** Output of to_latex *** @@ -21,15 +21,3 @@ md_el(:document,[ *** Output of to_s *** -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/ie.md b/vendor/plugins/maruku/spec/block_docs/ie.md similarity index 64% rename from vendor/plugins/maruku/tests/unittest/ie.md rename to vendor/plugins/maruku/spec/block_docs/ie.md index c4289451..06a0e1ed 100644 --- a/vendor/plugins/maruku/tests/unittest/ie.md +++ b/vendor/plugins/maruku/spec/block_docs/ie.md @@ -27,15 +27,15 @@ md_el(:document,[ md_el(:code,[],{:raw_code=>"

here's an apostrophe & a quote \"

"},[["html_use_syntax", "true"], ["lang", "xml"]]) ],{},[]) *** Output of to_html *** -

<p>here's an apostrophe & a quote "</p>

+

<p>here's an apostrophe & a quote "</p>

-
<p>here's an apostrophe & a quote "</p>
+
<p>here's an apostrophe & a quote "</p>
-
<p>here's an apostrophe & a quote "</p>
+
<p>here's an apostrophe & a quote "</p>
-
<p>here's an apostrophe & a quote "</p>
+
<p>here's an apostrophe & a quote "</p>
-
<p>here's an apostrophe & a quote "</p>
+
<p>here's an apostrophe & a quote "</p>
*** Output of to_latex *** {\colorbox[rgb]{1.00,0.93,1.00}{\tt \char60p\char62here\char39s~an~apostrophe~\char38~a~quote~\char34\char60\char47p\char62}} @@ -47,15 +47,3 @@ md_el(:document,[ *** Output of to_s *** -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/images.md b/vendor/plugins/maruku/spec/block_docs/images.md similarity index 78% rename from vendor/plugins/maruku/tests/unittest/images.md rename to vendor/plugins/maruku/spec/block_docs/images.md index ea036079..1bcb5a84 100644 --- a/vendor/plugins/maruku/tests/unittest/images.md +++ b/vendor/plugins/maruku/spec/block_docs/images.md @@ -52,15 +52,15 @@ md_el(:document,[ md_ref_def("css2", "http://jigsaw.w3.org/css-validator/images/vcss", {:title=>"Optional title attribute"}) ],{},[]) *** Output of to_html *** -

This page does not uilizes Cascading Style Sheets

+

This page does not uilizes Cascading Style Sheets

-

Please mouseover to see the title: Cascading Style Sheets

+

Please mouseover to see the title: Cascading Style Sheets

-

Please mouseover to see the title: Cascading Style Sheets

+

Please mouseover to see the title: Cascading Style Sheets

-

I’ll say it one more time: this page does not use Cascading Style Sheets

+

I’ll say it one more time: this page does not use Cascading Style Sheets

-

This is double size: Cascading Style Sheets

+

This is double size: Cascading Style Sheets

*** Output of to_latex *** This page does not uilizes @@ -88,15 +88,3 @@ This is double size: Cascading Style Sheets *** Output of to_s *** This page does not uilizes Cascading Style SheetsPlease mouseover to see the title: Cascading Style SheetsPlease mouseover to see the title: Cascading Style SheetsIll say it one more time: this page does not use Cascading Style SheetsThis is double size: Cascading Style Sheets -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/images2.md b/vendor/plugins/maruku/spec/block_docs/images2.md similarity index 70% rename from vendor/plugins/maruku/tests/unittest/images2.md rename to vendor/plugins/maruku/spec/block_docs/images2.md index d541268e..b9a56355 100644 --- a/vendor/plugins/maruku/tests/unittest/images2.md +++ b/vendor/plugins/maruku/spec/block_docs/images2.md @@ -16,9 +16,9 @@ md_el(:document,[ md_ref_def("image", "image.jpg", {:title=>nil}) ],{},[]) *** Output of to_html *** -

This is an image.

+

This is an image.

-

This is an image.

+

This is an image.

*** Output of to_latex *** This is an . @@ -29,15 +29,3 @@ This is an image. This is an image. *** Output of to_s *** This is an image.This is an image. -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/inline_html.md b/vendor/plugins/maruku/spec/block_docs/inline_html.md similarity index 82% rename from vendor/plugins/maruku/tests/unittest/inline_html.md rename to vendor/plugins/maruku/spec/block_docs/inline_html.md index 9652a921..028efb7f 100644 --- a/vendor/plugins/maruku/tests/unittest/inline_html.md +++ b/vendor/plugins/maruku/spec/block_docs/inline_html.md @@ -71,14 +71,14 @@ md_el(:document,[

Input:

-
<img src="http://jigsaw.w3.org/css-validator/images/vcss"/>
+
<img src="http://jigsaw.w3.org/css-validator/images/vcss"/>
-

Result on span:

+

Result on span:

Result alone:

- +

Without closing:

-
+

This is

@@ -106,20 +106,8 @@ md_el(:document,[

- - + +
-

This is a

- -

true

-
-

markdown text. (no par)

-
-

This is

- -

true

-
-

markdown text. (par)

-

This is a

true

markdown text. (no par)

This is

true

markdown text. (par)

*** Output of to_latex *** @@ -150,15 +138,3 @@ Result alone: Without closing: *** Output of to_s *** Input:Result: Input:Result on span: Result alone:Without closing: -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/inline_html2.md b/vendor/plugins/maruku/spec/block_docs/inline_html2.md similarity index 77% rename from vendor/plugins/maruku/tests/unittest/inline_html2.md rename to vendor/plugins/maruku/spec/block_docs/inline_html2.md index 7d070a49..26e9addb 100644 --- a/vendor/plugins/maruku/tests/unittest/inline_html2.md +++ b/vendor/plugins/maruku/spec/block_docs/inline_html2.md @@ -19,15 +19,3 @@ md_el(:document,[ *** Output of to_s *** -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/links.md b/vendor/plugins/maruku/spec/block_docs/links.md similarity index 79% rename from vendor/plugins/maruku/tests/unittest/links.md rename to vendor/plugins/maruku/spec/block_docs/links.md index f84f728f..7757162f 100644 --- a/vendor/plugins/maruku/tests/unittest/links.md +++ b/vendor/plugins/maruku/spec/block_docs/links.md @@ -81,28 +81,28 @@ md_el(:document,[ md_ref_def("google_images", "http://images.google.com", {:title=>"Google images"}) ],{},[]) *** Output of to_html *** -

Search on Google

+

Search on Google

-

Search on Google

+

Search on Google

-

Search on Google

+

Search on Google

-

Search on Google

+

Search on Google

-

Search on Google images

+

Search on Google images

-

Inline: Google images

+

Inline: Google images

-

Inline with title: Google images

+

Inline with title: Google images

-

Inline with title: Google images

+

Inline with title: Google images

-

Search on http://www.gogole.com or http://Here.com or ask bill@google.com or you might ask bill@google.com.

+

Search on http://www.gogole.com or http://Here.com or ask bill@google.com or you might ask bill@google.com.

-

If all else fails, ask Google

+

If all else fails, ask Google

-

And now reference-style link ID with spaces

-*** Output of to_latex *** +

And now reference-style link ID with spaces

+** Output of to_latex *** Search on \href{http://www.google.com}{Google} Search on \href{http://www.google.com}{Google} @@ -150,15 +150,3 @@ And now reference-style link ID with spaces *** Output of to_s *** Search on GoogleSearch on GoogleSearch on GoogleSearch on GoogleSearch on Google imagesInline: Google imagesInline with title: Google imagesInline with title: Google imagesSearch on or or ask or you might ask bill@google.com.If all else fails, ask GoogleAnd now reference-style link ID with spaces -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/links2.md b/vendor/plugins/maruku/spec/block_docs/links2.md similarity index 80% rename from vendor/plugins/maruku/tests/unittest/links2.md rename to vendor/plugins/maruku/spec/block_docs/links2.md index 5255e823..1697cd58 100644 --- a/vendor/plugins/maruku/tests/unittest/links2.md +++ b/vendor/plugins/maruku/spec/block_docs/links2.md @@ -20,15 +20,3 @@ See \href{http://agorf.gr/}{foo'{} bar} See foo bar *** Output of to_s *** See foo bar -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/list1.md b/vendor/plugins/maruku/spec/block_docs/list1.md similarity index 87% rename from vendor/plugins/maruku/tests/unittest/list1.md rename to vendor/plugins/maruku/spec/block_docs/list1.md index 2ae21262..80cdb758 100644 --- a/vendor/plugins/maruku/tests/unittest/list1.md +++ b/vendor/plugins/maruku/spec/block_docs/list1.md @@ -44,15 +44,3 @@ This is a blockquote inside a list item. *** Output of to_s *** A list item with a blockquote:This is a blockquote inside a list item. -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/list12.md b/vendor/plugins/maruku/spec/block_docs/list12.md similarity index 75% rename from vendor/plugins/maruku/tests/unittest/list12.md rename to vendor/plugins/maruku/spec/block_docs/list12.md index b48b241f..d11b4d29 100644 --- a/vendor/plugins/maruku/tests/unittest/list12.md +++ b/vendor/plugins/maruku/spec/block_docs/list12.md @@ -15,7 +15,7 @@ md_el(:document,[ ],{},[]) *** Output of to_html *** *** Output of to_latex *** \begin{itemize}% @@ -26,15 +26,3 @@ md_el(:document,[ -aruku: good. *** Output of to_s *** Maruku: good. -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/list2.md b/vendor/plugins/maruku/spec/block_docs/list2.md similarity index 93% rename from vendor/plugins/maruku/tests/unittest/list2.md rename to vendor/plugins/maruku/spec/block_docs/list2.md index 85c72b4d..c5d80586 100644 --- a/vendor/plugins/maruku/tests/unittest/list2.md +++ b/vendor/plugins/maruku/spec/block_docs/list2.md @@ -54,15 +54,3 @@ This is the second paragraph in the list item. Youre only required to indent the -ther *** Output of to_s *** 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 -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/list3.md b/vendor/plugins/maruku/spec/block_docs/list3.md similarity index 91% rename from vendor/plugins/maruku/tests/unittest/list3.md rename to vendor/plugins/maruku/spec/block_docs/list3.md index 3f8f2b19..c54662ca 100644 --- a/vendor/plugins/maruku/tests/unittest/list3.md +++ b/vendor/plugins/maruku/spec/block_docs/list3.md @@ -62,15 +62,3 @@ item. - list item with a code block: *** Output of to_s *** A list item with a blockquote:This is a blockquote inside a list item.A list item with a code block: -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/list4.md b/vendor/plugins/maruku/spec/block_docs/list4.md similarity index 91% rename from vendor/plugins/maruku/tests/unittest/list4.md rename to vendor/plugins/maruku/spec/block_docs/list4.md index 942aba12..380e5325 100644 --- a/vendor/plugins/maruku/tests/unittest/list4.md +++ b/vendor/plugins/maruku/spec/block_docs/list4.md @@ -87,15 +87,3 @@ This is a list: This is not a list: 1987. one ciao *** Output of to_s *** This is a list:onetwoThis is not a list: * one ciaoThis is a list:onetwoThis is not a list: 1987. one ciao -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/lists.md b/vendor/plugins/maruku/spec/block_docs/lists.md similarity index 98% rename from vendor/plugins/maruku/tests/unittest/lists.md rename to vendor/plugins/maruku/spec/block_docs/lists.md index dbc5a983..208f854f 100644 --- a/vendor/plugins/maruku/tests/unittest/lists.md +++ b/vendor/plugins/maruku/spec/block_docs/lists.md @@ -190,15 +190,3 @@ This is the second paragraph in the list item. Youre only required to indent the -nother item in the same list. *** Output of to_s *** 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. -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/lists10.md b/vendor/plugins/maruku/spec/block_docs/lists10.md similarity index 63% rename from vendor/plugins/maruku/tests/unittest/lists10.md rename to vendor/plugins/maruku/spec/block_docs/lists10.md index 18637d70..e97c589b 100644 --- a/vendor/plugins/maruku/tests/unittest/lists10.md +++ b/vendor/plugins/maruku/spec/block_docs/lists10.md @@ -10,14 +10,14 @@ List: md_el(:document,[ md_par(["List:"]), md_el(:ul,[ - md_el(:li_span,["\303\250", md_code("gcc")],{:want_my_paragraph=>false},[]) + md_el(:li_span,["è", md_code("gcc")],{:want_my_paragraph=>false},[]) ],{},[]) ],{},[]) *** Output of to_html ***

List:

    -
  • ègcc
  • +
  • ègcc
*** Output of to_latex *** List: @@ -29,18 +29,6 @@ List: *** Output of to_md *** List: -- +- è`gcc` *** Output of to_s *** List:è -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/spec/block_docs/lists11.md b/vendor/plugins/maruku/spec/block_docs/lists11.md new file mode 100644 index 00000000..3257b192 --- /dev/null +++ b/vendor/plugins/maruku/spec/block_docs/lists11.md @@ -0,0 +1,23 @@ +Write a comment here +*** Parameters: *** +{} # params +*** Markdown input: *** +- ένα + +*** Output of inspect *** +md_el(:document,[ + md_el(:ul,[md_el(:li_span,["ένα"],{:want_my_paragraph=>false},[])],{},[]) +],{},[]) +*** Output of to_html *** +
    +
  • ένα
  • +
+*** Output of to_latex *** +\begin{itemize}% +\item ένα + +\end{itemize} +*** Output of to_md *** +- ένα +*** Output of to_s *** +ένα diff --git a/vendor/plugins/maruku/tests/unittest/lists6.md b/vendor/plugins/maruku/spec/block_docs/lists6.md similarity index 75% rename from vendor/plugins/maruku/tests/unittest/lists6.md rename to vendor/plugins/maruku/spec/block_docs/lists6.md index a479a86e..cdde0b2b 100644 --- a/vendor/plugins/maruku/tests/unittest/lists6.md +++ b/vendor/plugins/maruku/spec/block_docs/lists6.md @@ -39,15 +39,3 @@ md_el(:document,[],{},[]) *** Output of to_s *** -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/lists9.md b/vendor/plugins/maruku/spec/block_docs/lists9.md similarity index 87% rename from vendor/plugins/maruku/tests/unittest/lists9.md rename to vendor/plugins/maruku/spec/block_docs/lists9.md index 5a2885a6..454c8708 100644 --- a/vendor/plugins/maruku/tests/unittest/lists9.md +++ b/vendor/plugins/maruku/spec/block_docs/lists9.md @@ -62,15 +62,3 @@ md_el(:document,[ -ue *** Output of to_s *** DuetretretreDue -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/lists_after_paragraph.md b/vendor/plugins/maruku/spec/block_docs/lists_after_paragraph.md similarity index 90% rename from vendor/plugins/maruku/tests/unittest/lists_after_paragraph.md rename to vendor/plugins/maruku/spec/block_docs/lists_after_paragraph.md index e593c80d..32978acb 100644 --- a/vendor/plugins/maruku/tests/unittest/lists_after_paragraph.md +++ b/vendor/plugins/maruku/spec/block_docs/lists_after_paragraph.md @@ -102,9 +102,9 @@ md_el(:document,[

Paragraph (1 space after), list with no space: * ciao

-

Paragraph (2 spaces after), list with no space:
* ciao

+

Paragraph (2 spaces after), list with no space:
* ciao

-

Paragraph (3 spaces after), list with no space:
* ciao

+

Paragraph (3 spaces after), list with no space:
* ciao

Paragraph with block quote:

@@ -114,13 +114,13 @@ md_el(:document,[

Paragraph with header:

- +

header

Paragraph with header on two lines:

- +

header

-

Paragraph with html after

+

Paragraph with html after

Paragraph with html after, indented: Emphasis

@@ -153,11 +153,11 @@ Quoted \end{quote} Paragraph with header: -\hypertarget{header}{}\subsubsection*{{header}}\label{header} +\hypertarget{header_1}{}\subsubsection*{{header}}\label{header_1} Paragraph with header on two lines: -\hypertarget{header}{}\subsection*{{header}}\label{header} +\hypertarget{header_2}{}\subsection*{{header}}\label{header_2} Paragraph with html after @@ -206,15 +206,3 @@ tralla Paragraph with html after, indented: *** Output of to_s *** 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: -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/lists_ol.md b/vendor/plugins/maruku/spec/block_docs/lists_ol.md similarity index 98% rename from vendor/plugins/maruku/tests/unittest/lists_ol.md rename to vendor/plugins/maruku/spec/block_docs/lists_ol.md index 9af6bcfb..ed70a3ae 100644 --- a/vendor/plugins/maruku/tests/unittest/lists_ol.md +++ b/vendor/plugins/maruku/spec/block_docs/lists_ol.md @@ -260,15 +260,3 @@ This is the second paragraph in the list item. Youre only required to indent the -nother item in the same list. *** Output of to_s *** 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. -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/loss.md b/vendor/plugins/maruku/spec/block_docs/loss.md similarity index 65% rename from vendor/plugins/maruku/tests/unittest/loss.md rename to vendor/plugins/maruku/spec/block_docs/loss.md index c8c64cdd..08cb73e1 100644 --- a/vendor/plugins/maruku/tests/unittest/loss.md +++ b/vendor/plugins/maruku/spec/block_docs/loss.md @@ -7,22 +7,10 @@ Write a comment here *** Output of inspect *** md_el(:document,[md_html("
")],{},[]) *** Output of to_html *** -
+
*** Output of to_latex *** *** Output of to_md *** *** Output of to_s *** -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/spec/block_docs/math/equations.md b/vendor/plugins/maruku/spec/block_docs/math/equations.md new file mode 100644 index 00000000..f5e82659 --- /dev/null +++ b/vendor/plugins/maruku/spec/block_docs/math/equations.md @@ -0,0 +1,45 @@ +Write a comment here +*** Parameters: *** +require 'maruku/ext/math';{} +*** Markdown input: *** + +$$ x = y $$ + +$$ x += y $$ + +$$ +x = y $$ + +$$ x = y +$$ + +*** Output of inspect *** +md_el(:document,[ + md_el(:equation,[],{:label=>nil,:math=>" x = y ",:num=>nil},[]), + md_el(:equation,[],{:label=>nil,:math=>" x = y \n",:num=>nil},[]), + md_el(:equation,[],{:label=>nil,:math=>" x = y \n",:num=>nil},[]), + md_el(:equation,[],{:label=>nil,:math=>" x = y \n",:num=>nil},[]) +],{},[]) +*** Output of to_html *** +
x = y x = y
x = y +x = y
x = y +x = y
x = y +x = y
+*** Output of to_latex *** +\begin{displaymath} +x = y +\end{displaymath} +\begin{displaymath} +x = y +\end{displaymath} +\begin{displaymath} +x = y +\end{displaymath} +\begin{displaymath} +x = y +\end{displaymath} +*** Output of to_md *** + +*** Output of to_s *** + diff --git a/vendor/plugins/maruku/tests/unittest/math/inline.md b/vendor/plugins/maruku/spec/block_docs/math/inline.md similarity index 89% rename from vendor/plugins/maruku/tests/unittest/math/inline.md rename to vendor/plugins/maruku/spec/block_docs/math/inline.md index 1599073c..ecf724b1 100644 --- a/vendor/plugins/maruku/tests/unittest/math/inline.md +++ b/vendor/plugins/maruku/spec/block_docs/math/inline.md @@ -44,15 +44,3 @@ Here are some formulas: That s it, nothing else is supported. *** Output of to_s *** Here are some formulas:Thats it, nothing else is supported. -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/spec/block_docs/math/math2.md b/vendor/plugins/maruku/spec/block_docs/math/math2.md new file mode 100644 index 00000000..559c8ac7 --- /dev/null +++ b/vendor/plugins/maruku/spec/block_docs/math/math2.md @@ -0,0 +1,45 @@ + +*** Parameters: *** +require 'maruku/ext/math' +{:math_numbered => ['\\['], :html_math_engine => 'itex2mml' } +*** Markdown input: *** + +\[ + \alpha +\] + +\begin{equation} + \alpha +\end{equation} + +\begin{equation} \beta +\end{equation} + + +\begin{equation} \gamma \end{equation} +*** Output of inspect *** +md_el(:document,[ + md_el(:equation,[],{:label=>"eq1",:math=>"\t\\alpha\n\n",:num=>1},[]), + md_el(:equation,[],{:label=>nil,:math=>"\t\\alpha\n\n",:num=>nil},[]), + md_el(:equation,[],{:label=>nil,:math=>" \\beta\n",:num=>nil},[]), + md_el(:equation,[],{:label=>nil,:math=>" \\gamma ",:num=>nil},[]) +],{},[]) +*** Output of to_html *** +
(1)α\alpha
α\alpha
β\beta
γ\gamma
+*** Output of to_latex *** +\begin{equation} +\alpha +\label{eq1}\end{equation} +\begin{displaymath} +\alpha +\end{displaymath} +\begin{displaymath} +\beta +\end{displaymath} +\begin{displaymath} +\gamma +\end{displaymath} +*** Output of to_md *** + +*** Output of to_s *** + diff --git a/vendor/plugins/maruku/tests/unittest/math/notmath.md b/vendor/plugins/maruku/spec/block_docs/math/notmath.md similarity index 79% rename from vendor/plugins/maruku/tests/unittest/math/notmath.md rename to vendor/plugins/maruku/spec/block_docs/math/notmath.md index 4d669025..81a6146a 100644 --- a/vendor/plugins/maruku/tests/unittest/math/notmath.md +++ b/vendor/plugins/maruku/spec/block_docs/math/notmath.md @@ -23,15 +23,3 @@ This is not $math$. [ \alpha ] *** Output of to_s *** This is not $math$.[ \alpha ] -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/math/table.md b/vendor/plugins/maruku/spec/block_docs/math/table.md similarity index 56% rename from vendor/plugins/maruku/tests/unittest/math/table.md rename to vendor/plugins/maruku/spec/block_docs/math/table.md index eaac2ae8..94f5d598 100644 --- a/vendor/plugins/maruku/tests/unittest/math/table.md +++ b/vendor/plugins/maruku/spec/block_docs/math/table.md @@ -13,8 +13,8 @@ md_el(:document,[ md_html("\n\t$\\alpha$\n\t\n\t\t\n\t\n
$\\beta$
") ],{},[]) *** Output of to_html *** -α - +
β
α +
β
*** Output of to_latex *** @@ -23,15 +23,3 @@ md_el(:document,[ *** Output of to_s *** -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/math/table2.md b/vendor/plugins/maruku/spec/block_docs/math/table2.md similarity index 72% rename from vendor/plugins/maruku/tests/unittest/math/table2.md rename to vendor/plugins/maruku/spec/block_docs/math/table2.md index 3b72cc73..b4b3bac3 100644 --- a/vendor/plugins/maruku/tests/unittest/math/table2.md +++ b/vendor/plugins/maruku/spec/block_docs/math/table2.md @@ -26,8 +26,8 @@ md_el(:document,[ md_el(:ald,[],{:ald=>[["scope", "row"]],:ald_id=>"r"},[]) ],{},[]) *** Output of to_html *** - - +
SymbolMeaningcomments
αThe firstI like it.
The firstI like it.
+
SymbolMeaningcomments
αThe firstI like it.
The firstI like it.
*** Output of to_latex *** \begin{tabular}{l|l|l} @@ -40,15 +40,3 @@ Symbol&Meaning&comments\\ SymbolMeaningcomments The firstI like it. The firstI like it. *** Output of to_s *** SymbolMeaningcomments The firstI like it. The firstI like it. -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/misc_sw.md b/vendor/plugins/maruku/spec/block_docs/misc_sw.md similarity index 85% rename from vendor/plugins/maruku/tests/unittest/misc_sw.md rename to vendor/plugins/maruku/spec/block_docs/misc_sw.md index 71c78b25..e78c9144 100644 --- a/vendor/plugins/maruku/tests/unittest/misc_sw.md +++ b/vendor/plugins/maruku/spec/block_docs/misc_sw.md @@ -333,87 +333,87 @@ md_el(:document,[ md_ref_def("javagenerics", "http://java.sun.com/j2se/1.5.0/docs/guide/language/generics.html", {:title=>nil}) ],{},[]) *** Output of to_html *** -

General

+

General

    -
  • Operating System : Mac OS X: heaven, after the purgatory of Linux and the hell of Windows.
  • +
  • Operating System : Mac OS X: heaven, after the purgatory of Linux and the hell of Windows.
  • -
  • Browser: Firefox. On a Mac, Camino.
  • +
  • Browser: Firefox. On a Mac, Camino.
  • -
  • Email: GMail, “search, don’t sort” really works.
  • +
  • Email: GMail, “search, don’t sort” really works.
  • -
  • Text Editor: TextMate, you have to buy it, but it’s worth every penny. There are rumours that it’s been converting (recovering) Emacs users (addicts). Unfortunately, it’s Mac only. An alternative is jedit (GPL, Java).
  • +
  • Text Editor: TextMate, you have to buy it, but it’s worth every penny. There are rumours that it’s been converting (recovering) Emacs users (addicts). Unfortunately, it’s Mac only. An alternative is jedit (GPL, Java).
-

Development

+

Development

  • -

    Build system: cmake, throw the autotools away.

    +

    Build system: cmake, throw the autotools away.

  • -

    Source code control system: ditch CVS for subversion.

    +

    Source code control system: ditch CVS for subversion.

  • -

    Project management: Trac tracks everything.

    +

    Project management: Trac tracks everything.

  • -

    Scripting language: Ruby is Japanese pragmatism (and has a poignant guide). Python, you say? Python is too academic and snob:

    +

    Scripting language: Ruby is Japanese pragmatism (and has a poignant guide). Python, you say? Python is too academic and snob:

    $ python       
     Python 2.4.1 (\#1, Jun  4 2005, 00:54:33) 
    -Type "help", "copyright", "credits" or "license" for more information.
    +Type "help", "copyright", "credits" or "license" for more information.
     >>> exit
    -'Use Ctrl-D (i.e. EOF) to exit.'
    +'Use Ctrl-D (i.e. EOF) to exit.'
     >>> quit
    -'Use Ctrl-D (i.e. EOF) to exit.'
    +'Use Ctrl-D (i.e. EOF) to exit.'
  • -

    Java IDE: JBuilder is great software and has a free version (IMHO better than Eclipse). Java is not a pain anymore since it gained generics and got opensourced.

    +

    Java IDE: JBuilder is great software and has a free version (IMHO better than Eclipse). Java is not a pain anymore since it gained generics and got opensourced.

  • -

    Mark-up language: HTML is so 2001, why don’t you take at look at Markdown? Look at the source of this page.

    +

    Mark-up language: HTML is so 2001, why don’t you take at look at Markdown? Look at the source of this page.

  • -

    C++ libraries: * QT for GUIs. * GSL for math. * Magick++ for manipulating images. * Cairo for creating PDFs. * Boost for just about everything else.

    +

    C++ libraries: * QT for GUIs. * GSL for math. * Magick++ for manipulating images. * Cairo for creating PDFs. * Boost for just about everything else.

  • -

    Research

    +

    Research

      -
    • Writing papers: LaTeX
    • +
    • Writing papers: LaTeX
    • -
    • Writing papers & enjoying the process: LyX
    • +
    • Writing papers & enjoying the process: LyX
    • -
    • Handsome figures in your papers: xfig or, better, jfig.
    • +
    • Handsome figures in your papers: xfig or, better, jfig.
    • -
    • The occasional presentation with many graphical content: OpenOffice Impress (using the OOOlatex plugin); the alternative is PowerPoint with the TexPoint plugin.
    • +
    • The occasional presentation with many graphical content: OpenOffice Impress (using the OOOlatex plugin); the alternative is PowerPoint with the TexPoint plugin.
    • -
    • Managing BibTeX: jabref: multi-platform, for all your bibtex needs.
    • +
    • Managing BibTeX: jabref: multi-platform, for all your bibtex needs.
    • -
    • IEEExplore and BibTeX: convert citations using BibConverter.
    • +
    • IEEExplore and BibTeX: convert citations using BibConverter.
    -

    Cool websites

    +

    Cool websites

    *** Output of to_latex *** -\hypertarget{general}{}\subsubsection*{{General}}\label{general} +\hypertarget{general_1}{}\subsubsection*{{General}}\label{general_1} \begin{itemize}% \item \emph{Operating System} : \href{http://www.apple.com/getamac/}{Mac OS X}: heaven, after the purgatory of Linux and the hell of Windows. @@ -422,7 +422,7 @@ Type "help", "copyright", "credits" or "licen \item \emph{Text Editor}: \href{http://www.apple.com/getamac/}{TextMate}, you have to buy it, but it'{}s worth every penny. There are rumours that it'{}s been converting (recovering) Emacs users (addicts). Unfortunately, it'{}s Mac only. An alternative is \href{http://www.jedit.org/}{jedit} (GPL, Java). \end{itemize} -\hypertarget{development}{}\subsubsection*{{Development}}\label{development} +\hypertarget{development_2}{}\subsubsection*{{Development}}\label{development_2} \begin{itemize}% \item \emph{Build system}: \href{http://www.cmake.org/}{cmake}, throw the \href{http://sources.redhat.com/autobook/}{autotools} away. @@ -455,7 +455,7 @@ Type "help", "copyright", "credits" or "license" for more information. \end{itemize} -\hypertarget{research}{}\subsubsection*{{Research}}\label{research} +\hypertarget{research_3}{}\subsubsection*{{Research}}\label{research_3} \begin{itemize}% \item \emph{Writing papers}: \href{http://en.wikipedia.org/wiki/LaTeX}{LaTeX} @@ -466,7 +466,7 @@ Type "help", "copyright", "credits" or "license" for more information. \item \emph{IEEExplore and BibTeX}: convert citations using \href{http://www.bibconverter.net/ieeexplore/}{BibConverter}. \end{itemize} -\hypertarget{cool_websites}{}\subsubsection*{{Cool websites}}\label{cool_websites} +\hypertarget{cool_websites_4}{}\subsubsection*{{Cool websites}}\label{cool_websites_4} \begin{itemize}% \item \emph{Best site in the wwworld}: \href{http://en.wikipedia.org/}{Wikipedia} @@ -523,15 +523,3 @@ LiberLiberfor books in italian. API you can use. *** Output of to_s *** GeneralOperating System : Mac OS X: heaven, after the purgatory of Linux and the hell of Windows.Browser: Firefox. On a Mac, Camino.Email: GMail, search, dont sort really works.Text Editor: TextMate, you have to buy it, but its worth every penny. There are rumours that its been converting (recovering) Emacs users (addicts). Unfortunately, its Mac only. An alternative is jedit (GPL, Java).DevelopmentBuild system: cmake, throw the autotools away.Source code control system: ditch CVS for subversion.Project management: Trac tracks everything.Scripting language: Ruby is Japanese pragmatism (and has a poignant guide). Python, you say? Python is too academic and snob:Java IDE: JBuilder is great software and has a free version (IMHO better than Eclipse). Java is not a pain anymore since it gained generics and got opensourced.Mark-up language: HTML is so 2001, why dont you take at look at Markdown? Look at the source of this page.C++ libraries: * QT for GUIs. * GSL for math. * Magick++ for manipulating images. * Cairo for creating PDFs. * Boost for just about everything else.ResearchWriting papers: LaTeXWriting papers & enjoying the process: LyXHandsome figures in your papers: xfig or, better, jfig.The occasional presentation with many graphical content: OpenOffice Impress (using the OOOlatex plugin); the alternative is PowerPoint with the TexPoint plugin.Managing BibTeX: jabref: multi-platform, for all your bibtex needs.IEEExplore and BibTeX: convert citations using BibConverter.Cool websitesBest site in the wwworld: WikipediaMutopia for sheet music; the Gutenberg Project for books; LiberLiber for books in italian.Blogs: BloglinesSharing photos: flickr exposes an API you can use. -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/notyet/escape.md b/vendor/plugins/maruku/spec/block_docs/notyet/escape.md similarity index 77% rename from vendor/plugins/maruku/tests/unittest/notyet/escape.md rename to vendor/plugins/maruku/spec/block_docs/notyet/escape.md index e2eae695..c9b2e849 100644 --- a/vendor/plugins/maruku/tests/unittest/notyet/escape.md +++ b/vendor/plugins/maruku/spec/block_docs/notyet/escape.md @@ -19,15 +19,3 @@ md_el(:document,[md_par([md_code("\\\\")]), md_par([md_code("\\")])],{},[]) *** Output of to_s *** -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/notyet/header_after_par.md b/vendor/plugins/maruku/spec/block_docs/notyet/header_after_par.md similarity index 64% rename from vendor/plugins/maruku/tests/unittest/notyet/header_after_par.md rename to vendor/plugins/maruku/spec/block_docs/notyet/header_after_par.md index 67219a86..cadc8f3b 100644 --- a/vendor/plugins/maruku/tests/unittest/notyet/header_after_par.md +++ b/vendor/plugins/maruku/spec/block_docs/notyet/header_after_par.md @@ -25,27 +25,27 @@ md_el(:document,[ *** Output of to_html ***

    Paragraph

    - +

    header

    Paragraph

    - +

    header

    Paragraph

    -

    header

    +

    header

    *** Output of to_latex *** Paragraph -\hypertarget{header}{}\subsubsection*{{header}}\label{header} +\hypertarget{header_1}{}\subsubsection*{{header}}\label{header_1} Paragraph -\hypertarget{header}{}\subsection*{{header}}\label{header} +\hypertarget{header_2}{}\subsection*{{header}}\label{header_2} Paragraph -\hypertarget{header}{}\section*{{header}}\label{header} +\hypertarget{header_3}{}\section*{{header}}\label{header_3} *** Output of to_md *** Paragraph @@ -56,15 +56,3 @@ headerParagraph header *** Output of to_s *** ParagraphheaderParagraphheaderParagraphheader -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/notyet/ticks.md b/vendor/plugins/maruku/spec/block_docs/notyet/ticks.md similarity index 79% rename from vendor/plugins/maruku/tests/unittest/notyet/ticks.md rename to vendor/plugins/maruku/spec/block_docs/notyet/ticks.md index e3d6d822..10b880ab 100644 --- a/vendor/plugins/maruku/tests/unittest/notyet/ticks.md +++ b/vendor/plugins/maruku/spec/block_docs/notyet/ticks.md @@ -16,15 +16,3 @@ md_el(:document,[md_par([md_code("There is a literal backtick (`) here.")])],{}, *** Output of to_s *** -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/notyet/triggering.md b/vendor/plugins/maruku/spec/block_docs/notyet/triggering.md similarity index 88% rename from vendor/plugins/maruku/tests/unittest/notyet/triggering.md rename to vendor/plugins/maruku/spec/block_docs/notyet/triggering.md index 92f85cd0..4ee4b745 100644 --- a/vendor/plugins/maruku/tests/unittest/notyet/triggering.md +++ b/vendor/plugins/maruku/spec/block_docs/notyet/triggering.md @@ -74,9 +74,9 @@ md_el(:document,[

    Paragraph (1 space after), list with no space: * ciao

    -

    Paragraph (2 spaces after), list with no space:
    * ciao

    +

    Paragraph (2 spaces after), list with no space:
    * ciao

    -

    Paragraph (3 spaces after), list with no space:
    * ciao

    +

    Paragraph (3 spaces after), list with no space:
    * ciao

    Paragraph with block quote:

    @@ -86,11 +86,11 @@ md_el(:document,[

    Paragraph with header:

    - +

    header

    Paragraph with header on two lines:

    - +

    header

    *** Output of to_latex *** Paragraph, list with no space: * ciao @@ -117,11 +117,11 @@ Quoted \end{quote} Paragraph with header: -\hypertarget{header}{}\subsubsection*{{header}}\label{header} +\hypertarget{header_1}{}\subsubsection*{{header}}\label{header_1} Paragraph with header on two lines: -\hypertarget{header}{}\subsection*{{header}}\label{header} +\hypertarget{header_2}{}\subsection*{{header}}\label{header_2} *** Output of to_md *** Paragraph, list with no space: * ciao @@ -155,15 +155,3 @@ headerParagraph with header on two lines: header *** Output of to_s *** 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:header -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/olist.md b/vendor/plugins/maruku/spec/block_docs/olist.md similarity index 84% rename from vendor/plugins/maruku/tests/unittest/olist.md rename to vendor/plugins/maruku/spec/block_docs/olist.md index 9d9bb4ac..18abd2f7 100644 --- a/vendor/plugins/maruku/tests/unittest/olist.md +++ b/vendor/plugins/maruku/spec/block_docs/olist.md @@ -43,15 +43,3 @@ This is a list: 3. three *** Output of to_s *** This is a list:onetwothree -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/one.md b/vendor/plugins/maruku/spec/block_docs/one.md similarity index 70% rename from vendor/plugins/maruku/tests/unittest/one.md rename to vendor/plugins/maruku/spec/block_docs/one.md index 6618f961..a5ef0d6f 100644 --- a/vendor/plugins/maruku/tests/unittest/one.md +++ b/vendor/plugins/maruku/spec/block_docs/one.md @@ -13,15 +13,3 @@ One line One line *** Output of to_s *** One line -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/paragraph.md b/vendor/plugins/maruku/spec/block_docs/paragraph.md similarity index 71% rename from vendor/plugins/maruku/tests/unittest/paragraph.md rename to vendor/plugins/maruku/spec/block_docs/paragraph.md index d2960ec3..9dd04bf6 100644 --- a/vendor/plugins/maruku/tests/unittest/paragraph.md +++ b/vendor/plugins/maruku/spec/block_docs/paragraph.md @@ -14,15 +14,3 @@ Paragraph Paragraph *** Output of to_s *** Paragraph -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/paragraph_rules/dont_merge_ref.md b/vendor/plugins/maruku/spec/block_docs/paragraph_rules/dont_merge_ref.md similarity index 83% rename from vendor/plugins/maruku/tests/unittest/paragraph_rules/dont_merge_ref.md rename to vendor/plugins/maruku/spec/block_docs/paragraph_rules/dont_merge_ref.md index f5d26af3..68dabcc3 100644 --- a/vendor/plugins/maruku/tests/unittest/paragraph_rules/dont_merge_ref.md +++ b/vendor/plugins/maruku/spec/block_docs/paragraph_rules/dont_merge_ref.md @@ -40,15 +40,3 @@ Paragraph Paragraph *** Output of to_s *** ParagraphParagraphParagraph -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/paragraph_rules/tab_is_blank.md b/vendor/plugins/maruku/spec/block_docs/paragraph_rules/tab_is_blank.md similarity index 77% rename from vendor/plugins/maruku/tests/unittest/paragraph_rules/tab_is_blank.md rename to vendor/plugins/maruku/spec/block_docs/paragraph_rules/tab_is_blank.md index 15273806..6ef932b2 100644 --- a/vendor/plugins/maruku/tests/unittest/paragraph_rules/tab_is_blank.md +++ b/vendor/plugins/maruku/spec/block_docs/paragraph_rules/tab_is_blank.md @@ -22,15 +22,3 @@ Paragraph1 Paragraph2 *** Output of to_s *** Paragraph1Paragraph2 -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/paragraphs.md b/vendor/plugins/maruku/spec/block_docs/paragraphs.md similarity index 79% rename from vendor/plugins/maruku/tests/unittest/paragraphs.md rename to vendor/plugins/maruku/spec/block_docs/paragraphs.md index 9e08b416..a858b1c1 100644 --- a/vendor/plugins/maruku/tests/unittest/paragraphs.md +++ b/vendor/plugins/maruku/spec/block_docs/paragraphs.md @@ -28,7 +28,7 @@ md_el(:document,[

    Paragraph 2

    -

    Paragraph 3 Paragraph 4 Paragraph Br->
    Paragraph 5

    +

    Paragraph 3 Paragraph 4 Paragraph Br->
    Paragraph 5

    *** Output of to_latex *** Paragraph 1 @@ -44,15 +44,3 @@ Paragraph 3 Paragraph 4 Paragraph Br-> Paragraph 5 *** Output of to_s *** Paragraph 1Paragraph 2Paragraph 3 Paragraph 4 Paragraph Br->Paragraph 5 -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/pending/amps.md b/vendor/plugins/maruku/spec/block_docs/pending/amps.md similarity index 76% rename from vendor/plugins/maruku/tests/unittest/pending/amps.md rename to vendor/plugins/maruku/spec/block_docs/pending/amps.md index 209449f9..599b526e 100644 --- a/vendor/plugins/maruku/tests/unittest/pending/amps.md +++ b/vendor/plugins/maruku/spec/block_docs/pending/amps.md @@ -13,15 +13,3 @@ md_el(:document,[md_el(:code,[],{:raw_code=>"@articles.map(&:title)"},[])],{},[] *** Output of to_s *** -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/pending/empty_cells.md b/vendor/plugins/maruku/spec/block_docs/pending/empty_cells.md similarity index 63% rename from vendor/plugins/maruku/tests/unittest/pending/empty_cells.md rename to vendor/plugins/maruku/spec/block_docs/pending/empty_cells.md index 23eac138..b351328b 100644 --- a/vendor/plugins/maruku/tests/unittest/pending/empty_cells.md +++ b/vendor/plugins/maruku/spec/block_docs/pending/empty_cells.md @@ -21,8 +21,8 @@ md_el(:document,[ ],{:align=>[:left, :left, :left]},[]) ],{},[]) *** Output of to_html *** - +
    12
    AX -
    BX
    12
    AX +
    BX
    *** Output of to_latex *** \begin{tabular}{l|l|l} @@ -35,15 +35,3 @@ B&&X\\ 12AXBX *** Output of to_s *** 12AXBX -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/pending/link.md b/vendor/plugins/maruku/spec/block_docs/pending/link.md similarity index 74% rename from vendor/plugins/maruku/tests/unittest/pending/link.md rename to vendor/plugins/maruku/spec/block_docs/pending/link.md index 6a715fd0..ba1f867c 100644 --- a/vendor/plugins/maruku/tests/unittest/pending/link.md +++ b/vendor/plugins/maruku/spec/block_docs/pending/link.md @@ -32,21 +32,21 @@ md_el(:document,[ md_el(:code,[],{:raw_code=>""},[]) ],{},[]) *** Output of to_html *** -

    http://www.aa.com

    +

    http://www.aa.com

    -

    http://www.bb.com

    +

    http://www.bb.com

    -

    http://www.cc.com

    +

    http://www.cc.com

    -

    http://www.dd.com

    +

    http://www.dd.com

    <http://www.dd.com>
    -

    a@invalid.it

    +

    a@invalid.it

    -

    a@invalid.it

    +

    a@invalid.it

    -

    a@invalid.it

    +

    a@invalid.it

    <a@invalid.it>
    *** Output of to_latex *** @@ -70,15 +70,3 @@ md_el(:document,[ *** Output of to_s *** -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/pending/ref.md b/vendor/plugins/maruku/spec/block_docs/pending/ref.md similarity index 71% rename from vendor/plugins/maruku/tests/unittest/pending/ref.md rename to vendor/plugins/maruku/spec/block_docs/pending/ref.md index a3c64527..999dbad6 100644 --- a/vendor/plugins/maruku/tests/unittest/pending/ref.md +++ b/vendor/plugins/maruku/spec/block_docs/pending/ref.md @@ -12,22 +12,10 @@ md_el(:document,[ md_ref_def("a_b", "http://site.com/", {:title=>nil}) ],{},[]) *** Output of to_html *** -

    a. b is a link.

    +

    a. b is a link.

    *** Output of to_latex *** \href{http://site.com/}{a. b} is a link. *** Output of to_md *** a. bis a link. *** Output of to_s *** a. b is a link. -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/recover/recover_links.md b/vendor/plugins/maruku/spec/block_docs/recover/recover_links.md similarity index 79% rename from vendor/plugins/maruku/tests/unittest/recover/recover_links.md rename to vendor/plugins/maruku/spec/block_docs/recover/recover_links.md index 530309fc..6f4aa4be 100644 --- a/vendor/plugins/maruku/tests/unittest/recover/recover_links.md +++ b/vendor/plugins/maruku/spec/block_docs/recover/recover_links.md @@ -13,15 +13,3 @@ Search on Google images Search on Google images *** Output of to_s *** Search on Google images -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/spec/block_docs/red_tests/abbrev.md b/vendor/plugins/maruku/spec/block_docs/red_tests/abbrev.md new file mode 100644 index 00000000..174900a4 --- /dev/null +++ b/vendor/plugins/maruku/spec/block_docs/red_tests/abbrev.md @@ -0,0 +1,679 @@ +Write a comment here +*** Parameters: *** +{} # params +*** Markdown input: *** + +WebKit (Safari 3.1) and the CSS @font-face declaration +====================================================== + +I'm a big fan of typography in general. If you check out [my homepage](http://elliottcable.name) or my [contact elliottcable](http://elliottcable.name/contact.xhtml) page, and you're using Safari/WebKit or Opera/Kestrel, you'll notice the typefaces (fonts, as colloquialized) are *very* non-standard. (As of this writing, I'm using [Museo][] and [Diavlo][][^jos] heavily on both.) + +The internet has not be a friendly place for typohiles like myself, up to this point, at least. One might even say it was a frightful, mentally scarring environment for those akin to yours truly. We've been restricted to reading page after page after page on day after day after day for year after year after year abominations of markup and design enslaved by the horrible overlords we know as Lucida, Verdana, Arial, Helvetica, Geneva, Georgia, Courier, and... dare I invoke ye, thou my terrible overlord? Times New Roman. + +Wherefore art thou, my glorious Archer? And thee as well, my beautiful Garamond? The technical restrictions of that horrible monster we know as the Web Browser hath forced us all too long to use those most banal, those most common, and those most abused, out of all of the typefaces of the world. + +All hyperbole aside, I'm extremely happy to see the advent of a standard `@font-face` declaration in CSS. Internet Explorer first implemented a crutched, basic version of this way back in version 4, but nothing ever really came of it - their decision to create the proprietary .EOT[^eot] format to appease overly restrictive type foundries' worries about intellectual property (aka. the cold, hard dominatrix that we know only as Ms. Profit) truly and completely killed that initial attempt at bringing astute typography and it's advocates to the web. This new run at `@font-face` by an established, trusted, and open group (the [W3C][] itself, responsible for helping to make much of what we use as designers on the web standard and cross-system compatible) has a much better chance, in my humble opinion - and I am quite looking forward to the consequences if it succeeds. + +Now, onwards to the topic of my post as declared in the header (yes, I know, a slow start - but it's an interesting topic with an interesting history!). WebKit, the open source rendering engine behind the wonderfulness that is Safari, and how it handles the 'new' `@font-face` declaration. No, it's not really 'new', but yes, it feels like it is. + +To put it simply, and to be very blunt, it's broken. + +The [CSS spec section][spec] for `@font-face` is very specific - typefaces are to be selected based on a wide array of criteria placed in the `@font-face` declaration block itself. Various textual CSS attributes may be defined within the `@font-face` declaration, and then they will be checked when the typeface is referred to later in the CSS. For instance, if I have two `@font-face` declarations for the Diavlo family - one for regular text, and one for a heavier weighted version of the typeface - then I later utilize Diavlo in a `font-family:` attribute, it should refer to the basic Diavlo font defined in the first `@font-face`. However, if I were to do the same, but also specify a heavy `font-weight:`, then it should use the heavier version of Diavlo. To place this example in code: + + @font-face { + font-family: 'Diavlo'; + src: url(./Diavlo/Diavlo_Book.otf) format("opentype"); + } + + @font-face { + font-family: 'Diavlo'; + font-weight: 900; + src: url(./Diavlo/Diavlo_Black.otf) format("opentype"); + } + + h1, h2, h3, h4, h5, h6 { + font-family: 'Diavlo'; + font-weight: 900; + } + + div#content { + font-family: 'Diavlo'; + } + +As you can see, my headings should use the typeface defined in `Diavlo_Black.otf`, while my body content should use `Diavlo_Book.otf`. However, in WebKit, this doesn't work - it completely ignores any attribute except `font-family:` and `src:` in a `@font-face` declaration! Completely ignores them! Not only that - not *only* that - it disregards all but the last `@font-face` for a given `font-family:` attribute string! + +The implication here is that, to make `@font-face` work as it is currently implemented in WebKit (and thus, Safari 3.1), I have to declare *completely imaginary, non-existent type families* to satisfy WebKit alone. Here's the method I have used in the places I current implement `@font-face`: + + @font-face { + font-family: 'Diavlo Book'; + src: url(./Diavlo/Diavlo_Book.otf) format("opentype"); + } + + @font-face { + font-family: 'Diavlo Black'; + src: url(./Diavlo/Diavlo_Black.otf) format("opentype"); + } + + h1, h2, h3, h4, h5, h6 { + font-family: 'Diavlo Black'; + } + + div#content { + font-family: 'Diavlo Book'; + } + +Isn't it horrible? Seriously, my eyes, they bleed. There's lots of problems with this far beyond the lack of semanticity when it comes to the typeface names... let me see how many ways this breaks the purpose of `@font-face`: + + - You remove a large element our control over the display of the page. + + As soon as we begin to use `@font-face` in our page, we can no longer make any use of any other textual control attribute - `font-weight:`, `font-style:`, and `font-variant:` are no longer available to us, because they no longer correctly map to technical typeface variant/features. + + Also, many default elements are destroyed, unusable, without 'fixing' - for instance, `` would have no effect in a page styled for WebKit as above; We would have to specify something like `b {font-family: 'Diavlo Black';}` - how broken is that? Unless we caught all such default elements and re-styled them to use the bastardized names instead of the correct attributes, lots of basic HTML formatting would be broken. I myself may never use in-document formatting (separation of design and content!), but what about comments forms? Forum posts? Direct HTML-literal quotes? + + If we want to use Javascript to modify the display of the content, we can't simply adjust the mentioned textual control attributes - we have to know and change the entire `font-family:` array of strings. + + - You make us very wet. + + And by wet, I mean 'not DRY'. What if we decide to change one of the bastardized font names? Or use a different font entirely? We have to go through all of our CSS, all of our Javascript, and make sure we update every occurrence of the typeface's bastardized name. + + - You remove our user's user choice, and waste bandwidth. + + Since the names refer to families that don't, in fact, exist, the browser can't override the declaration with a user's installed version of the typeface. This means that, regardless of whether the user already has the typeface installed on their own computer, the browser won't use that - it doesn't know to use 'Diavlo', which the user has installed, because it was told to use 'Diavlo Black', which no user in the entire world has installed on their computer. + +This whole thing is rather worrying - I've heard Opera has `@font-face` support, though I haven't had time to test this myself, so I don't know if it actually does - or, for that matter, if it does it 'correctly', or has the same problems as WebKit. But either way, WebKit is one of the first two implementations to ever attempt to support `@font-face` (Microsoft's unrelated `@font-face` declaration notwithstanding) - I really don't want to see it's early mistakes carried on to FireFox in a few years, and then Internet Explorer a few decades after that. That will leave us stuck with this broken system forever, as it has been demonstrated time and time again that if nobody else supports an old standard correctly, a newcomer to the standard will not do it correctly either. I for one would really, really, hate that. + +In summary... come on, WebKit team, this isn't like you - you're always the ones with the closest-to-standard implementation, and the cleanest code, and... hell, overall? Webkit is the most secure/fastest browser available. But this is making me lose my faith in you, guys, please get it right. You're pioneering a leap into the future when it comes to the Web - this is as important, or _more_ important, than Mosiac's allowing of images was. + +To put it succinctly - don't fuck this up, y'all. + +[Museo]: (Jos Buivenga's Museo free typeface) +[Diavlo]: (Jos Buivenga's free Diavlo typeface) +[^jos]: These are fonts by [Jos Buivenga][jos], quite the amazing person. His (free) fonts are, uniquely, released for use on the web in `@font-face` declarations - unlike the vast majority of other (even free to download) typefaces, which have ridiculously restricting licenses and terms of use statements. Props, Jos - you're a pioneer, and deserve recognition as such. +*[CSS]: Cascading Style Sheets +*[.EOT]: Embedded OpenType +[^eot]: To give Microsoft a little credit, something I rarely do... Yes, I'm aware Microsoft submitted EOT to the W3C as a proposal - the problem isn't with their attempts to make it non-proprietary, but with the basic concept of making typefaces on the web DRMed. Look what such attempts have done to the music and video industry - simply decimated it. Do we really want to see the same thing happen to our beloved medium as typography moves into the 21st century? +*[W3C]: World Wide Web Consortium +[W3C]: (World Wide Web Consortium) +[spec]: () +*[DRY]: Don't Repeat Yourself +[jos]: jos + +*** Output of inspect *** +md_el(:document,[ + md_el(:header,["WebKit (Safari 3.1) and the CSS @font-face declaration"],{:level=>1},[]), + md_par([ + "I", + md_entity("rsquo"), + "m a big fan of typography in general. If you check out ", + md_im_link(["my homepage"], "http://elliottcable.name", nil), + " or my ", + md_im_link(["contact elliottcable"], "http://elliottcable.name/contact.xhtml", nil), + " page, and you", + md_entity("rsquo"), + "re using Safari/WebKit or Opera/Kestrel, you", + md_entity("rsquo"), + "ll notice the typefaces (fonts, as colloquialized) are ", + md_em(["very"]), + " non-standard. (As of this writing, I", + md_entity("rsquo"), + "m using ", + md_link(["Museo"],"museo"), + " and ", + md_link(["Diavlo"],"diavlo"), + md_foot_ref("^jos"), + " heavily on both.)" + ]), + md_par([ + "The internet has not be a friendly place for typohiles like myself, up to this point, at least. One might even say it was a frightful, mentally scarring environment for those akin to yours truly. We", + md_entity("rsquo"), + "ve been restricted to reading page after page after page on day after day after day for year after year after year abominations of markup and design enslaved by the horrible overlords we know as Lucida, Verdana, Arial, Helvetica, Geneva, Georgia, Courier, and", + md_entity("hellip"), + " dare I invoke ye, thou my terrible overlord? Times New Roman." + ]), + md_par([ + "Wherefore art thou, my glorious Archer? And thee as well, my beautiful Garamond? The technical restrictions of that horrible monster we know as the Web Browser hath forced us all too long to use those most banal, those most common, and those most abused, out of all of the typefaces of the world." + ]), + md_par([ + "All hyperbole aside, I", + md_entity("rsquo"), + "m extremely happy to see the advent of a standard ", + md_code("@font-face"), + " declaration in CSS. Internet Explorer first implemented a crutched, basic version of this way back in version 4, but nothing ever really came of it - their decision to create the proprietary .EOT", + md_foot_ref("^eot"), + " format to appease overly restrictive type foundries", + md_entity("rsquo"), + " worries about intellectual property (aka. the cold, hard dominatrix that we know only as Ms. Profit) truly and completely killed that initial attempt at bringing astute typography and it", + md_entity("rsquo"), + "s advocates to the web. This new run at ", + md_code("@font-face"), + " by an established, trusted, and open group (the ", + md_link(["W3C"],"w3c"), + " itself, responsible for helping to make much of what we use as designers on the web standard and cross-system compatible) has a much better chance, in my humble opinion - and I am quite looking forward to the consequences if it succeeds." + ]), + md_par([ + "Now, onwards to the topic of my post as declared in the header (yes, I know, a slow start - but it", + md_entity("rsquo"), + "s an interesting topic with an interesting history!). WebKit, the open source rendering engine behind the wonderfulness that is Safari, and how it handles the ", + md_entity("lsquo"), + "new", + md_entity("rsquo"), + " ", + md_code("@font-face"), + " declaration. No, it", + md_entity("rsquo"), + "s not really ", + md_entity("lsquo"), + "new", + md_entity("rsquo"), + ", but yes, it feels like it is." + ]), + md_par([ + "To put it simply, and to be very blunt, it", + md_entity("rsquo"), + "s broken." + ]), + md_par([ + "The ", + md_link(["CSS spec section"],"spec"), + " for ", + md_code("@font-face"), + " is very specific - typefaces are to be selected based on a wide array of criteria placed in the ", + md_code("@font-face"), + " declaration block itself. Various textual CSS attributes may be defined within the ", + md_code("@font-face"), + " declaration, and then they will be checked when the typeface is referred to later in the CSS. For instance, if I have two ", + md_code("@font-face"), + " declarations for the Diavlo family - one for regular text, and one for a heavier weighted version of the typeface - then I later utilize Diavlo in a ", + md_code("font-family:"), + " attribute, it should refer to the basic Diavlo font defined in the first ", + md_code("@font-face"), + ". However, if I were to do the same, but also specify a heavy ", + md_code("font-weight:"), + ", then it should use the heavier version of Diavlo. To place this example in code:" + ]), + md_el(:code,[],{:raw_code=>"@font-face {\n font-family: 'Diavlo';\n src: url(./Diavlo/Diavlo_Book.otf) format(\"opentype\");\n}\n\n@font-face {\n font-family: 'Diavlo';\n font-weight: 900;\n src: url(./Diavlo/Diavlo_Black.otf) format(\"opentype\");\n}\n\nh1, h2, h3, h4, h5, h6 {\n font-family: 'Diavlo';\n font-weight: 900;\n}\n\ndiv#content {\n font-family: 'Diavlo';\n}"},[]), + md_par([ + "As you can see, my headings should use the typeface defined in ", + md_code("Diavlo_Black.otf"), + ", while my body content should use ", + md_code("Diavlo_Book.otf"), + ". However, in WebKit, this doesn", + md_entity("rsquo"), + "t work - it completely ignores any attribute except ", + md_code("font-family:"), + " and ", + md_code("src:"), + " in a ", + md_code("@font-face"), + " declaration! Completely ignores them! Not only that - not ", + md_em(["only"]), + " that - it disregards all but the last ", + md_code("@font-face"), + " for a given ", + md_code("font-family:"), + " attribute string!" + ]), + md_par([ + "The implication here is that, to make ", + md_code("@font-face"), + " work as it is currently implemented in WebKit (and thus, Safari 3.1), I have to declare ", + md_em(["completely imaginary, non-existent type families"]), + " to satisfy WebKit alone. Here", + md_entity("rsquo"), + "s the method I have used in the places I current implement ", + md_code("@font-face"), + ":" + ]), + md_el(:code,[],{:raw_code=>"@font-face {\n font-family: 'Diavlo Book';\n src: url(./Diavlo/Diavlo_Book.otf) format(\"opentype\");\n}\n\n@font-face {\n font-family: 'Diavlo Black';\n src: url(./Diavlo/Diavlo_Black.otf) format(\"opentype\");\n}\n\nh1, h2, h3, h4, h5, h6 {\n font-family: 'Diavlo Black';\n}\n\ndiv#content {\n font-family: 'Diavlo Book';\n}"},[]), + md_par([ + "Isn", + md_entity("rsquo"), + "t it horrible? Seriously, my eyes, they bleed. There", + md_entity("rsquo"), + "s lots of problems with this far beyond the lack of semanticity when it comes to the typeface names", + md_entity("hellip"), + " let me see how many ways this breaks the purpose of ", + md_code("@font-face"), + ":" + ]), + md_el(:ul,[ + md_el(:li,[ + md_par([ + "You remove a large element our control over the display of the page." + ]), + md_par([ + "As soon as we begin to use ", + md_code("@font-face"), + " in our page, we can no longer make any use of any other textual control attribute - ", + md_code("font-weight:"), + ", ", + md_code("font-style:"), + ", and ", + md_code("font-variant:"), + " are no longer available to us, because they no longer correctly map to technical typeface variant/features." + ]), + md_par([ + "Also, many default elements are destroyed, unusable, without ", + md_entity("lsquo"), + "fixing", + md_entity("rsquo"), + " - for instance, ", + md_code(""), + " would have no effect in a page styled for WebKit as above; We would have to specify something like ", + md_code("b {font-family: 'Diavlo Black';}"), + " - how broken is that? Unless we caught all such default elements and re-styled them to use the bastardized names instead of the correct attributes, lots of basic HTML formatting would be broken. I myself may never use in-document formatting (separation of design and content!), but what about comments forms? Forum posts? Direct HTML-literal quotes?" + ]), + md_par([ + "If we want to use Javascript to modify the display of the content, we can", + md_entity("rsquo"), + "t simply adjust the mentioned textual control attributes - we have to know and change the entire ", + md_code("font-family:"), + " array of strings." + ]) + ],{:want_my_paragraph=>true},[]), + md_el(:li,[ + md_par(["You make us very wet."]), + md_par([ + "And by wet, I mean ", + md_entity("lsquo"), + "not DRY", + md_entity("rsquo"), + ". What if we decide to change one of the bastardized font names? Or use a different font entirely? We have to go through all of our CSS, all of our Javascript, and make sure we update every occurrence of the typeface", + md_entity("rsquo"), + "s bastardized name." + ]) + ],{:want_my_paragraph=>true},[]), + md_el(:li,[ + md_par([ + "You remove our user", + md_entity("rsquo"), + "s user choice, and waste bandwidth." + ]), + md_par([ + "Since the names refer to families that don", + md_entity("rsquo"), + "t, in fact, exist, the browser can", + md_entity("rsquo"), + "t override the declaration with a user", + md_entity("rsquo"), + "s installed version of the typeface. This means that, regardless of whether the user already has the typeface installed on their own computer, the browser won", + md_entity("rsquo"), + "t use that - it doesn", + md_entity("rsquo"), + "t know to use ", + md_entity("lsquo"), + "Diavlo", + md_entity("rsquo"), + ", which the user has installed, because it was told to use ", + md_entity("lsquo"), + "Diavlo Black", + md_entity("rsquo"), + ", which no user in the entire world has installed on their computer." + ]) + ],{:want_my_paragraph=>true},[]) + ],{},[]), + md_par([ + "This whole thing is rather worrying - I", + md_entity("rsquo"), + "ve heard Opera has ", + md_code("@font-face"), + " support, though I haven", + md_entity("rsquo"), + "t had time to test this myself, so I don", + md_entity("rsquo"), + "t know if it actually does - or, for that matter, if it does it ", + md_entity("lsquo"), + "correctly", + md_entity("rsquo"), + ", or has the same problems as WebKit. But either way, WebKit is one of the first two implementations to ever attempt to support ", + md_code("@font-face"), + " (Microsoft", + md_entity("rsquo"), + "s unrelated ", + md_code("@font-face"), + " declaration notwithstanding) - I really don", + md_entity("rsquo"), + "t want to see it", + md_entity("rsquo"), + "s early mistakes carried on to FireFox in a few years, and then Internet Explorer a few decades after that. That will leave us stuck with this broken system forever, as it has been demonstrated time and time again that if nobody else supports an old standard correctly, a newcomer to the standard will not do it correctly either. I for one would really, really, hate that." + ]), + md_par([ + "In summary", + md_entity("hellip"), + " come on, WebKit team, this isn", + md_entity("rsquo"), + "t like you - you", + md_entity("rsquo"), + "re always the ones with the closest-to-standard implementation, and the cleanest code, and", + md_entity("hellip"), + " hell, overall? Webkit is the most secure/fastest browser available. But this is making me lose my faith in you, guys, please get it right. You", + md_entity("rsquo"), + "re pioneering a leap into the future when it comes to the Web - this is as important, or ", + md_em(["more"]), + " important, than Mosiac", + md_entity("rsquo"), + "s allowing of images was." + ]), + md_par([ + "To put it succinctly - don", + md_entity("rsquo"), + "t fuck this up, y", + md_entity("rsquo"), + "all." + ]), + md_ref_def("museo", "http://www.josbuivenga.demon.nl/museo.html>", {:title=>"Jos Buivenga"}), + md_ref_def("diavlo", "http://www.josbuivenga.demon.nl/diavlo.html>", {:title=>"Jos Buivenga"}), + md_par([ + md_em([md_link(["CSS"],"css"), ": Cascading Style Sheets"]), + md_link([".EOT"],"eot"), + ": Embedded OpenType ", + md_foot_ref("^eot"), + ": To give Microsoft a little credit, something I rarely do", + md_entity("hellip"), + " Yes, I", + md_entity("rsquo"), + "m aware Microsoft submitted EOT to the W3C as a proposal - the problem isn", + md_entity("rsquo"), + "t with their attempts to make it non-proprietary, but with the basic concept of making typefaces on the web DRMed. Look what such attempts have done to the music and video industry - simply decimated it. Do we really want to see the same thing happen to our beloved medium as typography moves into the 21st century? ", + md_em([md_link(["W3C"],"w3c"), ": World Wide Web Consortium"]) + ]), + md_ref_def("w3c", "http://w3c.org>", {:title=>"World Wide Web Consortium"}), + md_ref_def("spec", "http://?>", {:title=>") *[DRY]: Don"}) +],{},[]) +*** Output of to_html *** +

    WebKit (Safari 3.1) and the CSS @font-face declaration

    + +

    I’m a big fan of typography in general. If you check out my homepage or my contact elliottcable page, and you’re using Safari/WebKit or Opera/Kestrel, you’ll notice the typefaces (fonts, as colloquialized) are very non-standard. (As of this writing, I’m using Museo and Diavlo1 heavily on both.)

    + +

    The internet has not be a friendly place for typohiles like myself, up to this point, at least. One might even say it was a frightful, mentally scarring environment for those akin to yours truly. We’ve been restricted to reading page after page after page on day after day after day for year after year after year abominations of markup and design enslaved by the horrible overlords we know as Lucida, Verdana, Arial, Helvetica, Geneva, Georgia, Courier, and… dare I invoke ye, thou my terrible overlord? Times New Roman.

    + +

    Wherefore art thou, my glorious Archer? And thee as well, my beautiful Garamond? The technical restrictions of that horrible monster we know as the Web Browser hath forced us all too long to use those most banal, those most common, and those most abused, out of all of the typefaces of the world.

    + +

    All hyperbole aside, I’m extremely happy to see the advent of a standard @font-face declaration in CSS. Internet Explorer first implemented a crutched, basic version of this way back in version 4, but nothing ever really came of it - their decision to create the proprietary .EOT2 format to appease overly restrictive type foundries’ worries about intellectual property (aka. the cold, hard dominatrix that we know only as Ms. Profit) truly and completely killed that initial attempt at bringing astute typography and it’s advocates to the web. This new run at @font-face by an established, trusted, and open group (the W3C itself, responsible for helping to make much of what we use as designers on the web standard and cross-system compatible) has a much better chance, in my humble opinion - and I am quite looking forward to the consequences if it succeeds.

    + +

    Now, onwards to the topic of my post as declared in the header (yes, I know, a slow start - but it’s an interesting topic with an interesting history!). WebKit, the open source rendering engine behind the wonderfulness that is Safari, and how it handles the ‘new’ @font-face declaration. No, it’s not really ‘new’, but yes, it feels like it is.

    + +

    To put it simply, and to be very blunt, it’s broken.

    + +

    The CSS spec section for @font-face is very specific - typefaces are to be selected based on a wide array of criteria placed in the @font-face declaration block itself. Various textual CSS attributes may be defined within the @font-face declaration, and then they will be checked when the typeface is referred to later in the CSS. For instance, if I have two @font-face declarations for the Diavlo family - one for regular text, and one for a heavier weighted version of the typeface - then I later utilize Diavlo in a font-family: attribute, it should refer to the basic Diavlo font defined in the first @font-face. However, if I were to do the same, but also specify a heavy font-weight:, then it should use the heavier version of Diavlo. To place this example in code:

    + +
    @font-face {
    +  font-family: 'Diavlo';
    +  src: url(./Diavlo/Diavlo_Book.otf) format("opentype");
    +}
    +
    +@font-face {
    +  font-family: 'Diavlo';
    +  font-weight: 900;
    +  src: url(./Diavlo/Diavlo_Black.otf) format("opentype");
    +}
    +
    +h1, h2, h3, h4, h5, h6 {
    +  font-family: 'Diavlo';
    +  font-weight: 900;
    +}
    +
    +div#content {
    +  font-family: 'Diavlo';
    +}
    + +

    As you can see, my headings should use the typeface defined in Diavlo_Black.otf, while my body content should use Diavlo_Book.otf. However, in WebKit, this doesn’t work - it completely ignores any attribute except font-family: and src: in a @font-face declaration! Completely ignores them! Not only that - not only that - it disregards all but the last @font-face for a given font-family: attribute string!

    + +

    The implication here is that, to make @font-face work as it is currently implemented in WebKit (and thus, Safari 3.1), I have to declare completely imaginary, non-existent type families to satisfy WebKit alone. Here’s the method I have used in the places I current implement @font-face:

    + +
    @font-face {
    +  font-family: 'Diavlo Book';
    +  src: url(./Diavlo/Diavlo_Book.otf) format("opentype");
    +}
    +
    +@font-face {
    +  font-family: 'Diavlo Black';
    +  src: url(./Diavlo/Diavlo_Black.otf) format("opentype");
    +}
    +
    +h1, h2, h3, h4, h5, h6 {
    +  font-family: 'Diavlo Black';
    +}
    +
    +div#content {
    +  font-family: 'Diavlo Book';
    +}
    + +

    Isn’t it horrible? Seriously, my eyes, they bleed. There’s lots of problems with this far beyond the lack of semanticity when it comes to the typeface names… let me see how many ways this breaks the purpose of @font-face:

    + +
      +
    • +

      You remove a large element our control over the display of the page.

      + +

      As soon as we begin to use @font-face in our page, we can no longer make any use of any other textual control attribute - font-weight:, font-style:, and font-variant: are no longer available to us, because they no longer correctly map to technical typeface variant/features.

      + +

      Also, many default elements are destroyed, unusable, without ‘fixing’ - for instance, <b> would have no effect in a page styled for WebKit as above; We would have to specify something like b {font-family: 'Diavlo Black';} - how broken is that? Unless we caught all such default elements and re-styled them to use the bastardized names instead of the correct attributes, lots of basic HTML formatting would be broken. I myself may never use in-document formatting (separation of design and content!), but what about comments forms? Forum posts? Direct HTML-literal quotes?

      + +

      If we want to use Javascript to modify the display of the content, we can’t simply adjust the mentioned textual control attributes - we have to know and change the entire font-family: array of strings.

      +
    • + +
    • +

      You make us very wet.

      + +

      And by wet, I mean ‘not DRY’. What if we decide to change one of the bastardized font names? Or use a different font entirely? We have to go through all of our CSS, all of our Javascript, and make sure we update every occurrence of the typeface’s bastardized name.

      +
    • + +
    • +

      You remove our user’s user choice, and waste bandwidth.

      + +

      Since the names refer to families that don’t, in fact, exist, the browser can’t override the declaration with a user’s installed version of the typeface. This means that, regardless of whether the user already has the typeface installed on their own computer, the browser won’t use that - it doesn’t know to use ‘Diavlo’, which the user has installed, because it was told to use ‘Diavlo Black’, which no user in the entire world has installed on their computer.

      +
    • +
    + +

    This whole thing is rather worrying - I’ve heard Opera has @font-face support, though I haven’t had time to test this myself, so I don’t know if it actually does - or, for that matter, if it does it ‘correctly’, or has the same problems as WebKit. But either way, WebKit is one of the first two implementations to ever attempt to support @font-face (Microsoft’s unrelated @font-face declaration notwithstanding) - I really don’t want to see it’s early mistakes carried on to FireFox in a few years, and then Internet Explorer a few decades after that. That will leave us stuck with this broken system forever, as it has been demonstrated time and time again that if nobody else supports an old standard correctly, a newcomer to the standard will not do it correctly either. I for one would really, really, hate that.

    + +

    In summary… come on, WebKit team, this isn’t like you - you’re always the ones with the closest-to-standard implementation, and the cleanest code, and… hell, overall? Webkit is the most secure/fastest browser available. But this is making me lose my faith in you, guys, please get it right. You’re pioneering a leap into the future when it comes to the Web - this is as important, or more important, than Mosiac’s allowing of images was.

    + +

    To put it succinctly - don’t fuck this up, y’all.

    + +

    CSS: Cascading Style Sheets.EOT: Embedded OpenType 3: To give Microsoft a little credit, something I rarely do… Yes, I’m aware Microsoft submitted EOT to the W3C as a proposal - the problem isn’t with their attempts to make it non-proprietary, but with the basic concept of making typefaces on the web DRMed. Look what such attempts have done to the music and video industry - simply decimated it. Do we really want to see the same thing happen to our beloved medium as typography moves into the 21st century? W3C: World Wide Web Consortium

    +

      +*** Output of to_latex *** +# +./lib/maruku/output/to_latex.rb:466:in `to_latex_footnote_reference' +./lib/maruku/output/to_latex.rb:538:in `send' +./lib/maruku/output/to_latex.rb:538:in `array_to_latex' +./lib/maruku/output/to_latex.rb:529:in `each' +./lib/maruku/output/to_latex.rb:529:in `array_to_latex' +./lib/maruku/output/to_latex.rb:524:in `children_to_latex' +./lib/maruku/output/to_latex.rb:158:in `to_latex_paragraph' +./lib/maruku/output/to_latex.rb:538:in `send' +./lib/maruku/output/to_latex.rb:538:in `array_to_latex' +./lib/maruku/output/to_latex.rb:529:in `each' +./lib/maruku/output/to_latex.rb:529:in `array_to_latex' +./lib/maruku/output/to_latex.rb:524:in `children_to_latex' +./lib/maruku/output/to_latex.rb:42:in `to_latex' +bin/marutest:93:in `send' +bin/marutest:93:in `run_test' +bin/marutest:88:in `each' +bin/marutest:88:in `run_test' +bin/marutest:262:in `marutest' +bin/marutest:259:in `each' +bin/marutest:259:in `marutest' +bin/marutest:334 +*** Output of to_md *** +WebKit (Safari 3.1) and the CSS @font-face declarationI m a big fan of typography in general. +If you check out my homepageor my +contact elliottcablepage, and you re +using Safari/WebKit or Opera/Kestrel, +you ll notice the typefaces (fonts, as +colloquialized) are verynon-standard. +(As of this writing, I m using Museoand +Diavloheavily on both.) + +The internet has not be a friendly +place for typohiles like myself, up to +this point, at least. One might even +say it was a frightful, mentally +scarring environment for those akin to +yours truly. We ve been restricted to +reading page after page after page on +day after day after day for year after +year after year abominations of markup +and design enslaved by the horrible +overlords we know as Lucida, Verdana, +Arial, Helvetica, Geneva, Georgia, +Courier, and dare I invoke ye, thou my +terrible overlord? Times New Roman. + +Wherefore art thou, my glorious Archer? +And thee as well, my beautiful +Garamond? The technical restrictions of +that horrible monster we know as the +Web Browser hath forced us all too long +to use those most banal, those most +common, and those most abused, out of +all of the typefaces of the world. + +All hyperbole aside, I m extremely +happy to see the advent of a standard +declaration in CSS. Internet Explorer +first implemented a crutched, basic +version of this way back in version 4, +but nothing ever really came of it - +their decision to create the +proprietary .EOT format to appease +overly restrictive type foundries +worries about intellectual property +(aka. the cold, hard dominatrix that we +know only as Ms. Profit) truly and +completely killed that initial attempt +at bringing astute typography and it s +advocates to the web. This new run at +by an established, trusted, and open +group (the W3Citself, responsible for +helping to make much of what we use as +designers on the web standard and +cross-system compatible) has a much +better chance, in my humble opinion - +and I am quite looking forward to the +consequences if it succeeds. + +Now, onwards to the topic of my post as +declared in the header (yes, I know, a +slow start - but it s an interesting +topic with an interesting history!). +WebKit, the open source rendering +engine behind the wonderfulness that is +Safari, and how it handles the new +declaration. No, it s not really new , +but yes, it feels like it is. + +To put it simply, and to be very blunt, +it s broken. + +The CSS spec sectionfor is very +specific - typefaces are to be selected +based on a wide array of criteria +placed in the declaration block itself. +Various textual CSS attributes may be +defined within the declaration, and +then they will be checked when the +typeface is referred to later in the +CSS. For instance, if I have two +declarations for the Diavlo family - +one for regular text, and one for a +heavier weighted version of the +typeface - then I later utilize Diavlo +in a attribute, it should refer to the +basic Diavlo font defined in the first +. However, if I were to do the same, +but also specify a heavy , then it +should use the heavier version of +Diavlo. To place this example in code: + +As you can see, my headings should use +the typeface defined in , while my body +content should use . However, in +WebKit, this doesn t work - it +completely ignores any attribute except +and in a declaration! Completely +ignores them! Not only that - not only +that - it disregards all but the last +for a given attribute string! + +The implication here is that, to make +work as it is currently implemented in +WebKit (and thus, Safari 3.1), I have +to declare +completely imaginary, non-existent type families +to satisfy WebKit alone. Here s the +method I have used in the places I +current implement : + +Isn t it horrible? Seriously, my eyes, +they bleed. There s lots of problems +with this far beyond the lack of +semanticity when it comes to the +typeface names let me see how many ways +this breaks the purpose of : + +-You remove a large element our control over the display of the page. +As soon as we begin to use in our page, we can no longer make any use of any other textual control attribute - , , and are no longer available to us, because they no longer correctly map to technical typeface variant/features. +Also, many default elements are destroyed, unusable, without fixing - for instance, would have no effect in a page styled for WebKit as above; We would have to specify something like - how broken is that? Unless we caught all such default elements and re-styled them to use the bastardized names instead of the correct attributes, lots of basic HTML formatting would be broken. I myself may never use in-document formatting (separation of design and content!), but what about comments forms? Forum posts? Direct HTML-literal quotes? +If we want to use Javascript to modify the display of the content, we cant simply adjust the mentioned textual control attributes - we have to know and change the entire array of strings. +-ou make us very wet. +And by wet, I mean not DRY. What if we decide to change one of the bastardized font names? Or use a different font entirely? We have to go through all of our CSS, all of our Javascript, and make sure we update every occurrence of the typefaces bastardized name. +-You remove our users user choice, and waste bandwidth. +Since the names refer to families that dont, in fact, exist, the browser cant override the declaration with a users installed version of the typeface. This means that, regardless of whether the user already has the typeface installed on their own computer, the browser wont use that - it doesnt know to use Diavlo, which the user has installed, because it was told to use Diavlo Black, which no user in the entire world has installed on their computer. + +This whole thing is rather worrying - I +ve heard Opera has support, though I +haven t had time to test this myself, +so I don t know if it actually does - +or, for that matter, if it does it +correctly , or has the same problems as +WebKit. But either way, WebKit is one +of the first two implementations to +ever attempt to support (Microsoft s +unrelated declaration notwithstanding) +- I really don t want to see it s early +mistakes carried on to FireFox in a few +years, and then Internet Explorer a few +decades after that. That will leave us +stuck with this broken system forever, +as it has been demonstrated time and +time again that if nobody else supports +an old standard correctly, a newcomer +to the standard will not do it +correctly either. I for one would +really, really, hate that. + +In summary come on, WebKit team, this +isn t like you - you re always the ones +with the closest-to-standard +implementation, and the cleanest code, +and hell, overall? Webkit is the most +secure/fastest browser available. But +this is making me lose my faith in you, +guys, please get it right. You re +pioneering a leap into the future when +it comes to the Web - this is as +important, or moreimportant, than +Mosiac s allowing of images was. + +To put it succinctly - don t fuck this +up, y all. + +CSS: Cascading Style Sheets.EOT: +Embedded OpenType : To give Microsoft a +little credit, something I rarely do +Yes, I m aware Microsoft submitted EOT +to the W3C as a proposal - the problem +isn t with their attempts to make it +non-proprietary, but with the basic +concept of making typefaces on the web +DRMed. Look what such attempts have +done to the music and video industry - +simply decimated it. Do we really want +to see the same thing happen to our +beloved medium as typography moves into +the 21st century? +W3C: World Wide Web Consortium +*** Output of to_s *** +WebKit (Safari 3.1) and the CSS @font-face declarationIm a big fan of typography in general. If you check out my homepage or my contact elliottcable page, and youre using Safari/WebKit or Opera/Kestrel, youll notice the typefaces (fonts, as colloquialized) are very non-standard. (As of this writing, Im using Museo and Diavlo heavily on both.)The internet has not be a friendly place for typohiles like myself, up to this point, at least. One might even say it was a frightful, mentally scarring environment for those akin to yours truly. Weve been restricted to reading page after page after page on day after day after day for year after year after year abominations of markup and design enslaved by the horrible overlords we know as Lucida, Verdana, Arial, Helvetica, Geneva, Georgia, Courier, and dare I invoke ye, thou my terrible overlord? Times New Roman.Wherefore art thou, my glorious Archer? And thee as well, my beautiful Garamond? The technical restrictions of that horrible monster we know as the Web Browser hath forced us all too long to use those most banal, those most common, and those most abused, out of all of the typefaces of the world.All hyperbole aside, Im extremely happy to see the advent of a standard declaration in CSS. Internet Explorer first implemented a crutched, basic version of this way back in version 4, but nothing ever really came of it - their decision to create the proprietary .EOT format to appease overly restrictive type foundries worries about intellectual property (aka. the cold, hard dominatrix that we know only as Ms. Profit) truly and completely killed that initial attempt at bringing astute typography and its advocates to the web. This new run at by an established, trusted, and open group (the W3C itself, responsible for helping to make much of what we use as designers on the web standard and cross-system compatible) has a much better chance, in my humble opinion - and I am quite looking forward to the consequences if it succeeds.Now, onwards to the topic of my post as declared in the header (yes, I know, a slow start - but its an interesting topic with an interesting history!). WebKit, the open source rendering engine behind the wonderfulness that is Safari, and how it handles the new declaration. No, its not really new, but yes, it feels like it is.To put it simply, and to be very blunt, its broken.The CSS spec section for is very specific - typefaces are to be selected based on a wide array of criteria placed in the declaration block itself. Various textual CSS attributes may be defined within the declaration, and then they will be checked when the typeface is referred to later in the CSS. For instance, if I have two declarations for the Diavlo family - one for regular text, and one for a heavier weighted version of the typeface - then I later utilize Diavlo in a attribute, it should refer to the basic Diavlo font defined in the first . However, if I were to do the same, but also specify a heavy , then it should use the heavier version of Diavlo. To place this example in code:As you can see, my headings should use the typeface defined in , while my body content should use . However, in WebKit, this doesnt work - it completely ignores any attribute except and in a declaration! Completely ignores them! Not only that - not only that - it disregards all but the last for a given attribute string!The implication here is that, to make work as it is currently implemented in WebKit (and thus, Safari 3.1), I have to declare completely imaginary, non-existent type families to satisfy WebKit alone. Heres the method I have used in the places I current implement :Isnt it horrible? Seriously, my eyes, they bleed. Theres lots of problems with this far beyond the lack of semanticity when it comes to the typeface names let me see how many ways this breaks the purpose of :You remove a large element our control over the display of the page.As soon as we begin to use in our page, we can no longer make any use of any other textual control attribute - , , and are no longer available to us, because they no longer correctly map to technical typeface variant/features.Also, many default elements are destroyed, unusable, without fixing - for instance, would have no effect in a page styled for WebKit as above; We would have to specify something like - how broken is that? Unless we caught all such default elements and re-styled them to use the bastardized names instead of the correct attributes, lots of basic HTML formatting would be broken. I myself may never use in-document formatting (separation of design and content!), but what about comments forms? Forum posts? Direct HTML-literal quotes?If we want to use Javascript to modify the display of the content, we cant simply adjust the mentioned textual control attributes - we have to know and change the entire array of strings.You make us very wet.And by wet, I mean not DRY. What if we decide to change one of the bastardized font names? Or use a different font entirely? We have to go through all of our CSS, all of our Javascript, and make sure we update every occurrence of the typefaces bastardized name.You remove our users user choice, and waste bandwidth.Since the names refer to families that dont, in fact, exist, the browser cant override the declaration with a users installed version of the typeface. This means that, regardless of whether the user already has the typeface installed on their own computer, the browser wont use that - it doesnt know to use Diavlo, which the user has installed, because it was told to use Diavlo Black, which no user in the entire world has installed on their computer.This whole thing is rather worrying - Ive heard Opera has support, though I havent had time to test this myself, so I dont know if it actually does - or, for that matter, if it does it correctly, or has the same problems as WebKit. But either way, WebKit is one of the first two implementations to ever attempt to support (Microsofts unrelated declaration notwithstanding) - I really dont want to see its early mistakes carried on to FireFox in a few years, and then Internet Explorer a few decades after that. That will leave us stuck with this broken system forever, as it has been demonstrated time and time again that if nobody else supports an old standard correctly, a newcomer to the standard will not do it correctly either. I for one would really, really, hate that.In summary come on, WebKit team, this isnt like you - youre always the ones with the closest-to-standard implementation, and the cleanest code, and hell, overall? Webkit is the most secure/fastest browser available. But this is making me lose my faith in you, guys, please get it right. Youre pioneering a leap into the future when it comes to the Web - this is as important, or more important, than Mosiacs allowing of images was.To put it succinctly - dont fuck this up, yall.CSS: Cascading Style Sheets.EOT: Embedded OpenType : To give Microsoft a little credit, something I rarely do Yes, Im aware Microsoft submitted EOT to the W3C as a proposal - the problem isnt with their attempts to make it non-proprietary, but with the basic concept of making typefaces on the web DRMed. Look what such attempts have done to the music and video industry - simply decimated it. Do we really want to see the same thing happen to our beloved medium as typography moves into the 21st century? W3C: World Wide Web Consortium diff --git a/vendor/plugins/maruku/spec/block_docs/red_tests/lists7.md b/vendor/plugins/maruku/spec/block_docs/red_tests/lists7.md new file mode 100644 index 00000000..dac68eaf --- /dev/null +++ b/vendor/plugins/maruku/spec/block_docs/red_tests/lists7.md @@ -0,0 +1,32 @@ +I'm not sure if this should work at all... + +*** Parameters: *** +{} # params +*** Markdown input: *** +Ciao + +* Tab + * Tab + * Tab + +*** Output of inspect *** +nil +*** Output of to_html *** +

      Ciao

      + +
        +
      • Tab * Tab * Tab
      • +
      +*** Output of to_latex *** +Ciao + +\begin{itemize}% +\item Tab * Tab * Tab + +\end{itemize} +*** Output of to_md *** +Ciao + +-ab * Tab * Tab +*** Output of to_s *** +CiaoTab * Tab * Tab diff --git a/vendor/plugins/maruku/spec/block_docs/red_tests/lists7b.md b/vendor/plugins/maruku/spec/block_docs/red_tests/lists7b.md new file mode 100644 index 00000000..91ebc5ab --- /dev/null +++ b/vendor/plugins/maruku/spec/block_docs/red_tests/lists7b.md @@ -0,0 +1,65 @@ +Test case given by Scott. + +http://rubyforge.org/tracker/index.php?func=detail&aid=8862&group_id=2795&atid=10735 + +a should not be indented. + +*** Parameters: *** +{} # params +*** Markdown input: *** +* a + * a1 + * a2 +* b + + +*** Output of inspect *** +md_el(:document,[ + md_el(:ul,[ + md_el(:li,[ + "a", + md_el(:ul,[ + md_el(:li_span,["a1"],{:want_my_paragraph=>false},[]), + md_el(:li_span,["a2"],{:want_my_paragraph=>false},[]) + ],{},[]) + ],{:want_my_paragraph=>true},[]), + md_el(:li,[md_par(["b"])],{:want_my_paragraph=>false},[]) + ],{},[]) +],{},[]) +*** Output of to_html *** +
        +
      • +a + +
          +
        • a1
        • + +
        • a2
        • +
        +
      • + +
      • +

        b

        +
      • +
      +*** Output of to_latex *** +\begin{itemize}% +\item a + +\begin{itemize}% +\item a1 +\item a2 + +\end{itemize} + +\item b + + + +\end{itemize} +*** Output of to_md *** +-* a1 +* a2 +- +*** Output of to_s *** +aa1a2b diff --git a/vendor/plugins/maruku/tests/unittest/red_tests/lists8.md b/vendor/plugins/maruku/spec/block_docs/red_tests/lists8.md similarity index 51% rename from vendor/plugins/maruku/tests/unittest/red_tests/lists8.md rename to vendor/plugins/maruku/spec/block_docs/red_tests/lists8.md index 43c10fbc..9e25ac3c 100644 --- a/vendor/plugins/maruku/tests/unittest/red_tests/lists8.md +++ b/vendor/plugins/maruku/spec/block_docs/red_tests/lists8.md @@ -40,37 +40,3 @@ Here is a paragraph. -tem 3 *** Output of to_s *** Here is a paragraph.Item 1Item 2Item 3 -*** EOF *** - - - - -Failed tests: [:inspect, :to_html, :to_md, :to_s] - -*** Output of inspect *** ------| WARNING | ----- -md_el(:document,[ - md_par(["Here is a paragraph."]), - md_par(["* Item 1 * Item 2 * Item 3"]) -],{},[]) -*** Output of to_html *** ------| WARNING | ----- -

      Here is a paragraph.

      - -

      * Item 1 * Item 2 * Item 3

      -*** Output of to_latex *** -Here is a paragraph. - -* Item 1 * Item 2 * Item 3 -*** Output of to_md *** ------| WARNING | ----- -Here is a paragraph. - -* Item 1 * Item 2 * Item 3 -*** Output of to_s *** ------| WARNING | ----- -Here is a paragraph.* Item 1 * Item 2 * Item 3 -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/spec/block_docs/red_tests/ref.md b/vendor/plugins/maruku/spec/block_docs/red_tests/ref.md new file mode 100644 index 00000000..140ed5e3 --- /dev/null +++ b/vendor/plugins/maruku/spec/block_docs/red_tests/ref.md @@ -0,0 +1,23 @@ +Comment +*** Parameters: *** +{} +*** Markdown input: *** +[bar] +[1]. + +[1]: /url/ "Title" +*** Output of inspect *** +md_el(:document,[ + md_par([md_link(["bar"],"1"), "."]), + md_ref_def("1", "/url/", {:title=>"Title"}) +],{},[]) +*** Output of to_html *** +

      bar.

      +*** Output of to_latex *** +\href{/url/}{a}. +*** Output of to_md *** +[bar][1]. + +[1]: /url/ "Title" +*** Output of to_s *** +bar. diff --git a/vendor/plugins/maruku/tests/unittest/red_tests/xml.html b/vendor/plugins/maruku/spec/block_docs/red_tests/xml.html similarity index 100% rename from vendor/plugins/maruku/tests/unittest/red_tests/xml.html rename to vendor/plugins/maruku/spec/block_docs/red_tests/xml.html diff --git a/vendor/plugins/maruku/tests/unittest/xml.md b/vendor/plugins/maruku/spec/block_docs/red_tests/xml.md similarity index 88% rename from vendor/plugins/maruku/tests/unittest/xml.md rename to vendor/plugins/maruku/spec/block_docs/red_tests/xml.md index 86d29485..b73339e1 100644 --- a/vendor/plugins/maruku/tests/unittest/xml.md +++ b/vendor/plugins/maruku/spec/block_docs/red_tests/xml.md @@ -3,6 +3,8 @@ Write a comment here {:on_error=>:raise} *** Markdown input: *** + + filters – including Setext, atx, Textile, reStructuredText, Grutatext, and EtText – the single biggest source of inspiration for Markdown’s syntax is the format of plain text email.

      +

      filters – including Setext, atx, Textile, reStructuredText, Grutatext, and EtText – the single biggest source of inspiration for Markdown’s syntax is the format of plain text email.

      To this end, Markdown’s syntax is comprised entirely of punctuation

      *** Output of to_latex *** @@ -69,15 +69,3 @@ To this end, Markdown s syntax is comprised entirely of punctuation *** Output of to_s *** filters including Setext, atx, Textile, reStructuredText, Grutatext, and EtText the single biggest source of inspiration for Markdowns syntax is the format of plain text email.To this end, Markdowns syntax is comprised entirely of punctuation -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/references/spaces_and_numbers.md b/vendor/plugins/maruku/spec/block_docs/references/spaces_and_numbers.md similarity index 72% rename from vendor/plugins/maruku/tests/unittest/references/spaces_and_numbers.md rename to vendor/plugins/maruku/spec/block_docs/references/spaces_and_numbers.md index 46a9736d..d83a5935 100644 --- a/vendor/plugins/maruku/tests/unittest/references/spaces_and_numbers.md +++ b/vendor/plugins/maruku/spec/block_docs/references/spaces_and_numbers.md @@ -13,15 +13,3 @@ md_el(:document,[md_ref_def("6", "http://ettext.taint.org/doc/", {:title=>nil})] *** Output of to_s *** -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/smartypants.md b/vendor/plugins/maruku/spec/block_docs/smartypants.md similarity index 91% rename from vendor/plugins/maruku/tests/unittest/smartypants.md rename to vendor/plugins/maruku/spec/block_docs/smartypants.md index f9e74ec3..2e68f413 100644 --- a/vendor/plugins/maruku/tests/unittest/smartypants.md +++ b/vendor/plugins/maruku/spec/block_docs/smartypants.md @@ -68,7 +68,7 @@ md_el(:document,[ ],{},[]) ],{},[]) *** Output of to_html *** -
      'Twas a "test" to 'remember' in the '90s.
      +
      'Twas a "test" to 'remember' in the '90s.

      ‘Twas a “test” to ‘remember’ in the ’90s.

      @@ -80,7 +80,7 @@ md_el(:document,[

      I – too – met « some curly quotes » there or «here»No space.

      -
      She was 6\"12\'.
      +
      She was 6\"12\'.

      She was 6"12'.

      @@ -112,15 +112,3 @@ here No space. She was 6 12 . *** Output of to_s *** Twas a test to remember in the 90s.It was in a sense really interesting.I too met some curly quotes there or hereNo space.She was 612. -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/syntax_hl.md b/vendor/plugins/maruku/spec/block_docs/syntax_hl.md similarity index 77% rename from vendor/plugins/maruku/tests/unittest/syntax_hl.md rename to vendor/plugins/maruku/spec/block_docs/syntax_hl.md index 30636a2e..982fb481 100644 --- a/vendor/plugins/maruku/tests/unittest/syntax_hl.md +++ b/vendor/plugins/maruku/spec/block_docs/syntax_hl.md @@ -25,13 +25,13 @@ md_el(:document,[ *** Output of to_html ***

      This is ruby code:

      -
      require 'maruku'
      +
      require 'maruku'
       
       puts Maruku.new($stdin).to_html

      This is ruby code:

      -
      require 'maruku'
      +
      require 'maruku'
      puts Maruku.new($stdin).to_html
      *** Output of to_latex *** @@ -50,15 +50,3 @@ This is ruby code: This is ruby code: *** Output of to_s *** This is ruby code:This is ruby code: -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/table_attributes.md b/vendor/plugins/maruku/spec/block_docs/table_attributes.md similarity index 69% rename from vendor/plugins/maruku/tests/unittest/table_attributes.md rename to vendor/plugins/maruku/spec/block_docs/table_attributes.md index 93f1b520..7b8fee01 100644 --- a/vendor/plugins/maruku/tests/unittest/table_attributes.md +++ b/vendor/plugins/maruku/spec/block_docs/table_attributes.md @@ -20,7 +20,7 @@ md_el(:document,[ md_el(:ald,[],{:ald=>[["scope", "row"]],:ald_id=>"t"},[]) ],{},[]) *** Output of to_html *** - +
      hh
      c1c2
      hh
      c1c2
      *** Output of to_latex *** \begin{tabular}{l|l} @@ -32,15 +32,3 @@ h&h\\ hh c1c2 *** Output of to_s *** hh c1c2 -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/test.md b/vendor/plugins/maruku/spec/block_docs/test.md similarity index 76% rename from vendor/plugins/maruku/tests/unittest/test.md rename to vendor/plugins/maruku/spec/block_docs/test.md index e1af3eee..6d33f378 100644 --- a/vendor/plugins/maruku/tests/unittest/test.md +++ b/vendor/plugins/maruku/spec/block_docs/test.md @@ -17,15 +17,3 @@ md_el(:document,[md_el(:code,[],{:raw_code=>" $ python "},[])],{},[] *** Output of to_s *** -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/underscore_in_words.html b/vendor/plugins/maruku/spec/block_docs/underscore_in_words.html similarity index 100% rename from vendor/plugins/maruku/tests/unittest/underscore_in_words.html rename to vendor/plugins/maruku/spec/block_docs/underscore_in_words.html diff --git a/vendor/plugins/maruku/tests/unittest/underscore_in_words.md b/vendor/plugins/maruku/spec/block_docs/underscore_in_words.md similarity index 78% rename from vendor/plugins/maruku/tests/unittest/underscore_in_words.md rename to vendor/plugins/maruku/spec/block_docs/underscore_in_words.md index 8b342e43..2b6f84b1 100644 --- a/vendor/plugins/maruku/tests/unittest/underscore_in_words.md +++ b/vendor/plugins/maruku/spec/block_docs/underscore_in_words.md @@ -13,15 +13,3 @@ Ok, this\_was a\_really\_old bug Ok, this_was a_really_old bug *** Output of to_s *** Ok, this_was a_really_old bug -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/wrapping.md b/vendor/plugins/maruku/spec/block_docs/wrapping.md similarity index 89% rename from vendor/plugins/maruku/tests/unittest/wrapping.md rename to vendor/plugins/maruku/spec/block_docs/wrapping.md index 86247004..9b39cd70 100644 --- a/vendor/plugins/maruku/tests/unittest/wrapping.md +++ b/vendor/plugins/maruku/spec/block_docs/wrapping.md @@ -29,10 +29,10 @@ md_el(:document,[ ],{},[]) ],{},[]) *** Output of to_html *** -

      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:
      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. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Break:
      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. Lorem ipsum dolor amet Lorem ipsum Break:
        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 Lorem ipsum Break:
        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
      @@ -65,15 +65,3 @@ dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet *** Output of to_s *** 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: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. Lorem ipsum dolor amet Lorem ipsum Break:Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor ametLorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet. Lorem ipsum dolor amet -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/xml2.md b/vendor/plugins/maruku/spec/block_docs/xml2.md similarity index 67% rename from vendor/plugins/maruku/tests/unittest/xml2.md rename to vendor/plugins/maruku/spec/block_docs/xml2.md index 7a91effb..5ecacf00 100644 --- a/vendor/plugins/maruku/tests/unittest/xml2.md +++ b/vendor/plugins/maruku/spec/block_docs/xml2.md @@ -17,15 +17,3 @@ md_el(:document,[md_html("")],{},[]) *** Output of to_s *** -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/xml3.md b/vendor/plugins/maruku/spec/block_docs/xml3.md similarity index 77% rename from vendor/plugins/maruku/tests/unittest/xml3.md rename to vendor/plugins/maruku/spec/block_docs/xml3.md index b6c8f1ce..a93d7405 100644 --- a/vendor/plugins/maruku/tests/unittest/xml3.md +++ b/vendor/plugins/maruku/spec/block_docs/xml3.md @@ -24,15 +24,3 @@ md_el(:document,[ *** Output of to_s *** -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/unittest/xml_instruction.md b/vendor/plugins/maruku/spec/block_docs/xml_instruction.md similarity index 87% rename from vendor/plugins/maruku/tests/unittest/xml_instruction.md rename to vendor/plugins/maruku/spec/block_docs/xml_instruction.md index 5f89afdc..0fb2707e 100644 --- a/vendor/plugins/maruku/tests/unittest/xml_instruction.md +++ b/vendor/plugins/maruku/spec/block_docs/xml_instruction.md @@ -36,7 +36,7 @@ md_el(:document,[ ]) ],{},[]) *** Output of to_html *** - +

      Targets

      Inside: last

      @@ -50,15 +50,3 @@ Targets Inside: last *** Output of to_s *** Targets Inside: last -*** EOF *** - - - - OK! - - - -*** Output of Markdown.pl *** -(not used anymore) -*** Output of Markdown.pl (parsed) *** -(not used anymore) \ No newline at end of file diff --git a/vendor/plugins/maruku/spec/block_spec.rb b/vendor/plugins/maruku/spec/block_spec.rb new file mode 100644 index 00000000..8cb72b0e --- /dev/null +++ b/vendor/plugins/maruku/spec/block_spec.rb @@ -0,0 +1,52 @@ +#!/usr/bin/env ruby -w +# encoding: UTF-8 +Encoding.default_external=('UTF-8') if ''.respond_to?(:force_encoding) +require File.dirname(__FILE__) + "/spec_helper" + +METHODS = [:to_html, :to_latex, :to_md, :to_s] + +describe "A Maruku document" do + before(:all) do + @old_stderr = $stderr + $stderr = StringIO.new + end + + after(:all) do + $stderr = @old_stderr + end + + Dir[File.dirname(__FILE__) + "/block_docs/**/*.md"].each do |md| + describe " for the #{md} file" do + input = File.read(md).split(/\n\*{3}[^*\n]+\*{3}\n/m) + input = ["Write a comment here", "{}", input.first] if input.size == 1 + comment = input.shift + params = eval(input.shift) + markdown = input.shift + ast = input.shift + + before(:each) do + pending if md =~ Regexp.new("^" + Regexp.quote(File.dirname(__FILE__) + "/block_docs/red_tests")) + + $already_warned_itex2mml = false + @doc = Maruku.new(markdown, params) + @expected = METHODS.zip(input).inject({}) {|h, (k, v)| h[k] = v ? v.strip : '' ; h} + end + + it "should read in the output of #inspect as the same document" do + Maruku.new.instance_eval(@doc.inspect).should == @doc + end + + it "should read in the given AST as the same document" do + Maruku.new.instance_eval(ast).should == @doc + end + + METHODS.each do |m| + it "should have the expected ##{m} output" do + res = @doc.send(m).strip + pending "install itex2mml" if m == :to_html && $already_warned_itex2mml + res.should == @expected[m] + end + end + end + end +end diff --git a/vendor/plugins/maruku/spec/span_spec.rb b/vendor/plugins/maruku/spec/span_spec.rb new file mode 100644 index 00000000..20285ef9 --- /dev/null +++ b/vendor/plugins/maruku/spec/span_spec.rb @@ -0,0 +1,254 @@ +require File.dirname(__FILE__) + "/spec_helper" + +EXPECTATIONS = Maruku.new.instance_eval do + [ + ["", [], 'Empty string gives empty list'], + ["a", ["a"], 'Easy char'], + [" a", ["a"], 'First space in the paragraph is ignored'], + ["a\n \n", ["a"], 'Last spaces in the paragraphs are ignored'], + [' ', [], 'One char => nothing'], + [' ', [], 'Two chars => nothing'], + ['a b', ['a b'], 'Spaces are compressed'], + ['a b', ['a b'], 'Newlines are spaces'], + ["a\nb", ['a b'], 'Newlines are spaces'], + ["a\n b", ['a b'], 'Compress newlines 1'], + ["a \nb", ['a b'], 'Compress newlines 2'], + [" \nb", ['b'], 'Compress newlines 3'], + ["\nb", ['b'], 'Compress newlines 4'], + ["b\n", ['b'], 'Compress newlines 5'], + ["\n", [], 'Compress newlines 6'], + ["\n\n\n", [], 'Compress newlines 7'], + + [nil, :raise, "Should throw on nil input"], + + # Code blocks + ["`" , :raise, 'Unclosed single ticks'], + ["``" , :raise, 'Unclosed double ticks'], + ["`a`" , [md_code('a')], 'Simple inline code'], + ["`` ` ``" , [md_code('`')], ], + ["`` \\` ``" , [md_code('\\`')], ], + ["``a``" , [md_code('a')], ], + ["`` a ``" , [md_code('a')], ], + + # Newlines + ["a \n", ['a',md_el(:linebreak)], 'Two spaces give br.'], + ["a \n", ['a'], 'Newlines 2'], + [" \n", [md_el(:linebreak)], 'Newlines 3'], + [" \n \n", [md_el(:linebreak),md_el(:linebreak)],'Newlines 3'], + [" \na \n", [md_el(:linebreak),'a',md_el(:linebreak)],'Newlines 3'], + + # Inline HTML + ["a < b", ['a < b'], '< can be on itself'], + ["
      ", [md_html('
      ')], 'HR will be sanitized'], + ["
      ", [md_html('
      ')], 'Closed tag is ok'], + ["
      ", [md_html('
      ')], 'Closed tag is ok 2'], + ["
      a", [md_html('
      '),'a'], 'Closed tag is ok 2'], + ["a", [md_html(''),'a'], 'Inline HTML 1'], + ["ea", [md_html('e'),'a'], 'Inline HTML 2'], + ["aeb", ['a',md_html('e'),'b'], 'Inline HTML 3'], + ["eaf", + [md_html('e'),'a',md_html('f')], + 'Inline HTML 4'], + ["efa", + [md_html('e'),md_html('f'),'a'], + 'Inline HTML 5'], + + ["", [md_html("")], 'Attributes'], + [""], + + # emphasis + ["**", :raise, 'Unclosed double **'], + ["\\*", ['*'], 'Escaping of *'], + ["a *b* ", ['a ', md_em('b')], 'Emphasis 1'], + ["a *b*", ['a ', md_em('b')], 'Emphasis 2'], + ["a * b", ['a * b'], 'Emphasis 3'], + ["a * b*", :raise, 'Unclosed emphasis'], + # same with underscore + ["__", :raise, 'Unclosed double __'], + ["\\_", ['_'], 'Escaping of _'], + ["a _b_ ", ['a ', md_em('b')], 'Emphasis 4'], + ["a _b_", ['a ', md_em('b')], 'Emphasis 5'], + ["a _ b", ['a _ b'], 'Emphasis 6'], + ["a _ b_", :raise, 'Unclosed emphasis'], + ["_b_", [md_em('b')], 'Emphasis 7'], + ["_b_ _c_", [md_em('b'),' ',md_em('c')], 'Emphasis 8'], + ["_b__c_", [md_em('b'),md_em('c')], 'Emphasis 9'], + # underscores in word + ["mod_ruby", ['mod_ruby'], 'Word with underscore'], + # strong + ["**a*", :raise, 'Unclosed double ** 2'], + ["\\**a*", ['*', md_em('a')], 'Escaping of *'], + ["a **b** ", ['a ', md_strong('b')], 'Emphasis 1'], + ["a **b**", ['a ', md_strong('b')], 'Emphasis 2'], + ["a ** b", ['a ** b'], 'Emphasis 3'], + ["a ** b**", :raise, 'Unclosed emphasis'], + ["**b****c**", [md_strong('b'),md_strong('c')], 'Emphasis 9'], + # strong (with underscore) + ["__a_", :raise, 'Unclosed double __ 2'], + + # ["\\__a_", ['_', md_em('a')], 'Escaping of _'], + ["a __b__ ", ['a ', md_strong('b')], 'Emphasis 1'], + ["a __b__", ['a ', md_strong('b')], 'Emphasis 2'], + ["a __ b", ['a __ b'], 'Emphasis 3'], + ["a __ b__", :raise, 'Unclosed emphasis'], + ["__b____c__", [md_strong('b'),md_strong('c')], 'Emphasis 9'], + # extra strong + ["***a**", :raise, 'Unclosed triple *** '], + ["\\***a**", ['*', md_strong('a')], 'Escaping of *'], + ["a ***b*** ", ['a ', md_emstrong('b')], 'Strong elements'], + ["a ***b***", ['a ', md_emstrong('b')]], + ["a *** b", ['a *** b']], + ["a ** * b", ['a ** * b']], + ["***b******c***", [md_emstrong('b'),md_emstrong('c')]], + ["a *** b***", :raise, 'Unclosed emphasis'], + # same with underscores + ["___a__", :raise, 'Unclosed triple *** '], + # ["\\___a__", ['_', md_strong('a')], 'Escaping of _'], + ["a ___b___ ", ['a ', md_emstrong('b')], 'Strong elements'], + ["a ___b___", ['a ', md_emstrong('b')]], + ["a ___ b", ['a ___ b']], + ["a __ _ b", ['a __ _ b']], + ["___b______c___", [md_emstrong('b'),md_emstrong('c')]], + ["a ___ b___", :raise, 'Unclosed emphasis'], + # mixing is bad + ["*a_", :raise, 'Mixing is bad'], + ["_a*", :raise], + ["**a__", :raise], + ["__a**", :raise], + ["___a***", :raise], + ["***a___", :raise], + # links of the form [text][ref] + ["\\[a]", ["[a]"], 'Escaping 1'], + ["\\[a\\]", ["[a]"], 'Escaping 2'], + # This is valid in the new Markdown version + # ["[a]", ["a"], 'Not a link'], + ["[a]", [ md_link(["a"],'a')], 'Empty link'], + ["[a][]", ], + ["[a][]b", [ md_link(["a"],'a'),'b'], 'Empty link'], + ["[a\\]][]", [ md_link(["a]"],'a')], 'Escape inside link (throw ?] away)'], + + ["[a", :raise, 'Link not closed'], + ["[a][", :raise, 'Ref not closed'], + + # links of the form [text](url) + ["\\[a](b)", ["[a](b)"], 'Links'], + ["[a](url)c", [md_im_link(['a'],'url'),'c'], 'url'], + ["[a]( url )c" ], + ["[a] ( url )c" ], + ["[a] ( url)c" ], + + ["[a](ur:/l/ 'Title')", [md_im_link(['a'],'ur:/l/','Title')], + 'url and title'], + ["[a] ( ur:/l/ \"Title\")" ], + ["[a] ( ur:/l/ \"Title\")" ], + ["[a]( ur:/l/ Title)", :raise, "Must quote title" ], + + ["[a](url 'Tit\\\"l\\\\e')", [md_im_link(['a'],'url','Tit"l\\e')], + 'url and title escaped'], + ["[a] ( url \"Tit\\\"l\\\\e\")" ], + ["[a] ( url \"Tit\\\"l\\\\e\" )" ], + ['[a] ( url "Tit\\"l\\\\e" )' ], + ["[a]()", [md_im_link(['a'],'')], 'No URL is OK'], + + ["[a](\"Title\")", :raise, "No url specified" ], + ["[a](url \"Title)", :raise, "Unclosed quotes" ], + ["[a](url \"Title\\\")", :raise], + ["[a](url \"Title\" ", :raise], + + ["[a](url \'Title\")", :raise, "Mixing is bad" ], + ["[a](url \"Title\')"], + + ["[a](/url)", [md_im_link(['a'],'/url')], 'Funny chars in url'], + ["[a](#url)", [md_im_link(['a'],'#url')]], + ["[a]()", [md_im_link(['a'],'/script?foo=1&bar=2')]], + + + # Images + ["\\![a](url)", ['!', md_im_link(['a'],'url') ], 'Escaping images'], + + ["![a](url)", [md_im_image(['a'],'url')], 'Image no title'], + ["![a]( url )" ], + ["![a] ( url )" ], + ["![a] ( url)" ], + + ["![a](url 'ti\"tle')", [md_im_image(['a'],'url','ti"tle')], 'Image with title'], + ['![a]( url "ti\\"tle")' ], + + ["![a](url", :raise, 'Invalid images'], + ["![a( url )" ], + ["![a] ('url )" ], + + ["![a][imref]", [md_image(['a'],'imref')], 'Image with ref'], + ["![a][ imref]"], + ["![a][ imref ]"], + ["![a][\timref\t]"], + + + ['', + [md_url('http://example.com/?foo=1&bar=2')], 'Immediate link'], + ['ab', + ['a',md_url('http://example.com/?foo=1&bar=2'),'b'] ], + ['', + [md_email('andrea@censi.org')], 'Email address'], + [''], + ["Developmen ", + ["Developmen ", md_url("http://rubyforge.org/projects/maruku/")]], + ["ab", ['a',md_html(''),'b'], + 'HTML Comment'], + + ["a -

      Multiline:

      - -

      Code block:

      - -
      <!-- Comment -->
      -
      - -

      Just plain comment, with trailing spaces on the line:

      - -

      Code:

      - -
      <hr />
      - -

      Hr's:

      - -
      - -
      - -
      - -
      - -
      - -
      - -
      - -
      - -
      - -
      -
      - -
        -
      - -
      -
      -Created by Maruku at 23:15 on Friday, January 05th, 2007.
      - diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Inline HTML (Simple).html.dist b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Inline HTML (Simple).html.dist deleted file mode 100644 index 6bf78f8f..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Inline HTML (Simple).html.dist +++ /dev/null @@ -1,72 +0,0 @@ -

      Here's a simple block:

      - -
      - foo -
      - -

      This should be a code block, though:

      - -
      <div>
      -    foo
      -</div>
      -
      - -

      As should this:

      - -
      <div>foo</div>
      -
      - -

      Now, nested:

      - -
      -
      -
      - foo -
      -
      -
      - -

      This should just be an HTML comment:

      - - - -

      Multiline:

      - - - -

      Code block:

      - -
      <!-- Comment -->
      -
      - -

      Just plain comment, with trailing spaces on the line:

      - - - -

      Code:

      - -
      <hr />
      -
      - -

      Hr's:

      - -
      - -
      - -
      - -
      - -
      - -
      - -
      - -
      - -
      diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Inline HTML (Simple).text b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Inline HTML (Simple).text deleted file mode 100644 index 14aa2dc2..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Inline HTML (Simple).text +++ /dev/null @@ -1,69 +0,0 @@ -Here's a simple block: - -
      - foo -
      - -This should be a code block, though: - -
      - foo -
      - -As should this: - -
      foo
      - -Now, nested: - -
      -
      -
      - foo -
      -
      -
      - -This should just be an HTML comment: - - - -Multiline: - - - -Code block: - - - -Just plain comment, with trailing spaces on the line: - - - -Code: - -
      - -Hr's: - -
      - -
      - -
      - -
      - -
      - -
      - -
      - -
      - -
      - diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Inline HTML comments.html b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Inline HTML comments.html deleted file mode 100644 index ca8e9518..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Inline HTML comments.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -

      Paragraph one.

      - -

      Paragraph two.

      - -

      The end.

      - -
      -
      - -
        -
      - -
      -
      -Created by Maruku at 23:15 on Friday, January 05th, 2007.
      - diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Inline HTML comments.html.dist b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Inline HTML comments.html.dist deleted file mode 100644 index 3f167a16..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Inline HTML comments.html.dist +++ /dev/null @@ -1,13 +0,0 @@ -

      Paragraph one.

      - - - - - -

      Paragraph two.

      - - - -

      The end.

      diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Inline HTML comments.text b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Inline HTML comments.text deleted file mode 100644 index 41d830d0..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Inline HTML comments.text +++ /dev/null @@ -1,13 +0,0 @@ -Paragraph one. - - - - - -Paragraph two. - - - -The end. diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Links, inline style.html b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Links, inline style.html deleted file mode 100644 index 7d5420c2..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Links, inline style.html +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - -

      Just a URL.

      - -

      URL and title.

      - -

      URL and title.

      - -

      URL and title.

      - -

      Empty.

      - -
      -
      - -
        -
      - -
      -
      -Created by Maruku at 23:15 on Friday, January 05th, 2007.
      - diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Links, inline style.html.dist b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Links, inline style.html.dist deleted file mode 100644 index bdfabb57..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Links, inline style.html.dist +++ /dev/null @@ -1,9 +0,0 @@ -

      Just a URL.

      - -

      URL and title.

      - -

      URL and title.

      - -

      URL and title.

      - -

      Empty.

      diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Links, inline style.text b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Links, inline style.text deleted file mode 100644 index 4d0c1c26..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Links, inline style.text +++ /dev/null @@ -1,9 +0,0 @@ -Just a [URL](/url/). - -[URL and title](/url/ "title"). - -[URL and title](/url/ "title preceded by two spaces"). - -[URL and title](/url/ "title preceded by a tab"). - -[Empty](). diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Links, reference style.html b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Links, reference style.html deleted file mode 100644 index 3731aee7..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Links, reference style.html +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - -

      Foo bar.

      - -

      Foo bar.

      - -

      Foo bar 1.

      - -

      With embedded brackets.

      - -

      Indented once.

      - -

      Indented twice.

      - -

      Indented thrice.

      - -

      Indented four times.

      - -
      [four]: /url
      -
      -
      - -
      -
      - -
        -
      - -
      -
      -Created by Maruku at 23:15 on Friday, January 05th, 2007.
      - diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Links, reference style.html.dist b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Links, reference style.html.dist deleted file mode 100644 index cf4d8332..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Links, reference style.html.dist +++ /dev/null @@ -1,18 +0,0 @@ -

      Foo bar.

      - -

      Foo bar.

      - -

      Foo bar.

      - -

      With embedded [brackets].

      - -

      Indented once.

      - -

      Indented twice.

      - -

      Indented thrice.

      - -

      Indented [four][] times.

      - -
      [four]: /url
      -
      diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Links, reference style.text b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Links, reference style.text deleted file mode 100644 index b2fa7345..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Links, reference style.text +++ /dev/null @@ -1,31 +0,0 @@ -Foo [bar] [1]. - -Foo [bar][1]. - -Foo [bar] -[1]. - -[1]: /url/ "Title" - - -With [embedded [brackets]] [b]. - - -Indented [once][]. - -Indented [twice][]. - -Indented [thrice][]. - -Indented [four][] times. - - [once]: /url - - [twice]: /url - - [thrice]: /url - - [four]: /url - - -[b]: /url/ diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Literal quotes in titles.html b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Literal quotes in titles.html deleted file mode 100644 index 92bc5f0d..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Literal quotes in titles.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - -

      Foo bar.

      - -

      Foo bar.

      - -
      -
      - -
        -
      - -
      -
      -Created by Maruku at 23:15 on Friday, January 05th, 2007.
      - diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Literal quotes in titles.html.dist b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Literal quotes in titles.html.dist deleted file mode 100644 index 611c1ac6..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Literal quotes in titles.html.dist +++ /dev/null @@ -1,3 +0,0 @@ -

      Foo bar.

      - -

      Foo bar.

      diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Literal quotes in titles.text b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Literal quotes in titles.text deleted file mode 100644 index 29d0e423..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Literal quotes in titles.text +++ /dev/null @@ -1,7 +0,0 @@ -Foo [bar][]. - -Foo [bar](/url/ "Title with "quotes" inside"). - - - [bar]: /url/ "Title with "quotes" inside" - diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Markdown Documentation - Basics.html b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Markdown Documentation - Basics.html deleted file mode 100644 index 1cfe98e5..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Markdown Documentation - Basics.html +++ /dev/null @@ -1,322 +0,0 @@ - - - - -Markdown: Basics - - -

      Markdown: Basics

      - - - -

      Getting the Gist of Markdown's Formatting Syntax

      - -

      This page offers a brief overview of what it's like to use Markdown. The syntax page provides complete, detailed documentation for every feature, but Markdown should be very easy to pick up simply by looking at a few examples of it in action. The examples on this page are written in a before/after style, showing example syntax and the HTML output produced by Markdown.

      - -

      It's also helpful to simply try Markdown out; the Dingus is a web application that allows you type your own Markdown-formatted text and translate it to XHTML.

      - -

      Note: This document is itself written using Markdown; you can see the source for it by adding '.text' to the URL.

      - -

      Paragraphs, Headers, Blockquotes

      - -

      A paragraph is simply one or more consecutive lines of text, separated by one or more blank lines. (A blank line is any line that looks like a blank line -- a line containing nothing spaces or tabs is considered blank.) Normal paragraphs should not be intended with spaces or tabs.

      - -

      Markdown offers two styles of headers: Setext and atx. Setext-style headers for <h1> and <h2> are created by "underlining" with equal signs (=) and hyphens (-), respectively. To create an atx-style header, you put 1-6 hash marks (#) at the beginning of the line -- the number of hashes equals the resulting HTML header level.

      - -

      Blockquotes are indicated using email-style '>' angle brackets.

      - -

      Markdown:

      - -
      A First Level Header
      -====================
      -
      -A Second Level Header
      ----------------------
      -
      -Now is the time for all good men to come to
      -the aid of their country. This is just a
      -regular paragraph.
      -
      -The quick brown fox jumped over the lazy
      -dog's back.
      -
      -### Header 3
      -
      -> This is a blockquote.
      -> 
      -> This is the second paragraph in the blockquote.
      ->
      -> ## This is an H2 in a blockquote
      -
      -
      - -

      Output:

      - -
      <h1>A First Level Header</h1>
      -
      -<h2>A Second Level Header</h2>
      -
      -<p>Now is the time for all good men to come to
      -the aid of their country. This is just a
      -regular paragraph.</p>
      -
      -<p>The quick brown fox jumped over the lazy
      -dog's back.</p>
      -
      -<h3>Header 3</h3>
      -
      -<blockquote>
      -    <p>This is a blockquote.</p>
      -    
      -    <p>This is the second paragraph in the blockquote.</p>
      -    
      -    <h2>This is an H2 in a blockquote</h2>
      -</blockquote>
      -
      -
      -
      - -

      Phrase Emphasis

      - -

      Markdown uses asterisks and underscores to indicate spans of emphasis.

      - -

      Markdown:

      - -
      Some of these words *are emphasized*.
      -Some of these words _are emphasized also_.
      -
      -Use two asterisks for **strong emphasis**.
      -Or, if you prefer, __use two underscores instead__.
      -
      - -

      Output:

      - -
      <p>Some of these words <em>are emphasized</em>.
      -Some of these words <em>are emphasized also</em>.</p>
      -
      -<p>Use two asterisks for <strong>strong emphasis</strong>.
      -Or, if you prefer, <strong>use two underscores instead</strong>.</p>
      -
      -
      -
      - -

      Lists

      - -

      Unordered (bulleted) lists use asterisks, pluses, and hyphens (*, +, and -) as list markers. These three markers are interchangable; this:

      - -
      *   Candy.
      -*   Gum.
      -*   Booze.
      -
      - -

      this:

      - -
      +   Candy.
      -+   Gum.
      -+   Booze.
      -
      - -

      and this:

      - -
      -   Candy.
      --   Gum.
      --   Booze.
      -
      - -

      all produce the same output:

      - -
      <ul>
      -<li>Candy.</li>
      -<li>Gum.</li>
      -<li>Booze.</li>
      -</ul>
      -
      - -

      Ordered (numbered) lists use regular numbers, followed by periods, as list markers:

      - -
      1.  Red
      -2.  Green
      -3.  Blue
      -
      - -

      Output:

      - -
      <ol>
      -<li>Red</li>
      -<li>Green</li>
      -<li>Blue</li>
      -</ol>
      -
      - -

      If you put blank lines between items, you'll get <p> tags for the list item text. You can create multi-paragraph list items by indenting the paragraphs by 4 spaces or 1 tab:

      - -
      *   A list item.
      -
      -    With multiple paragraphs.
      -
      -*   Another item in the list.
      -
      - -

      Output:

      - -
      <ul>
      -<li><p>A list item.</p>
      -<p>With multiple paragraphs.</p></li>
      -<li><p>Another item in the list.</p></li>
      -</ul>
      -
      -
      -
      - - - -

      Markdown supports two styles for creating links: inline and reference. With both styles, you use square brackets to delimit the text you want to turn into a link.

      - -

      Inline-style links use parentheses immediately after the link text. For example:

      - -
      This is an [example link](http://example.com/).
      -
      - -

      Output:

      - -
      <p>This is an <a href="http://example.com/">
      -example link</a>.</p>
      -
      - -

      Optionally, you may include a title attribute in the parentheses:

      - -
      This is an [example link](http://example.com/ "With a Title").
      -
      - -

      Output:

      - -
      <p>This is an <a href="http://example.com/" title="With a Title">
      -example link</a>.</p>
      -
      - -

      Reference-style links allow you to refer to your links by names, which you define elsewhere in your document:

      - -
      I get 10 times more traffic from [Google][1] than from
      -[Yahoo][2] or [MSN][3].
      -
      -[1]: http://google.com/        "Google"
      -[2]: http://search.yahoo.com/  "Yahoo Search"
      -[3]: http://search.msn.com/    "MSN Search"
      -
      - -

      Output:

      - -
      <p>I get 10 times more traffic from <a href="http://google.com/"
      -title="Google">Google</a> than from <a href="http://search.yahoo.com/"
      -title="Yahoo Search">Yahoo</a> or <a href="http://search.msn.com/"
      -title="MSN Search">MSN</a>.</p>
      -
      - -

      The title attribute is optional. Link names may contain letters, numbers and spaces, but are not case sensitive:

      - -
      I start my morning with a cup of coffee and
      -[The New York Times][NY Times].
      -
      -[ny times]: http://www.nytimes.com/
      -
      - -

      Output:

      - -
      <p>I start my morning with a cup of coffee and
      -<a href="http://www.nytimes.com/">The New York Times</a>.</p>
      -
      -
      - -

      Images

      - -

      Image syntax is very much like link syntax.

      - -

      Inline (titles are optional):

      - -
      ![alt text](/path/to/img.jpg "Title")
      -
      - -

      Reference-style:

      - -
      ![alt text][id]
      -
      -[id]: /path/to/img.jpg "Title"
      -
      - -

      Both of the above examples produce the same output:

      - -
      <img src="/path/to/img.jpg" alt="alt text" title="Title" />
      -
      -
      -
      - -

      Code

      - -

      In a regular paragraph, you can create code span by wrapping text in backtick quotes. Any ampersands (&) and angle brackets (< or >) will automatically be translated into HTML entities. This makes it easy to use Markdown to write about HTML example code:

      - -
      I strongly recommend against using any `<blink>` tags.
      -
      -I wish SmartyPants used named entities like `&mdash;`
      -instead of decimal-encoded entites like `&#8212;`.
      -
      - -

      Output:

      - -
      <p>I strongly recommend against using any
      -<code>&lt;blink&gt;</code> tags.</p>
      -
      -<p>I wish SmartyPants used named entities like
      -<code>&amp;mdash;</code> instead of decimal-encoded
      -entites like <code>&amp;#8212;</code>.</p>
      -
      -
      - -

      To specify an entire block of pre-formatted code, indent every line of the block by 4 spaces or 1 tab. Just like with code spans, &, <, and > characters will be escaped automatically.

      - -

      Markdown:

      - -
      If you want your page to validate under XHTML 1.0 Strict,
      -you've got to put paragraph tags in your blockquotes:
      -
      -    <blockquote>
      -        <p>For example.</p>
      -    </blockquote>
      -
      - -

      Output:

      - -
      <p>If you want your page to validate under XHTML 1.0 Strict,
      -you've got to put paragraph tags in your blockquotes:</p>
      -
      -<pre><code>&lt;blockquote&gt;
      -    &lt;p&gt;For example.&lt;/p&gt;
      -&lt;/blockquote&gt;
      -</code></pre>
      - -
      -
      - -
        -
      - -
      -
      -Created by Maruku at 23:15 on Friday, January 05th, 2007.
      - diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Markdown Documentation - Basics.html.dist b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Markdown Documentation - Basics.html.dist deleted file mode 100644 index d5bdbb29..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Markdown Documentation - Basics.html.dist +++ /dev/null @@ -1,314 +0,0 @@ -

      Markdown: Basics

      - - - -

      Getting the Gist of Markdown's Formatting Syntax

      - -

      This page offers a brief overview of what it's like to use Markdown. -The syntax page provides complete, detailed documentation for -every feature, but Markdown should be very easy to pick up simply by -looking at a few examples of it in action. The examples on this page -are written in a before/after style, showing example syntax and the -HTML output produced by Markdown.

      - -

      It's also helpful to simply try Markdown out; the Dingus is a -web application that allows you type your own Markdown-formatted text -and translate it to XHTML.

      - -

      Note: This document is itself written using Markdown; you -can see the source for it by adding '.text' to the URL.

      - -

      Paragraphs, Headers, Blockquotes

      - -

      A paragraph is simply one or more consecutive lines of text, separated -by one or more blank lines. (A blank line is any line that looks like a -blank line -- a line containing nothing spaces or tabs is considered -blank.) Normal paragraphs should not be intended with spaces or tabs.

      - -

      Markdown offers two styles of headers: Setext and atx. -Setext-style headers for <h1> and <h2> are created by -"underlining" with equal signs (=) and hyphens (-), respectively. -To create an atx-style header, you put 1-6 hash marks (#) at the -beginning of the line -- the number of hashes equals the resulting -HTML header level.

      - -

      Blockquotes are indicated using email-style '>' angle brackets.

      - -

      Markdown:

      - -
      A First Level Header
      -====================
      -
      -A Second Level Header
      ----------------------
      -
      -Now is the time for all good men to come to
      -the aid of their country. This is just a
      -regular paragraph.
      -
      -The quick brown fox jumped over the lazy
      -dog's back.
      -
      -### Header 3
      -
      -> This is a blockquote.
      -> 
      -> This is the second paragraph in the blockquote.
      ->
      -> ## This is an H2 in a blockquote
      -
      - -

      Output:

      - -
      <h1>A First Level Header</h1>
      -
      -<h2>A Second Level Header</h2>
      -
      -<p>Now is the time for all good men to come to
      -the aid of their country. This is just a
      -regular paragraph.</p>
      -
      -<p>The quick brown fox jumped over the lazy
      -dog's back.</p>
      -
      -<h3>Header 3</h3>
      -
      -<blockquote>
      -    <p>This is a blockquote.</p>
      -
      -    <p>This is the second paragraph in the blockquote.</p>
      -
      -    <h2>This is an H2 in a blockquote</h2>
      -</blockquote>
      -
      - -

      Phrase Emphasis

      - -

      Markdown uses asterisks and underscores to indicate spans of emphasis.

      - -

      Markdown:

      - -
      Some of these words *are emphasized*.
      -Some of these words _are emphasized also_.
      -
      -Use two asterisks for **strong emphasis**.
      -Or, if you prefer, __use two underscores instead__.
      -
      - -

      Output:

      - -
      <p>Some of these words <em>are emphasized</em>.
      -Some of these words <em>are emphasized also</em>.</p>
      -
      -<p>Use two asterisks for <strong>strong emphasis</strong>.
      -Or, if you prefer, <strong>use two underscores instead</strong>.</p>
      -
      - -

      Lists

      - -

      Unordered (bulleted) lists use asterisks, pluses, and hyphens (*, -+, and -) as list markers. These three markers are -interchangable; this:

      - -
      *   Candy.
      -*   Gum.
      -*   Booze.
      -
      - -

      this:

      - -
      +   Candy.
      -+   Gum.
      -+   Booze.
      -
      - -

      and this:

      - -
      -   Candy.
      --   Gum.
      --   Booze.
      -
      - -

      all produce the same output:

      - -
      <ul>
      -<li>Candy.</li>
      -<li>Gum.</li>
      -<li>Booze.</li>
      -</ul>
      -
      - -

      Ordered (numbered) lists use regular numbers, followed by periods, as -list markers:

      - -
      1.  Red
      -2.  Green
      -3.  Blue
      -
      - -

      Output:

      - -
      <ol>
      -<li>Red</li>
      -<li>Green</li>
      -<li>Blue</li>
      -</ol>
      -
      - -

      If you put blank lines between items, you'll get <p> tags for the -list item text. You can create multi-paragraph list items by indenting -the paragraphs by 4 spaces or 1 tab:

      - -
      *   A list item.
      -
      -    With multiple paragraphs.
      -
      -*   Another item in the list.
      -
      - -

      Output:

      - -
      <ul>
      -<li><p>A list item.</p>
      -<p>With multiple paragraphs.</p></li>
      -<li><p>Another item in the list.</p></li>
      -</ul>
      -
      - -

      Links

      - -

      Markdown supports two styles for creating links: inline and -reference. With both styles, you use square brackets to delimit the -text you want to turn into a link.

      - -

      Inline-style links use parentheses immediately after the link text. -For example:

      - -
      This is an [example link](http://example.com/).
      -
      - -

      Output:

      - -
      <p>This is an <a href="http://example.com/">
      -example link</a>.</p>
      -
      - -

      Optionally, you may include a title attribute in the parentheses:

      - -
      This is an [example link](http://example.com/ "With a Title").
      -
      - -

      Output:

      - -
      <p>This is an <a href="http://example.com/" title="With a Title">
      -example link</a>.</p>
      -
      - -

      Reference-style links allow you to refer to your links by names, which -you define elsewhere in your document:

      - -
      I get 10 times more traffic from [Google][1] than from
      -[Yahoo][2] or [MSN][3].
      -
      -[1]: http://google.com/        "Google"
      -[2]: http://search.yahoo.com/  "Yahoo Search"
      -[3]: http://search.msn.com/    "MSN Search"
      -
      - -

      Output:

      - -
      <p>I get 10 times more traffic from <a href="http://google.com/"
      -title="Google">Google</a> than from <a href="http://search.yahoo.com/"
      -title="Yahoo Search">Yahoo</a> or <a href="http://search.msn.com/"
      -title="MSN Search">MSN</a>.</p>
      -
      - -

      The title attribute is optional. Link names may contain letters, -numbers and spaces, but are not case sensitive:

      - -
      I start my morning with a cup of coffee and
      -[The New York Times][NY Times].
      -
      -[ny times]: http://www.nytimes.com/
      -
      - -

      Output:

      - -
      <p>I start my morning with a cup of coffee and
      -<a href="http://www.nytimes.com/">The New York Times</a>.</p>
      -
      - -

      Images

      - -

      Image syntax is very much like link syntax.

      - -

      Inline (titles are optional):

      - -
      ![alt text](/path/to/img.jpg "Title")
      -
      - -

      Reference-style:

      - -
      ![alt text][id]
      -
      -[id]: /path/to/img.jpg "Title"
      -
      - -

      Both of the above examples produce the same output:

      - -
      <img src="/path/to/img.jpg" alt="alt text" title="Title" />
      -
      - -

      Code

      - -

      In a regular paragraph, you can create code span by wrapping text in -backtick quotes. Any ampersands (&) and angle brackets (< or ->) will automatically be translated into HTML entities. This makes -it easy to use Markdown to write about HTML example code:

      - -
      I strongly recommend against using any `<blink>` tags.
      -
      -I wish SmartyPants used named entities like `&mdash;`
      -instead of decimal-encoded entites like `&#8212;`.
      -
      - -

      Output:

      - -
      <p>I strongly recommend against using any
      -<code>&lt;blink&gt;</code> tags.</p>
      -
      -<p>I wish SmartyPants used named entities like
      -<code>&amp;mdash;</code> instead of decimal-encoded
      -entites like <code>&amp;#8212;</code>.</p>
      -
      - -

      To specify an entire block of pre-formatted code, indent every line of -the block by 4 spaces or 1 tab. Just like with code spans, &, <, -and > characters will be escaped automatically.

      - -

      Markdown:

      - -
      If you want your page to validate under XHTML 1.0 Strict,
      -you've got to put paragraph tags in your blockquotes:
      -
      -    <blockquote>
      -        <p>For example.</p>
      -    </blockquote>
      -
      - -

      Output:

      - -
      <p>If you want your page to validate under XHTML 1.0 Strict,
      -you've got to put paragraph tags in your blockquotes:</p>
      -
      -<pre><code>&lt;blockquote&gt;
      -    &lt;p&gt;For example.&lt;/p&gt;
      -&lt;/blockquote&gt;
      -</code></pre>
      -
      diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Markdown Documentation - Basics.text b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Markdown Documentation - Basics.text deleted file mode 100644 index 486055ca..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Markdown Documentation - Basics.text +++ /dev/null @@ -1,306 +0,0 @@ -Markdown: Basics -================ - - - - -Getting the Gist of Markdown's Formatting Syntax ------------------------------------------------- - -This page offers a brief overview of what it's like to use Markdown. -The [syntax page] [s] provides complete, detailed documentation for -every feature, but Markdown should be very easy to pick up simply by -looking at a few examples of it in action. The examples on this page -are written in a before/after style, showing example syntax and the -HTML output produced by Markdown. - -It's also helpful to simply try Markdown out; the [Dingus] [d] is a -web application that allows you type your own Markdown-formatted text -and translate it to XHTML. - -**Note:** This document is itself written using Markdown; you -can [see the source for it by adding '.text' to the URL] [src]. - - [s]: /projects/markdown/syntax "Markdown Syntax" - [d]: /projects/markdown/dingus "Markdown Dingus" - [src]: /projects/markdown/basics.text - - -## Paragraphs, Headers, Blockquotes ## - -A paragraph is simply one or more consecutive lines of text, separated -by one or more blank lines. (A blank line is any line that looks like a -blank line -- a line containing nothing spaces or tabs is considered -blank.) Normal paragraphs should not be intended with spaces or tabs. - -Markdown offers two styles of headers: *Setext* and *atx*. -Setext-style headers for `

      ` and `

      ` are created by -"underlining" with equal signs (`=`) and hyphens (`-`), respectively. -To create an atx-style header, you put 1-6 hash marks (`#`) at the -beginning of the line -- the number of hashes equals the resulting -HTML header level. - -Blockquotes are indicated using email-style '`>`' angle brackets. - -Markdown: - - A First Level Header - ==================== - - A Second Level Header - --------------------- - - Now is the time for all good men to come to - the aid of their country. This is just a - regular paragraph. - - The quick brown fox jumped over the lazy - dog's back. - - ### Header 3 - - > This is a blockquote. - > - > This is the second paragraph in the blockquote. - > - > ## This is an H2 in a blockquote - - -Output: - -

      A First Level Header

      - -

      A Second Level Header

      - -

      Now is the time for all good men to come to - the aid of their country. This is just a - regular paragraph.

      - -

      The quick brown fox jumped over the lazy - dog's back.

      - -

      Header 3

      - -
      -

      This is a blockquote.

      - -

      This is the second paragraph in the blockquote.

      - -

      This is an H2 in a blockquote

      -
      - - - -### Phrase Emphasis ### - -Markdown uses asterisks and underscores to indicate spans of emphasis. - -Markdown: - - Some of these words *are emphasized*. - Some of these words _are emphasized also_. - - Use two asterisks for **strong emphasis**. - Or, if you prefer, __use two underscores instead__. - -Output: - -

      Some of these words are emphasized. - Some of these words are emphasized also.

      - -

      Use two asterisks for strong emphasis. - Or, if you prefer, use two underscores instead.

      - - - -## Lists ## - -Unordered (bulleted) lists use asterisks, pluses, and hyphens (`*`, -`+`, and `-`) as list markers. These three markers are -interchangable; this: - - * Candy. - * Gum. - * Booze. - -this: - - + Candy. - + Gum. - + Booze. - -and this: - - - Candy. - - Gum. - - Booze. - -all produce the same output: - -
        -
      • Candy.
      • -
      • Gum.
      • -
      • Booze.
      • -
      - -Ordered (numbered) lists use regular numbers, followed by periods, as -list markers: - - 1. Red - 2. Green - 3. Blue - -Output: - -
        -
      1. Red
      2. -
      3. Green
      4. -
      5. Blue
      6. -
      - -If you put blank lines between items, you'll get `

      ` tags for the -list item text. You can create multi-paragraph list items by indenting -the paragraphs by 4 spaces or 1 tab: - - * A list item. - - With multiple paragraphs. - - * Another item in the list. - -Output: - -

        -
      • A list item.

        -

        With multiple paragraphs.

      • -
      • Another item in the list.

      • -
      - - - -### Links ### - -Markdown supports two styles for creating links: *inline* and -*reference*. With both styles, you use square brackets to delimit the -text you want to turn into a link. - -Inline-style links use parentheses immediately after the link text. -For example: - - This is an [example link](http://example.com/). - -Output: - -

      This is an - example link.

      - -Optionally, you may include a title attribute in the parentheses: - - This is an [example link](http://example.com/ "With a Title"). - -Output: - -

      This is an - example link.

      - -Reference-style links allow you to refer to your links by names, which -you define elsewhere in your document: - - I get 10 times more traffic from [Google][1] than from - [Yahoo][2] or [MSN][3]. - - [1]: http://google.com/ "Google" - [2]: http://search.yahoo.com/ "Yahoo Search" - [3]: http://search.msn.com/ "MSN Search" - -Output: - -

      I get 10 times more traffic from Google than from Yahoo or MSN.

      - -The title attribute is optional. Link names may contain letters, -numbers and spaces, but are *not* case sensitive: - - I start my morning with a cup of coffee and - [The New York Times][NY Times]. - - [ny times]: http://www.nytimes.com/ - -Output: - -

      I start my morning with a cup of coffee and - The New York Times.

      - - -### Images ### - -Image syntax is very much like link syntax. - -Inline (titles are optional): - - ![alt text](/path/to/img.jpg "Title") - -Reference-style: - - ![alt text][id] - - [id]: /path/to/img.jpg "Title" - -Both of the above examples produce the same output: - - alt text - - - -### Code ### - -In a regular paragraph, you can create code span by wrapping text in -backtick quotes. Any ampersands (`&`) and angle brackets (`<` or -`>`) will automatically be translated into HTML entities. This makes -it easy to use Markdown to write about HTML example code: - - I strongly recommend against using any `` tags. - - I wish SmartyPants used named entities like `—` - instead of decimal-encoded entites like `—`. - -Output: - -

      I strongly recommend against using any - <blink> tags.

      - -

      I wish SmartyPants used named entities like - &mdash; instead of decimal-encoded - entites like &#8212;.

      - - -To specify an entire block of pre-formatted code, indent every line of -the block by 4 spaces or 1 tab. Just like with code spans, `&`, `<`, -and `>` characters will be escaped automatically. - -Markdown: - - If you want your page to validate under XHTML 1.0 Strict, - you've got to put paragraph tags in your blockquotes: - -
      -

      For example.

      -
      - -Output: - -

      If you want your page to validate under XHTML 1.0 Strict, - you've got to put paragraph tags in your blockquotes:

      - -
      <blockquote>
      -        <p>For example.</p>
      -    </blockquote>
      -    
      diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Markdown Documentation - Syntax.html b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Markdown Documentation - Syntax.html deleted file mode 100644 index 889706af..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Markdown Documentation - Syntax.html +++ /dev/null @@ -1,840 +0,0 @@ - - - - -Markdown: Syntax - - -

      Markdown: Syntax

      - - - - - -

      Note: This document is itself written using Markdown; you can see the source for it by adding '.text' to the URL.

      - -
      - -

      Overview

      - -

      Philosophy

      - -

      Markdown is intended to be as easy-to-read and easy-to-write as is feasible.

      - -

      Readability, however, is emphasized above all else. A Markdown-formatted document should be publishable as-is, as plain text, without looking like it's been marked up with tags or formatting instructions. While Markdown's syntax has been influenced by several existing text-to-HTML filters -- including Setext, atx, Textile, reStructuredText, Grutatext, and EtText -- the single biggest source of inspiration for Markdown's syntax is the format of plain text email.

      - -

      To this end, Markdown's syntax is comprised entirely of punctuation characters, which punctuation characters have been carefully chosen so as to look like what they mean. E.g., asterisks around a word actually look like *emphasis*. Markdown lists look like, well, lists. Even blockquotes look like quoted passages of text, assuming you've ever used email.

      - -

      Inline HTML

      - -

      Markdown's syntax is intended for one purpose: to be used as a format for writing for the web.

      - -

      Markdown is not a replacement for HTML, or even close to it. Its syntax is very small, corresponding only to a very small subset of HTML tags. The idea is not to create a syntax that makes it easier to insert HTML tags. In my opinion, HTML tags are already easy to insert. The idea for Markdown is to make it easy to read, write, and edit prose. HTML is a publishing format; Markdown is a writing format. Thus, Markdown's formatting syntax only addresses issues that can be conveyed in plain text.

      - -

      For any markup that is not covered by Markdown's syntax, you simply use HTML itself. There's no need to preface it or delimit it to indicate that you're switching from Markdown to HTML; you just use the tags.

      - -

      The only restrictions are that block-level HTML elements -- e.g. <div>, <table>, <pre>, <p>, etc. -- must be separated from surrounding content by blank lines, and the start and end tags of the block should not be indented with tabs or spaces. Markdown is smart enough not to add extra (unwanted) <p> tags around HTML block-level tags.

      - -

      For example, to add an HTML table to a Markdown article:

      - -
      This is a regular paragraph.
      -
      -<table>
      -    <tr>
      -        <td>Foo</td>
      -    </tr>
      -</table>
      -
      -This is another regular paragraph.
      -
      - -

      Note that Markdown formatting syntax is not processed within block-level HTML tags. E.g., you can't use Markdown-style *emphasis* inside an HTML block.

      - -

      Span-level HTML tags -- e.g. <span>, <cite>, or <del> -- can be used anywhere in a Markdown paragraph, list item, or header. If you want, you can even use HTML tags instead of Markdown formatting; e.g. if you'd prefer to use HTML <a> or <img> tags instead of Markdown's link or image syntax, go right ahead.

      - -

      Unlike block-level HTML tags, Markdown syntax is processed within span-level tags.

      - -

      Automatic Escaping for Special Characters

      - -

      In HTML, there are two characters that demand special treatment: < and &. Left angle brackets are used to start tags; ampersands are used to denote HTML entities. If you want to use them as literal characters, you must escape them as entities, e.g. &lt;, and &amp;.

      - -

      Ampersands in particular are bedeviling for web writers. If you want to write about 'AT&T', you need to write 'AT&amp;T'. You even need to escape ampersands within URLs. Thus, if you want to link to:

      - -
      http://images.google.com/images?num=30&q=larry+bird
      -
      - -

      you need to encode the URL as:

      - -
      http://images.google.com/images?num=30&amp;q=larry+bird
      -
      - -

      in your anchor tag href attribute. Needless to say, this is easy to forget, and is probably the single most common source of HTML validation errors in otherwise well-marked-up web sites.

      - -

      Markdown allows you to use these characters naturally, taking care of all the necessary escaping for you. If you use an ampersand as part of an HTML entity, it remains unchanged; otherwise it will be translated into &amp;.

      - -

      So, if you want to include a copyright symbol in your article, you can write:

      - -
      &copy;
      -
      - -

      and Markdown will leave it alone. But if you write:

      - -
      AT&T
      -
      - -

      Markdown will translate it to:

      - -
      AT&amp;T
      -
      - -

      Similarly, because Markdown supports inline HTML, if you use angle brackets as delimiters for HTML tags, Markdown will treat them as such. But if you write:

      - -
      4 < 5
      -
      - -

      Markdown will translate it to:

      - -
      4 &lt; 5
      -
      - -

      However, inside Markdown code spans and blocks, angle brackets and ampersands are always encoded automatically. This makes it easy to use Markdown to write about HTML code. (As opposed to raw HTML, which is a terrible format for writing about HTML syntax, because every single < and & in your example code needs to be escaped.)

      - -
      - -

      Block Elements

      - -

      Paragraphs and Line Breaks

      - -

      A paragraph is simply one or more consecutive lines of text, separated by one or more blank lines. (A blank line is any line that looks like a blank line -- a line containing nothing but spaces or tabs is considered blank.) Normal paragraphs should not be intended with spaces or tabs.

      - -

      The implication of the "one or more consecutive lines of text" rule is that Markdown supports "hard-wrapped" text paragraphs. This differs significantly from most other text-to-HTML formatters (including Movable Type's "Convert Line Breaks" option) which translate every line break character in a paragraph into a <br /> tag.

      - -

      When you do want to insert a <br /> break tag using Markdown, you end a line with two or more spaces, then type return.

      - -

      Yes, this takes a tad more effort to create a <br />, but a simplistic "every line break is a <br />" rule wouldn't work for Markdown. Markdown's email-style blockquoting and multi-paragraph list items work best -- and look better -- when you format them with hard breaks.

      - - - -

      Markdown supports two styles of headers, Setext and atx.

      - -

      Setext-style headers are "underlined" using equal signs (for first-level headers) and dashes (for second-level headers). For example:

      - -
      This is an H1
      -=============
      -
      -This is an H2
      --------------
      -
      - -

      Any number of underlining ='s or -'s will work.

      - -

      Atx-style headers use 1-6 hash characters at the start of the line, corresponding to header levels 1-6. For example:

      - -
      # This is an H1
      -
      -## This is an H2
      -
      -###### This is an H6
      -
      - -

      Optionally, you may "close" atx-style headers. This is purely cosmetic -- you can use this if you think it looks better. The closing hashes don't even need to match the number of hashes used to open the header. (The number of opening hashes determines the header level.) :

      - -
      # This is an H1 #
      -
      -## This is an H2 ##
      -
      -### This is an H3 ######
      -
      -
      - -

      Blockquotes

      - -

      Markdown uses email-style > characters for blockquoting. If you're familiar with quoting passages of text in an email message, then you know how to create a blockquote in Markdown. It looks best if you hard wrap the text and put a > before every line:

      - -
      > This is a blockquote with two paragraphs. 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.
      -
      - -

      Markdown allows you to be lazy and only put the > before the first line of a hard-wrapped paragraph:

      - -
      > This is a blockquote with two paragraphs. 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.
      -
      - -

      Blockquotes can be nested (i.e. a blockquote-in-a-blockquote) by adding additional levels of >:

      - -
      > This is the first level of quoting.
      ->
      -> > This is nested blockquote.
      ->
      -> Back to the first level.
      -
      - -

      Blockquotes can contain other Markdown elements, including headers, lists, and code blocks:

      - -
      > ## This is a header.
      -> 
      -> 1.   This is the first list item.
      -> 2.   This is the second list item.
      -> 
      -> Here's some example code:
      -> 
      ->     return shell_exec("echo $input | $markdown_script");
      -
      - -

      Any decent text editor should make email-style quoting easy. For example, with BBEdit, you can make a selection and choose Increase Quote Level from the Text menu.

      - -

      Lists

      - -

      Markdown supports ordered (numbered) and unordered (bulleted) lists.

      - -

      Unordered lists use asterisks, pluses, and hyphens -- interchangably -- as list markers:

      - -
      *   Red
      -*   Green
      -*   Blue
      -
      - -

      is equivalent to:

      - -
      +   Red
      -+   Green
      -+   Blue
      -
      - -

      and:

      - -
      -   Red
      --   Green
      --   Blue
      -
      - -

      Ordered lists use numbers followed by periods:

      - -
      1.  Bird
      -2.  McHale
      -3.  Parish
      -
      - -

      It's important to note that the actual numbers you use to mark the list have no effect on the HTML output Markdown produces. The HTML Markdown produces from the above list is:

      - -
      <ol>
      -<li>Bird</li>
      -<li>McHale</li>
      -<li>Parish</li>
      -</ol>
      -
      - -

      If you instead wrote the list in Markdown like this:

      - -
      1.  Bird
      -1.  McHale
      -1.  Parish
      -
      - -

      or even:

      - -
      3. Bird
      -1. McHale
      -8. Parish
      -
      - -

      you'd get the exact same HTML output. The point is, if you want to, you can use ordinal numbers in your ordered Markdown lists, so that the numbers in your source match the numbers in your published HTML. But if you want to be lazy, you don't have to.

      - -

      If you do use lazy list numbering, however, you should still start the list with the number 1. At some point in the future, Markdown may support starting ordered lists at an arbitrary number.

      - -

      List markers typically start at the left margin, but may be indented by up to three spaces. List markers must be followed by one or more spaces or a tab.

      - -

      To make lists look nice, you can wrap items with hanging indents:

      - -
      *   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.
      -
      - -

      But if you want to be lazy, you don't have to:

      - -
      *   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.
      -
      - -

      If list items are separated by blank lines, Markdown will wrap the items in <p> tags in the HTML output. For example, this input:

      - -
      *   Bird
      -*   Magic
      -
      - -

      will turn into:

      - -
      <ul>
      -<li>Bird</li>
      -<li>Magic</li>
      -</ul>
      -
      - -

      But this:

      - -
      *   Bird
      -
      -*   Magic
      -
      - -

      will turn into:

      - -
      <ul>
      -<li><p>Bird</p></li>
      -<li><p>Magic</p></li>
      -</ul>
      -
      - -

      List items may consist of multiple paragraphs. Each subsequent paragraph in a list item must be intended by either 4 spaces or one tab:

      - -
      1.  This is a list item with two paragraphs. 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.
      -
      -2.  Suspendisse id sem consectetuer libero luctus adipiscing.
      -
      - -

      It looks nice if you indent every line of the subsequent paragraphs, but here again, Markdown will allow you to be lazy:

      - -
      *   This is a list item with two paragraphs.
      -
      -    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.
      -
      -*   Another item in the same list.
      -
      - -

      To put a blockquote within a list item, the blockquote's > delimiters need to be indented:

      - -
      *   A list item with a blockquote:
      -
      -    > This is a blockquote
      -    > inside a list item.
      -
      - -

      To put a code block within a list item, the code block needs to be indented twice -- 8 spaces or two tabs:

      - -
      *   A list item with a code block:
      -
      -        <code goes here>
      -
      -
      - -

      It's worth noting that it's possible to trigger an ordered list by accident, by writing something like this:

      - -
      1986. What a great season.
      -
      - -

      In other words, a number-period-space sequence at the beginning of a line. To avoid this, you can backslash-escape the period:

      - -
      1986\. What a great season.
      -
      -
      -
      - -

      Code Blocks

      - -

      Pre-formatted code blocks are used for writing about programming or markup source code. Rather than forming normal paragraphs, the lines of a code block are interpreted literally. Markdown wraps a code block in both <pre> and <code> tags.

      - -

      To produce a code block in Markdown, simply indent every line of the block by at least 4 spaces or 1 tab. For example, given this input:

      - -
      This is a normal paragraph:
      -
      -    This is a code block.
      -
      - -

      Markdown will generate:

      - -
      <p>This is a normal paragraph:</p>
      -
      -<pre><code>This is a code block.
      -</code></pre>
      -
      - -

      One level of indentation -- 4 spaces or 1 tab -- is removed from each line of the code block. For example, this:

      - -
      Here is an example of AppleScript:
      -
      -    tell application "Foo"
      -        beep
      -    end tell
      -
      - -

      will turn into:

      - -
      <p>Here is an example of AppleScript:</p>
      -
      -<pre><code>tell application "Foo"
      -    beep
      -end tell
      -</code></pre>
      -
      - -

      A code block continues until it reaches a line that is not indented (or the end of the article).

      - -

      Within a code block, ampersands (&) and angle brackets (< and >) are automatically converted into HTML entities. This makes it very easy to include example HTML source code using Markdown -- just paste it and indent it, and Markdown will handle the hassle of encoding the ampersands and angle brackets. For example, this:

      - -
          <div class="footer">
      -        &copy; 2004 Foo Corporation
      -    </div>
      -
      - -

      will turn into:

      - -
      <pre><code>&lt;div class="footer"&gt;
      -    &amp;copy; 2004 Foo Corporation
      -&lt;/div&gt;
      -</code></pre>
      -
      - -

      Regular Markdown syntax is not processed within code blocks. E.g., asterisks are just literal asterisks within a code block. This means it's also easy to use Markdown to write about Markdown's own syntax.

      - -

      Horizontal Rules

      - -

      You can produce a horizontal rule tag (<hr />) by placing three or more hyphens, asterisks, or underscores on a line by themselves. If you wish, you may use spaces between the hyphens or asterisks. Each of the following lines will produce a horizontal rule:

      - -
      * * *
      -
      -***
      -
      -*****
      -
      -- - -
      -
      ----------------------------------------
      -
      -_ _ _
      -
      -
      - -
      - -

      Span Elements

      - - - -

      Markdown supports two style of links: inline and reference.

      - -

      In both styles, the link text is delimited by square brackets.

      - -

      To create an inline link, use a set of regular parentheses immediately after the link text's closing square bracket. Inside the parentheses, put the URL where you want the link to point, along with an optional title for the link, surrounded in quotes. For example:

      - -
      This is [an example](http://example.com/ "Title") inline link.
      -
      -[This link](http://example.net/) has no title attribute.
      -
      - -

      Will produce:

      - -
      <p>This is <a href="http://example.com/" title="Title">
      -an example</a> inline link.</p>
      -
      -<p><a href="http://example.net/">This link</a> has no
      -title attribute.</p>
      -
      - -

      If you're referring to a local resource on the same server, you can use relative paths:

      - -
      See my [About](/about/) page for details.   
      -
      - -

      Reference-style links use a second set of square brackets, inside which you place a label of your choosing to identify the link:

      - -
      This is [an example][id] reference-style link.
      -
      - -

      You can optionally use a space to separate the sets of brackets:

      - -
      This is [an example] [id] reference-style link.
      -
      - -

      Then, anywhere in the document, you define your link label like this, on a line by itself:

      - -
      [id]: http://example.com/  "Optional Title Here"
      -
      - -

      That is:

      - -
        -
      • Square brackets containing the link identifier (optionally indented from the left margin using up to three spaces);
      • - -
      • followed by a colon;
      • - -
      • followed by one or more spaces (or tabs);
      • - -
      • followed by the URL for the link;
      • - -
      • optionally followed by a title attribute for the link, enclosed in double or single quotes.
      • -
      - -

      The link URL may, optionally, be surrounded by angle brackets:

      - -
      [id]: <http://example.com/>  "Optional Title Here"
      -
      - -

      You can put the title attribute on the next line and use extra spaces or tabs for padding, which tends to look better with longer URLs:

      - -
      [id]: http://example.com/longish/path/to/resource/here
      -    "Optional Title Here"
      -
      - -

      Link definitions are only used for creating links during Markdown processing, and are stripped from your document in the HTML output.

      - -

      Link definition names may constist of letters, numbers, spaces, and punctuation -- but they are not case sensitive. E.g. these two links:

      - -
      [link text][a]
      -[link text][A]
      -
      - -

      are equivalent.

      - -

      The implicit link name shortcut allows you to omit the name of the link, in which case the link text itself is used as the name. Just use an empty set of square brackets -- e.g., to link the word "Google" to the google.com web site, you could simply write:

      - -
      [Google][]
      -
      - -

      And then define the link:

      - -
      [Google]: http://google.com/
      -
      - -

      Because link names may contain spaces, this shortcut even works for multiple words in the link text:

      - -
      Visit [Daring Fireball][] for more information.
      -
      - -

      And then define the link:

      - -
      [Daring Fireball]: http://daringfireball.net/
      -
      - -

      Link definitions can be placed anywhere in your Markdown document. I tend to put them immediately after each paragraph in which they're used, but if you want, you can put them all at the end of your document, sort of like footnotes.

      - -

      Here's an example of reference links in action:

      - -
      I get 10 times more traffic from [Google] [1] than from
      -[Yahoo] [2] or [MSN] [3].
      -
      -  [1]: http://google.com/        "Google"
      -  [2]: http://search.yahoo.com/  "Yahoo Search"
      -  [3]: http://search.msn.com/    "MSN Search"
      -
      - -

      Using the implicit link name shortcut, you could instead write:

      - -
      I get 10 times more traffic from [Google][] than from
      -[Yahoo][] or [MSN][].
      -
      -  [google]: http://google.com/        "Google"
      -  [yahoo]:  http://search.yahoo.com/  "Yahoo Search"
      -  [msn]:    http://search.msn.com/    "MSN Search"
      -
      - -

      Both of the above examples will produce the following HTML output:

      - -
      <p>I get 10 times more traffic from <a href="http://google.com/"
      -title="Google">Google</a> than from
      -<a href="http://search.yahoo.com/" title="Yahoo Search">Yahoo</a>
      -or <a href="http://search.msn.com/" title="MSN Search">MSN</a>.</p>
      -
      - -

      For comparison, here is the same paragraph written using Markdown's inline link style:

      - -
      I get 10 times more traffic from [Google](http://google.com/ "Google")
      -than from [Yahoo](http://search.yahoo.com/ "Yahoo Search") or
      -[MSN](http://search.msn.com/ "MSN Search").
      -
      - -

      The point of reference-style links is not that they're easier to write. The point is that with reference-style links, your document source is vastly more readable. Compare the above examples: using reference-style links, the paragraph itself is only 81 characters long; with inline-style links, it's 176 characters; and as raw HTML, it's 234 characters. In the raw HTML, there's more markup than there is text.

      - -

      With Markdown's reference-style links, a source document much more closely resembles the final output, as rendered in a browser. By allowing you to move the markup-related metadata out of the paragraph, you can add links without interrupting the narrative flow of your prose.

      - -

      Emphasis

      - -

      Markdown treats asterisks (*) and underscores (_) as indicators of emphasis. Text wrapped with one * or _ will be wrapped with an HTML <em> tag; double *'s or _'s will be wrapped with an HTML <strong> tag. E.g., this input:

      - -
      *single asterisks*
      -
      -_single underscores_
      -
      -**double asterisks**
      -
      -__double underscores__
      -
      - -

      will produce:

      - -
      <em>single asterisks</em>
      -
      -<em>single underscores</em>
      -
      -<strong>double asterisks</strong>
      -
      -<strong>double underscores</strong>
      -
      - -

      You can use whichever style you prefer; the lone restriction is that the same character must be used to open and close an emphasis span.

      - -

      Emphasis can be used in the middle of a word:

      - -
      un*fucking*believable
      -
      - -

      But if you surround an * or _ with spaces, it'll be treated as a literal asterisk or underscore.

      - -

      To produce a literal asterisk or underscore at a position where it would otherwise be used as an emphasis delimiter, you can backslash escape it:

      - -
      \*this text is surrounded by literal asterisks\*
      -
      -
      -
      - -

      Code

      - -

      To indicate a span of code, wrap it with backtick quotes (`). Unlike a pre-formatted code block, a code span indicates code within a normal paragraph. For example:

      - -
      Use the `printf()` function.
      -
      - -

      will produce:

      - -
      <p>Use the <code>printf()</code> function.</p>
      -
      - -

      To include a literal backtick character within a code span, you can use multiple backticks as the opening and closing delimiters:

      - -
      ``There is a literal backtick (`) here.``
      -
      - -

      which will produce this:

      - -
      <p><code>There is a literal backtick (`) here.</code></p>
      -
      - -

      The backtick delimiters surrounding a code span may include spaces -- one after the opening, one before the closing. This allows you to place literal backtick characters at the beginning or end of a code span:

      - -
      A single backtick in a code span: `` ` ``
      -
      -A backtick-delimited string in a code span: `` `foo` ``
      -
      - -

      will produce:

      - -
      <p>A single backtick in a code span: <code>`</code></p>
      -
      -<p>A backtick-delimited string in a code span: <code>`foo`</code></p>
      -
      - -

      With a code span, ampersands and angle brackets are encoded as HTML entities automatically, which makes it easy to include example HTML tags. Markdown will turn this:

      - -
      Please don't use any `<blink>` tags.
      -
      - -

      into:

      - -
      <p>Please don't use any <code>&lt;blink&gt;</code> tags.</p>
      -
      - -

      You can write this:

      - -
      `&#8212;` is the decimal-encoded equivalent of `&mdash;`.
      -
      - -

      to produce:

      - -
      <p><code>&amp;#8212;</code> is the decimal-encoded
      -equivalent of <code>&amp;mdash;</code>.</p>
      -
      -
      -
      - -

      Images

      - -

      Admittedly, it's fairly difficult to devise a "natural" syntax for placing images into a plain text document format.

      - -

      Markdown uses an image syntax that is intended to resemble the syntax for links, allowing for two styles: inline and reference.

      - -

      Inline image syntax looks like this:

      - -
      ![Alt text](/path/to/img.jpg)
      -
      -![Alt text](/path/to/img.jpg "Optional title")
      -
      - -

      That is:

      - -
        -
      • An exclamation mark: !;
      • - -
      • followed by a set of square brackets, containing the alt attribute text for the image;
      • - -
      • followed by a set of parentheses, containing the URL or path to the image, and an optional title attribute enclosed in double or single quotes.
      • -
      - -

      Reference-style image syntax looks like this:

      - -
      ![Alt text][id]
      -
      - -

      Where "id" is the name of a defined image reference. Image references are defined using syntax identical to link references:

      - -
      [id]: url/to/image  "Optional title attribute"
      -
      - -

      As of this writing, Markdown has no syntax for specifying the dimensions of an image; if this is important to you, you can simply use regular HTML <img> tags.

      - -
      - -

      Miscellaneous

      - - - -

      Markdown supports a shortcut style for creating "automatic" links for URLs and email addresses: simply surround the URL or email address with angle brackets. What this means is that if you want to show the actual text of a URL or email address, and also have it be a clickable link, you can do this:

      - -
      <http://example.com/>
      - -

      Markdown will turn this into:

      - -
      <a href="http://example.com/">http://example.com/</a>
      -
      - -

      Automatic links for email addresses work similarly, except that Markdown will also perform a bit of randomized decimal and hex entity-encoding to help obscure your address from address-harvesting spambots. For example, Markdown will turn this:

      - -
      <address@example.com>
      -
      - -

      into something like this:

      - -
      <a href="&#x6D;&#x61;i&#x6C;&#x74;&#x6F;:&#x61;&#x64;&#x64;&#x72;&#x65;
      -&#115;&#115;&#64;&#101;&#120;&#x61;&#109;&#x70;&#x6C;e&#x2E;&#99;&#111;
      -&#109;">&#x61;&#x64;&#x64;&#x72;&#x65;&#115;&#115;&#64;&#101;&#120;&#x61;
      -&#109;&#x70;&#x6C;e&#x2E;&#99;&#111;&#109;</a>
      -
      - -

      which will render in a browser as a clickable link to "address@example.com".

      - -

      (This sort of entity-encoding trick will indeed fool many, if not most, address-harvesting bots, but it definitely won't fool all of them. It's better than nothing, but an address published in this way will probably eventually start receiving spam.)

      - -

      Backslash Escapes

      - -

      Markdown allows you to use backslash escapes to generate literal characters which would otherwise have special meaning in Markdown's formatting syntax. For example, if you wanted to surround a word with literal asterisks (instead of an HTML <em> tag), you can backslashes before the asterisks, like this:

      - -
      \*literal asterisks\*
      -
      - -

      Markdown provides backslash escapes for the following characters:

      - -
      \   backslash
      -`   backtick
      -*   asterisk
      -_   underscore
      -{}  curly braces
      -[]  square brackets
      -()  parentheses
      -#   hash mark
      -+	plus sign
      --	minus sign (hyphen)
      -.   dot
      -!   exclamation mark
      - -
      -
      - -
        -
      - -
      -
      -Created by Maruku at 23:15 on Friday, January 05th, 2007.
      - diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Markdown Documentation - Syntax.html.dist b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Markdown Documentation - Syntax.html.dist deleted file mode 100644 index 5c01306c..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Markdown Documentation - Syntax.html.dist +++ /dev/null @@ -1,942 +0,0 @@ -

      Markdown: Syntax

      - - - - - -

      Note: This document is itself written using Markdown; you -can see the source for it by adding '.text' to the URL.

      - -
      - -

      Overview

      - -

      Philosophy

      - -

      Markdown is intended to be as easy-to-read and easy-to-write as is feasible.

      - -

      Readability, however, is emphasized above all else. A Markdown-formatted -document should be publishable as-is, as plain text, without looking -like it's been marked up with tags or formatting instructions. While -Markdown's syntax has been influenced by several existing text-to-HTML -filters -- including Setext, atx, Textile, reStructuredText, -Grutatext, and EtText -- the single biggest source of -inspiration for Markdown's syntax is the format of plain text email.

      - -

      To this end, Markdown's syntax is comprised entirely of punctuation -characters, which punctuation characters have been carefully chosen so -as to look like what they mean. E.g., asterisks around a word actually -look like *emphasis*. Markdown lists look like, well, lists. Even -blockquotes look like quoted passages of text, assuming you've ever -used email.

      - -

      Inline HTML

      - -

      Markdown's syntax is intended for one purpose: to be used as a -format for writing for the web.

      - -

      Markdown is not a replacement for HTML, or even close to it. Its -syntax is very small, corresponding only to a very small subset of -HTML tags. The idea is not to create a syntax that makes it easier -to insert HTML tags. In my opinion, HTML tags are already easy to -insert. The idea for Markdown is to make it easy to read, write, and -edit prose. HTML is a publishing format; Markdown is a writing -format. Thus, Markdown's formatting syntax only addresses issues that -can be conveyed in plain text.

      - -

      For any markup that is not covered by Markdown's syntax, you simply -use HTML itself. There's no need to preface it or delimit it to -indicate that you're switching from Markdown to HTML; you just use -the tags.

      - -

      The only restrictions are that block-level HTML elements -- e.g. <div>, -<table>, <pre>, <p>, etc. -- must be separated from surrounding -content by blank lines, and the start and end tags of the block should -not be indented with tabs or spaces. Markdown is smart enough not -to add extra (unwanted) <p> tags around HTML block-level tags.

      - -

      For example, to add an HTML table to a Markdown article:

      - -
      This is a regular paragraph.
      -
      -<table>
      -    <tr>
      -        <td>Foo</td>
      -    </tr>
      -</table>
      -
      -This is another regular paragraph.
      -
      - -

      Note that Markdown formatting syntax is not processed within block-level -HTML tags. E.g., you can't use Markdown-style *emphasis* inside an -HTML block.

      - -

      Span-level HTML tags -- e.g. <span>, <cite>, or <del> -- can be -used anywhere in a Markdown paragraph, list item, or header. If you -want, you can even use HTML tags instead of Markdown formatting; e.g. if -you'd prefer to use HTML <a> or <img> tags instead of Markdown's -link or image syntax, go right ahead.

      - -

      Unlike block-level HTML tags, Markdown syntax is processed within -span-level tags.

      - -

      Automatic Escaping for Special Characters

      - -

      In HTML, there are two characters that demand special treatment: < -and &. Left angle brackets are used to start tags; ampersands are -used to denote HTML entities. If you want to use them as literal -characters, you must escape them as entities, e.g. &lt;, and -&amp;.

      - -

      Ampersands in particular are bedeviling for web writers. If you want to -write about 'AT&T', you need to write 'AT&amp;T'. You even need to -escape ampersands within URLs. Thus, if you want to link to:

      - -
      http://images.google.com/images?num=30&q=larry+bird
      -
      - -

      you need to encode the URL as:

      - -
      http://images.google.com/images?num=30&amp;q=larry+bird
      -
      - -

      in your anchor tag href attribute. Needless to say, this is easy to -forget, and is probably the single most common source of HTML validation -errors in otherwise well-marked-up web sites.

      - -

      Markdown allows you to use these characters naturally, taking care of -all the necessary escaping for you. If you use an ampersand as part of -an HTML entity, it remains unchanged; otherwise it will be translated -into &amp;.

      - -

      So, if you want to include a copyright symbol in your article, you can write:

      - -
      &copy;
      -
      - -

      and Markdown will leave it alone. But if you write:

      - -
      AT&T
      -
      - -

      Markdown will translate it to:

      - -
      AT&amp;T
      -
      - -

      Similarly, because Markdown supports inline HTML, if you use -angle brackets as delimiters for HTML tags, Markdown will treat them as -such. But if you write:

      - -
      4 < 5
      -
      - -

      Markdown will translate it to:

      - -
      4 &lt; 5
      -
      - -

      However, inside Markdown code spans and blocks, angle brackets and -ampersands are always encoded automatically. This makes it easy to use -Markdown to write about HTML code. (As opposed to raw HTML, which is a -terrible format for writing about HTML syntax, because every single < -and & in your example code needs to be escaped.)

      - -
      - -

      Block Elements

      - -

      Paragraphs and Line Breaks

      - -

      A paragraph is simply one or more consecutive lines of text, separated -by one or more blank lines. (A blank line is any line that looks like a -blank line -- a line containing nothing but spaces or tabs is considered -blank.) Normal paragraphs should not be intended with spaces or tabs.

      - -

      The implication of the "one or more consecutive lines of text" rule is -that Markdown supports "hard-wrapped" text paragraphs. This differs -significantly from most other text-to-HTML formatters (including Movable -Type's "Convert Line Breaks" option) which translate every line break -character in a paragraph into a <br /> tag.

      - -

      When you do want to insert a <br /> break tag using Markdown, you -end a line with two or more spaces, then type return.

      - -

      Yes, this takes a tad more effort to create a <br />, but a simplistic -"every line break is a <br />" rule wouldn't work for Markdown. -Markdown's email-style blockquoting and multi-paragraph list items -work best -- and look better -- when you format them with hard breaks.

      - - - -

      Markdown supports two styles of headers, Setext and atx.

      - -

      Setext-style headers are "underlined" using equal signs (for first-level -headers) and dashes (for second-level headers). For example:

      - -
      This is an H1
      -=============
      -
      -This is an H2
      --------------
      -
      - -

      Any number of underlining ='s or -'s will work.

      - -

      Atx-style headers use 1-6 hash characters at the start of the line, -corresponding to header levels 1-6. For example:

      - -
      # This is an H1
      -
      -## This is an H2
      -
      -###### This is an H6
      -
      - -

      Optionally, you may "close" atx-style headers. This is purely -cosmetic -- you can use this if you think it looks better. The -closing hashes don't even need to match the number of hashes -used to open the header. (The number of opening hashes -determines the header level.) :

      - -
      # This is an H1 #
      -
      -## This is an H2 ##
      -
      -### This is an H3 ######
      -
      - -

      Blockquotes

      - -

      Markdown uses email-style > characters for blockquoting. If you're -familiar with quoting passages of text in an email message, then you -know how to create a blockquote in Markdown. It looks best if you hard -wrap the text and put a > before every line:

      - -
      > This is a blockquote with two paragraphs. 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.
      -
      - -

      Markdown allows you to be lazy and only put the > before the first -line of a hard-wrapped paragraph:

      - -
      > This is a blockquote with two paragraphs. 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.
      -
      - -

      Blockquotes can be nested (i.e. a blockquote-in-a-blockquote) by -adding additional levels of >:

      - -
      > This is the first level of quoting.
      ->
      -> > This is nested blockquote.
      ->
      -> Back to the first level.
      -
      - -

      Blockquotes can contain other Markdown elements, including headers, lists, -and code blocks:

      - -
      > ## This is a header.
      -> 
      -> 1.   This is the first list item.
      -> 2.   This is the second list item.
      -> 
      -> Here's some example code:
      -> 
      ->     return shell_exec("echo $input | $markdown_script");
      -
      - -

      Any decent text editor should make email-style quoting easy. For -example, with BBEdit, you can make a selection and choose Increase -Quote Level from the Text menu.

      - -

      Lists

      - -

      Markdown supports ordered (numbered) and unordered (bulleted) lists.

      - -

      Unordered lists use asterisks, pluses, and hyphens -- interchangably --- as list markers:

      - -
      *   Red
      -*   Green
      -*   Blue
      -
      - -

      is equivalent to:

      - -
      +   Red
      -+   Green
      -+   Blue
      -
      - -

      and:

      - -
      -   Red
      --   Green
      --   Blue
      -
      - -

      Ordered lists use numbers followed by periods:

      - -
      1.  Bird
      -2.  McHale
      -3.  Parish
      -
      - -

      It's important to note that the actual numbers you use to mark the -list have no effect on the HTML output Markdown produces. The HTML -Markdown produces from the above list is:

      - -
      <ol>
      -<li>Bird</li>
      -<li>McHale</li>
      -<li>Parish</li>
      -</ol>
      -
      - -

      If you instead wrote the list in Markdown like this:

      - -
      1.  Bird
      -1.  McHale
      -1.  Parish
      -
      - -

      or even:

      - -
      3. Bird
      -1. McHale
      -8. Parish
      -
      - -

      you'd get the exact same HTML output. The point is, if you want to, -you can use ordinal numbers in your ordered Markdown lists, so that -the numbers in your source match the numbers in your published HTML. -But if you want to be lazy, you don't have to.

      - -

      If you do use lazy list numbering, however, you should still start the -list with the number 1. At some point in the future, Markdown may support -starting ordered lists at an arbitrary number.

      - -

      List markers typically start at the left margin, but may be indented by -up to three spaces. List markers must be followed by one or more spaces -or a tab.

      - -

      To make lists look nice, you can wrap items with hanging indents:

      - -
      *   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.
      -
      - -

      But if you want to be lazy, you don't have to:

      - -
      *   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.
      -
      - -

      If list items are separated by blank lines, Markdown will wrap the -items in <p> tags in the HTML output. For example, this input:

      - -
      *   Bird
      -*   Magic
      -
      - -

      will turn into:

      - -
      <ul>
      -<li>Bird</li>
      -<li>Magic</li>
      -</ul>
      -
      - -

      But this:

      - -
      *   Bird
      -
      -*   Magic
      -
      - -

      will turn into:

      - -
      <ul>
      -<li><p>Bird</p></li>
      -<li><p>Magic</p></li>
      -</ul>
      -
      - -

      List items may consist of multiple paragraphs. Each subsequent -paragraph in a list item must be intended by either 4 spaces -or one tab:

      - -
      1.  This is a list item with two paragraphs. 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.
      -
      -2.  Suspendisse id sem consectetuer libero luctus adipiscing.
      -
      - -

      It looks nice if you indent every line of the subsequent -paragraphs, but here again, Markdown will allow you to be -lazy:

      - -
      *   This is a list item with two paragraphs.
      -
      -    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.
      -
      -*   Another item in the same list.
      -
      - -

      To put a blockquote within a list item, the blockquote's > -delimiters need to be indented:

      - -
      *   A list item with a blockquote:
      -
      -    > This is a blockquote
      -    > inside a list item.
      -
      - -

      To put a code block within a list item, the code block needs -to be indented twice -- 8 spaces or two tabs:

      - -
      *   A list item with a code block:
      -
      -        <code goes here>
      -
      - -

      It's worth noting that it's possible to trigger an ordered list by -accident, by writing something like this:

      - -
      1986. What a great season.
      -
      - -

      In other words, a number-period-space sequence at the beginning of a -line. To avoid this, you can backslash-escape the period:

      - -
      1986\. What a great season.
      -
      - -

      Code Blocks

      - -

      Pre-formatted code blocks are used for writing about programming or -markup source code. Rather than forming normal paragraphs, the lines -of a code block are interpreted literally. Markdown wraps a code block -in both <pre> and <code> tags.

      - -

      To produce a code block in Markdown, simply indent every line of the -block by at least 4 spaces or 1 tab. For example, given this input:

      - -
      This is a normal paragraph:
      -
      -    This is a code block.
      -
      - -

      Markdown will generate:

      - -
      <p>This is a normal paragraph:</p>
      -
      -<pre><code>This is a code block.
      -</code></pre>
      -
      - -

      One level of indentation -- 4 spaces or 1 tab -- is removed from each -line of the code block. For example, this:

      - -
      Here is an example of AppleScript:
      -
      -    tell application "Foo"
      -        beep
      -    end tell
      -
      - -

      will turn into:

      - -
      <p>Here is an example of AppleScript:</p>
      -
      -<pre><code>tell application "Foo"
      -    beep
      -end tell
      -</code></pre>
      -
      - -

      A code block continues until it reaches a line that is not indented -(or the end of the article).

      - -

      Within a code block, ampersands (&) and angle brackets (< and >) -are automatically converted into HTML entities. This makes it very -easy to include example HTML source code using Markdown -- just paste -it and indent it, and Markdown will handle the hassle of encoding the -ampersands and angle brackets. For example, this:

      - -
          <div class="footer">
      -        &copy; 2004 Foo Corporation
      -    </div>
      -
      - -

      will turn into:

      - -
      <pre><code>&lt;div class="footer"&gt;
      -    &amp;copy; 2004 Foo Corporation
      -&lt;/div&gt;
      -</code></pre>
      -
      - -

      Regular Markdown syntax is not processed within code blocks. E.g., -asterisks are just literal asterisks within a code block. This means -it's also easy to use Markdown to write about Markdown's own syntax.

      - -

      Horizontal Rules

      - -

      You can produce a horizontal rule tag (<hr />) by placing three or -more hyphens, asterisks, or underscores on a line by themselves. If you -wish, you may use spaces between the hyphens or asterisks. Each of the -following lines will produce a horizontal rule:

      - -
      * * *
      -
      -***
      -
      -*****
      -
      -- - -
      -
      ----------------------------------------
      -
      -_ _ _
      -
      - -
      - -

      Span Elements

      - - - -

      Markdown supports two style of links: inline and reference.

      - -

      In both styles, the link text is delimited by [square brackets].

      - -

      To create an inline link, use a set of regular parentheses immediately -after the link text's closing square bracket. Inside the parentheses, -put the URL where you want the link to point, along with an optional -title for the link, surrounded in quotes. For example:

      - -
      This is [an example](http://example.com/ "Title") inline link.
      -
      -[This link](http://example.net/) has no title attribute.
      -
      - -

      Will produce:

      - -
      <p>This is <a href="http://example.com/" title="Title">
      -an example</a> inline link.</p>
      -
      -<p><a href="http://example.net/">This link</a> has no
      -title attribute.</p>
      -
      - -

      If you're referring to a local resource on the same server, you can -use relative paths:

      - -
      See my [About](/about/) page for details.
      -
      - -

      Reference-style links use a second set of square brackets, inside -which you place a label of your choosing to identify the link:

      - -
      This is [an example][id] reference-style link.
      -
      - -

      You can optionally use a space to separate the sets of brackets:

      - -
      This is [an example] [id] reference-style link.
      -
      - -

      Then, anywhere in the document, you define your link label like this, -on a line by itself:

      - -
      [id]: http://example.com/  "Optional Title Here"
      -
      - -

      That is:

      - -
        -
      • Square brackets containing the link identifier (optionally -indented from the left margin using up to three spaces);
      • -
      • followed by a colon;
      • -
      • followed by one or more spaces (or tabs);
      • -
      • followed by the URL for the link;
      • -
      • optionally followed by a title attribute for the link, enclosed -in double or single quotes.
      • -
      - -

      The link URL may, optionally, be surrounded by angle brackets:

      - -
      [id]: <http://example.com/>  "Optional Title Here"
      -
      - -

      You can put the title attribute on the next line and use extra spaces -or tabs for padding, which tends to look better with longer URLs:

      - -
      [id]: http://example.com/longish/path/to/resource/here
      -    "Optional Title Here"
      -
      - -

      Link definitions are only used for creating links during Markdown -processing, and are stripped from your document in the HTML output.

      - -

      Link definition names may constist of letters, numbers, spaces, and punctuation -- but they are not case sensitive. E.g. these two links:

      - -
      [link text][a]
      -[link text][A]
      -
      - -

      are equivalent.

      - -

      The implicit link name shortcut allows you to omit the name of the -link, in which case the link text itself is used as the name. -Just use an empty set of square brackets -- e.g., to link the word -"Google" to the google.com web site, you could simply write:

      - -
      [Google][]
      -
      - -

      And then define the link:

      - -
      [Google]: http://google.com/
      -
      - -

      Because link names may contain spaces, this shortcut even works for -multiple words in the link text:

      - -
      Visit [Daring Fireball][] for more information.
      -
      - -

      And then define the link:

      - -
      [Daring Fireball]: http://daringfireball.net/
      -
      - -

      Link definitions can be placed anywhere in your Markdown document. I -tend to put them immediately after each paragraph in which they're -used, but if you want, you can put them all at the end of your -document, sort of like footnotes.

      - -

      Here's an example of reference links in action:

      - -
      I get 10 times more traffic from [Google] [1] than from
      -[Yahoo] [2] or [MSN] [3].
      -
      -  [1]: http://google.com/        "Google"
      -  [2]: http://search.yahoo.com/  "Yahoo Search"
      -  [3]: http://search.msn.com/    "MSN Search"
      -
      - -

      Using the implicit link name shortcut, you could instead write:

      - -
      I get 10 times more traffic from [Google][] than from
      -[Yahoo][] or [MSN][].
      -
      -  [google]: http://google.com/        "Google"
      -  [yahoo]:  http://search.yahoo.com/  "Yahoo Search"
      -  [msn]:    http://search.msn.com/    "MSN Search"
      -
      - -

      Both of the above examples will produce the following HTML output:

      - -
      <p>I get 10 times more traffic from <a href="http://google.com/"
      -title="Google">Google</a> than from
      -<a href="http://search.yahoo.com/" title="Yahoo Search">Yahoo</a>
      -or <a href="http://search.msn.com/" title="MSN Search">MSN</a>.</p>
      -
      - -

      For comparison, here is the same paragraph written using -Markdown's inline link style:

      - -
      I get 10 times more traffic from [Google](http://google.com/ "Google")
      -than from [Yahoo](http://search.yahoo.com/ "Yahoo Search") or
      -[MSN](http://search.msn.com/ "MSN Search").
      -
      - -

      The point of reference-style links is not that they're easier to -write. The point is that with reference-style links, your document -source is vastly more readable. Compare the above examples: using -reference-style links, the paragraph itself is only 81 characters -long; with inline-style links, it's 176 characters; and as raw HTML, -it's 234 characters. In the raw HTML, there's more markup than there -is text.

      - -

      With Markdown's reference-style links, a source document much more -closely resembles the final output, as rendered in a browser. By -allowing you to move the markup-related metadata out of the paragraph, -you can add links without interrupting the narrative flow of your -prose.

      - -

      Emphasis

      - -

      Markdown treats asterisks (*) and underscores (_) as indicators of -emphasis. Text wrapped with one * or _ will be wrapped with an -HTML <em> tag; double *'s or _'s will be wrapped with an HTML -<strong> tag. E.g., this input:

      - -
      *single asterisks*
      -
      -_single underscores_
      -
      -**double asterisks**
      -
      -__double underscores__
      -
      - -

      will produce:

      - -
      <em>single asterisks</em>
      -
      -<em>single underscores</em>
      -
      -<strong>double asterisks</strong>
      -
      -<strong>double underscores</strong>
      -
      - -

      You can use whichever style you prefer; the lone restriction is that -the same character must be used to open and close an emphasis span.

      - -

      Emphasis can be used in the middle of a word:

      - -
      un*fucking*believable
      -
      - -

      But if you surround an * or _ with spaces, it'll be treated as a -literal asterisk or underscore.

      - -

      To produce a literal asterisk or underscore at a position where it -would otherwise be used as an emphasis delimiter, you can backslash -escape it:

      - -
      \*this text is surrounded by literal asterisks\*
      -
      - -

      Code

      - -

      To indicate a span of code, wrap it with backtick quotes (`). -Unlike a pre-formatted code block, a code span indicates code within a -normal paragraph. For example:

      - -
      Use the `printf()` function.
      -
      - -

      will produce:

      - -
      <p>Use the <code>printf()</code> function.</p>
      -
      - -

      To include a literal backtick character within a code span, you can use -multiple backticks as the opening and closing delimiters:

      - -
      ``There is a literal backtick (`) here.``
      -
      - -

      which will produce this:

      - -
      <p><code>There is a literal backtick (`) here.</code></p>
      -
      - -

      The backtick delimiters surrounding a code span may include spaces -- -one after the opening, one before the closing. This allows you to place -literal backtick characters at the beginning or end of a code span:

      - -
      A single backtick in a code span: `` ` ``
      -
      -A backtick-delimited string in a code span: `` `foo` ``
      -
      - -

      will produce:

      - -
      <p>A single backtick in a code span: <code>`</code></p>
      -
      -<p>A backtick-delimited string in a code span: <code>`foo`</code></p>
      -
      - -

      With a code span, ampersands and angle brackets are encoded as HTML -entities automatically, which makes it easy to include example HTML -tags. Markdown will turn this:

      - -
      Please don't use any `<blink>` tags.
      -
      - -

      into:

      - -
      <p>Please don't use any <code>&lt;blink&gt;</code> tags.</p>
      -
      - -

      You can write this:

      - -
      `&#8212;` is the decimal-encoded equivalent of `&mdash;`.
      -
      - -

      to produce:

      - -
      <p><code>&amp;#8212;</code> is the decimal-encoded
      -equivalent of <code>&amp;mdash;</code>.</p>
      -
      - -

      Images

      - -

      Admittedly, it's fairly difficult to devise a "natural" syntax for -placing images into a plain text document format.

      - -

      Markdown uses an image syntax that is intended to resemble the syntax -for links, allowing for two styles: inline and reference.

      - -

      Inline image syntax looks like this:

      - -
      ![Alt text](/path/to/img.jpg)
      -
      -![Alt text](/path/to/img.jpg "Optional title")
      -
      - -

      That is:

      - -
        -
      • An exclamation mark: !;
      • -
      • followed by a set of square brackets, containing the alt -attribute text for the image;
      • -
      • followed by a set of parentheses, containing the URL or path to -the image, and an optional title attribute enclosed in double -or single quotes.
      • -
      - -

      Reference-style image syntax looks like this:

      - -
      ![Alt text][id]
      -
      - -

      Where "id" is the name of a defined image reference. Image references -are defined using syntax identical to link references:

      - -
      [id]: url/to/image  "Optional title attribute"
      -
      - -

      As of this writing, Markdown has no syntax for specifying the -dimensions of an image; if this is important to you, you can simply -use regular HTML <img> tags.

      - -
      - -

      Miscellaneous

      - - - -

      Markdown supports a shortcut style for creating "automatic" links for URLs and email addresses: simply surround the URL or email address with angle brackets. What this means is that if you want to show the actual text of a URL or email address, and also have it be a clickable link, you can do this:

      - -
      <http://example.com/>
      -
      - -

      Markdown will turn this into:

      - -
      <a href="http://example.com/">http://example.com/</a>
      -
      - -

      Automatic links for email addresses work similarly, except that -Markdown will also perform a bit of randomized decimal and hex -entity-encoding to help obscure your address from address-harvesting -spambots. For example, Markdown will turn this:

      - -
      <address@example.com>
      -
      - -

      into something like this:

      - -
      <a href="&#x6D;&#x61;i&#x6C;&#x74;&#x6F;:&#x61;&#x64;&#x64;&#x72;&#x65;
      -&#115;&#115;&#64;&#101;&#120;&#x61;&#109;&#x70;&#x6C;e&#x2E;&#99;&#111;
      -&#109;">&#x61;&#x64;&#x64;&#x72;&#x65;&#115;&#115;&#64;&#101;&#120;&#x61;
      -&#109;&#x70;&#x6C;e&#x2E;&#99;&#111;&#109;</a>
      -
      - -

      which will render in a browser as a clickable link to "address@example.com".

      - -

      (This sort of entity-encoding trick will indeed fool many, if not -most, address-harvesting bots, but it definitely won't fool all of -them. It's better than nothing, but an address published in this way -will probably eventually start receiving spam.)

      - -

      Backslash Escapes

      - -

      Markdown allows you to use backslash escapes to generate literal -characters which would otherwise have special meaning in Markdown's -formatting syntax. For example, if you wanted to surround a word with -literal asterisks (instead of an HTML <em> tag), you can backslashes -before the asterisks, like this:

      - -
      \*literal asterisks\*
      -
      - -

      Markdown provides backslash escapes for the following characters:

      - -
      \   backslash
      -`   backtick
      -*   asterisk
      -_   underscore
      -{}  curly braces
      -[]  square brackets
      -()  parentheses
      -#   hash mark
      -+   plus sign
      --   minus sign (hyphen)
      -.   dot
      -!   exclamation mark
      -
      diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Markdown Documentation - Syntax.text b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Markdown Documentation - Syntax.text deleted file mode 100644 index dabd75c0..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Markdown Documentation - Syntax.text +++ /dev/null @@ -1,888 +0,0 @@ -Markdown: Syntax -================ - - - - -* [Overview](#overview) - * [Philosophy](#philosophy) - * [Inline HTML](#html) - * [Automatic Escaping for Special Characters](#autoescape) -* [Block Elements](#block) - * [Paragraphs and Line Breaks](#p) - * [Headers](#header) - * [Blockquotes](#blockquote) - * [Lists](#list) - * [Code Blocks](#precode) - * [Horizontal Rules](#hr) -* [Span Elements](#span) - * [Links](#link) - * [Emphasis](#em) - * [Code](#code) - * [Images](#img) -* [Miscellaneous](#misc) - * [Backslash Escapes](#backslash) - * [Automatic Links](#autolink) - - -**Note:** This document is itself written using Markdown; you -can [see the source for it by adding '.text' to the URL][src]. - - [src]: /projects/markdown/syntax.text - -* * * - -

      Overview

      - -

      Philosophy

      - -Markdown is intended to be as easy-to-read and easy-to-write as is feasible. - -Readability, however, is emphasized above all else. A Markdown-formatted -document should be publishable as-is, as plain text, without looking -like it's been marked up with tags or formatting instructions. While -Markdown's syntax has been influenced by several existing text-to-HTML -filters -- including [Setext] [1], [atx] [2], [Textile] [3], [reStructuredText] [4], -[Grutatext] [5], and [EtText] [6] -- the single biggest source of -inspiration for Markdown's syntax is the format of plain text email. - - [1]: http://docutils.sourceforge.net/mirror/setext.html - [2]: http://www.aaronsw.com/2002/atx/ - [3]: http://textism.com/tools/textile/ - [4]: http://docutils.sourceforge.net/rst.html - [5]: http://www.triptico.com/software/grutatxt.html - [6]: http://ettext.taint.org/doc/ - -To this end, Markdown's syntax is comprised entirely of punctuation -characters, which punctuation characters have been carefully chosen so -as to look like what they mean. E.g., asterisks around a word actually -look like \*emphasis\*. Markdown lists look like, well, lists. Even -blockquotes look like quoted passages of text, assuming you've ever -used email. - - - -

      Inline HTML

      - -Markdown's syntax is intended for one purpose: to be used as a -format for *writing* for the web. - -Markdown is not a replacement for HTML, or even close to it. Its -syntax is very small, corresponding only to a very small subset of -HTML tags. The idea is *not* to create a syntax that makes it easier -to insert HTML tags. In my opinion, HTML tags are already easy to -insert. The idea for Markdown is to make it easy to read, write, and -edit prose. HTML is a *publishing* format; Markdown is a *writing* -format. Thus, Markdown's formatting syntax only addresses issues that -can be conveyed in plain text. - -For any markup that is not covered by Markdown's syntax, you simply -use HTML itself. There's no need to preface it or delimit it to -indicate that you're switching from Markdown to HTML; you just use -the tags. - -The only restrictions are that block-level HTML elements -- e.g. `
      `, -``, `
      `, `

      `, etc. -- must be separated from surrounding -content by blank lines, and the start and end tags of the block should -not be indented with tabs or spaces. Markdown is smart enough not -to add extra (unwanted) `

      ` tags around HTML block-level tags. - -For example, to add an HTML table to a Markdown article: - - This is a regular paragraph. - -

      - - - -
      Foo
      - - This is another regular paragraph. - -Note that Markdown formatting syntax is not processed within block-level -HTML tags. E.g., you can't use Markdown-style `*emphasis*` inside an -HTML block. - -Span-level HTML tags -- e.g. ``, ``, or `` -- can be -used anywhere in a Markdown paragraph, list item, or header. If you -want, you can even use HTML tags instead of Markdown formatting; e.g. if -you'd prefer to use HTML `` or `` tags instead of Markdown's -link or image syntax, go right ahead. - -Unlike block-level HTML tags, Markdown syntax *is* processed within -span-level tags. - - -

      Automatic Escaping for Special Characters

      - -In HTML, there are two characters that demand special treatment: `<` -and `&`. Left angle brackets are used to start tags; ampersands are -used to denote HTML entities. If you want to use them as literal -characters, you must escape them as entities, e.g. `<`, and -`&`. - -Ampersands in particular are bedeviling for web writers. If you want to -write about 'AT&T', you need to write '`AT&T`'. You even need to -escape ampersands within URLs. Thus, if you want to link to: - - http://images.google.com/images?num=30&q=larry+bird - -you need to encode the URL as: - - http://images.google.com/images?num=30&q=larry+bird - -in your anchor tag `href` attribute. Needless to say, this is easy to -forget, and is probably the single most common source of HTML validation -errors in otherwise well-marked-up web sites. - -Markdown allows you to use these characters naturally, taking care of -all the necessary escaping for you. If you use an ampersand as part of -an HTML entity, it remains unchanged; otherwise it will be translated -into `&`. - -So, if you want to include a copyright symbol in your article, you can write: - - © - -and Markdown will leave it alone. But if you write: - - AT&T - -Markdown will translate it to: - - AT&T - -Similarly, because Markdown supports [inline HTML](#html), if you use -angle brackets as delimiters for HTML tags, Markdown will treat them as -such. But if you write: - - 4 < 5 - -Markdown will translate it to: - - 4 < 5 - -However, inside Markdown code spans and blocks, angle brackets and -ampersands are *always* encoded automatically. This makes it easy to use -Markdown to write about HTML code. (As opposed to raw HTML, which is a -terrible format for writing about HTML syntax, because every single `<` -and `&` in your example code needs to be escaped.) - - -* * * - - -

      Block Elements

      - - -

      Paragraphs and Line Breaks

      - -A paragraph is simply one or more consecutive lines of text, separated -by one or more blank lines. (A blank line is any line that looks like a -blank line -- a line containing nothing but spaces or tabs is considered -blank.) Normal paragraphs should not be intended with spaces or tabs. - -The implication of the "one or more consecutive lines of text" rule is -that Markdown supports "hard-wrapped" text paragraphs. This differs -significantly from most other text-to-HTML formatters (including Movable -Type's "Convert Line Breaks" option) which translate every line break -character in a paragraph into a `
      ` tag. - -When you *do* want to insert a `
      ` break tag using Markdown, you -end a line with two or more spaces, then type return. - -Yes, this takes a tad more effort to create a `
      `, but a simplistic -"every line break is a `
      `" rule wouldn't work for Markdown. -Markdown's email-style [blockquoting][bq] and multi-paragraph [list items][l] -work best -- and look better -- when you format them with hard breaks. - - [bq]: #blockquote - [l]: #list - - - - - -Markdown supports two styles of headers, [Setext] [1] and [atx] [2]. - -Setext-style headers are "underlined" using equal signs (for first-level -headers) and dashes (for second-level headers). For example: - - This is an H1 - ============= - - This is an H2 - ------------- - -Any number of underlining `=`'s or `-`'s will work. - -Atx-style headers use 1-6 hash characters at the start of the line, -corresponding to header levels 1-6. For example: - - # This is an H1 - - ## This is an H2 - - ###### This is an H6 - -Optionally, you may "close" atx-style headers. This is purely -cosmetic -- you can use this if you think it looks better. The -closing hashes don't even need to match the number of hashes -used to open the header. (The number of opening hashes -determines the header level.) : - - # This is an H1 # - - ## This is an H2 ## - - ### This is an H3 ###### - - -

      Blockquotes

      - -Markdown uses email-style `>` characters for blockquoting. If you're -familiar with quoting passages of text in an email message, then you -know how to create a blockquote in Markdown. It looks best if you hard -wrap the text and put a `>` before every line: - - > This is a blockquote with two paragraphs. 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. - -Markdown allows you to be lazy and only put the `>` before the first -line of a hard-wrapped paragraph: - - > This is a blockquote with two paragraphs. 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. - -Blockquotes can be nested (i.e. a blockquote-in-a-blockquote) by -adding additional levels of `>`: - - > This is the first level of quoting. - > - > > This is nested blockquote. - > - > Back to the first level. - -Blockquotes can contain other Markdown elements, including headers, lists, -and code blocks: - - > ## This is a header. - > - > 1. This is the first list item. - > 2. This is the second list item. - > - > Here's some example code: - > - > return shell_exec("echo $input | $markdown_script"); - -Any decent text editor should make email-style quoting easy. For -example, with BBEdit, you can make a selection and choose Increase -Quote Level from the Text menu. - - -

      Lists

      - -Markdown supports ordered (numbered) and unordered (bulleted) lists. - -Unordered lists use asterisks, pluses, and hyphens -- interchangably --- as list markers: - - * Red - * Green - * Blue - -is equivalent to: - - + Red - + Green - + Blue - -and: - - - Red - - Green - - Blue - -Ordered lists use numbers followed by periods: - - 1. Bird - 2. McHale - 3. Parish - -It's important to note that the actual numbers you use to mark the -list have no effect on the HTML output Markdown produces. The HTML -Markdown produces from the above list is: - -
        -
      1. Bird
      2. -
      3. McHale
      4. -
      5. Parish
      6. -
      - -If you instead wrote the list in Markdown like this: - - 1. Bird - 1. McHale - 1. Parish - -or even: - - 3. Bird - 1. McHale - 8. Parish - -you'd get the exact same HTML output. The point is, if you want to, -you can use ordinal numbers in your ordered Markdown lists, so that -the numbers in your source match the numbers in your published HTML. -But if you want to be lazy, you don't have to. - -If you do use lazy list numbering, however, you should still start the -list with the number 1. At some point in the future, Markdown may support -starting ordered lists at an arbitrary number. - -List markers typically start at the left margin, but may be indented by -up to three spaces. List markers must be followed by one or more spaces -or a tab. - -To make lists look nice, you can wrap items with hanging indents: - - * 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. - -But if you want to be lazy, you don't have to: - - * 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. - -If list items are separated by blank lines, Markdown will wrap the -items in `

      ` tags in the HTML output. For example, this input: - - * Bird - * Magic - -will turn into: - -

        -
      • Bird
      • -
      • Magic
      • -
      - -But this: - - * Bird - - * Magic - -will turn into: - -
        -
      • Bird

      • -
      • Magic

      • -
      - -List items may consist of multiple paragraphs. Each subsequent -paragraph in a list item must be intended by either 4 spaces -or one tab: - - 1. This is a list item with two paragraphs. 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. - - 2. Suspendisse id sem consectetuer libero luctus adipiscing. - -It looks nice if you indent every line of the subsequent -paragraphs, but here again, Markdown will allow you to be -lazy: - - * This is a list item with two paragraphs. - - 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. - - * Another item in the same list. - -To put a blockquote within a list item, the blockquote's `>` -delimiters need to be indented: - - * A list item with a blockquote: - - > This is a blockquote - > inside a list item. - -To put a code block within a list item, the code block needs -to be indented *twice* -- 8 spaces or two tabs: - - * A list item with a code block: - - - - -It's worth noting that it's possible to trigger an ordered list by -accident, by writing something like this: - - 1986. What a great season. - -In other words, a *number-period-space* sequence at the beginning of a -line. To avoid this, you can backslash-escape the period: - - 1986\. What a great season. - - - -

      Code Blocks

      - -Pre-formatted code blocks are used for writing about programming or -markup source code. Rather than forming normal paragraphs, the lines -of a code block are interpreted literally. Markdown wraps a code block -in both `
      ` and `` tags.
      -
      -To produce a code block in Markdown, simply indent every line of the
      -block by at least 4 spaces or 1 tab. For example, given this input:
      -
      -    This is a normal paragraph:
      -
      -        This is a code block.
      -
      -Markdown will generate:
      -
      -    

      This is a normal paragraph:

      - -
      This is a code block.
      -    
      - -One level of indentation -- 4 spaces or 1 tab -- is removed from each -line of the code block. For example, this: - - Here is an example of AppleScript: - - tell application "Foo" - beep - end tell - -will turn into: - -

      Here is an example of AppleScript:

      - -
      tell application "Foo"
      -        beep
      -    end tell
      -    
      - -A code block continues until it reaches a line that is not indented -(or the end of the article). - -Within a code block, ampersands (`&`) and angle brackets (`<` and `>`) -are automatically converted into HTML entities. This makes it very -easy to include example HTML source code using Markdown -- just paste -it and indent it, and Markdown will handle the hassle of encoding the -ampersands and angle brackets. For example, this: - - - -will turn into: - -
      <div class="footer">
      -        &copy; 2004 Foo Corporation
      -    </div>
      -    
      - -Regular Markdown syntax is not processed within code blocks. E.g., -asterisks are just literal asterisks within a code block. This means -it's also easy to use Markdown to write about Markdown's own syntax. - - - -

      Horizontal Rules

      - -You can produce a horizontal rule tag (`
      `) by placing three or -more hyphens, asterisks, or underscores on a line by themselves. If you -wish, you may use spaces between the hyphens or asterisks. Each of the -following lines will produce a horizontal rule: - - * * * - - *** - - ***** - - - - - - - --------------------------------------- - - _ _ _ - - -* * * - -

      Span Elements

      - - - -Markdown supports two style of links: *inline* and *reference*. - -In both styles, the link text is delimited by [square brackets]. - -To create an inline link, use a set of regular parentheses immediately -after the link text's closing square bracket. Inside the parentheses, -put the URL where you want the link to point, along with an *optional* -title for the link, surrounded in quotes. For example: - - This is [an example](http://example.com/ "Title") inline link. - - [This link](http://example.net/) has no title attribute. - -Will produce: - -

      This is - an example inline link.

      - -

      This link has no - title attribute.

      - -If you're referring to a local resource on the same server, you can -use relative paths: - - See my [About](/about/) page for details. - -Reference-style links use a second set of square brackets, inside -which you place a label of your choosing to identify the link: - - This is [an example][id] reference-style link. - -You can optionally use a space to separate the sets of brackets: - - This is [an example] [id] reference-style link. - -Then, anywhere in the document, you define your link label like this, -on a line by itself: - - [id]: http://example.com/ "Optional Title Here" - -That is: - -* Square brackets containing the link identifier (optionally - indented from the left margin using up to three spaces); -* followed by a colon; -* followed by one or more spaces (or tabs); -* followed by the URL for the link; -* optionally followed by a title attribute for the link, enclosed - in double or single quotes. - -The link URL may, optionally, be surrounded by angle brackets: - - [id]: "Optional Title Here" - -You can put the title attribute on the next line and use extra spaces -or tabs for padding, which tends to look better with longer URLs: - - [id]: http://example.com/longish/path/to/resource/here - "Optional Title Here" - -Link definitions are only used for creating links during Markdown -processing, and are stripped from your document in the HTML output. - -Link definition names may constist of letters, numbers, spaces, and punctuation -- but they are *not* case sensitive. E.g. these two links: - - [link text][a] - [link text][A] - -are equivalent. - -The *implicit link name* shortcut allows you to omit the name of the -link, in which case the link text itself is used as the name. -Just use an empty set of square brackets -- e.g., to link the word -"Google" to the google.com web site, you could simply write: - - [Google][] - -And then define the link: - - [Google]: http://google.com/ - -Because link names may contain spaces, this shortcut even works for -multiple words in the link text: - - Visit [Daring Fireball][] for more information. - -And then define the link: - - [Daring Fireball]: http://daringfireball.net/ - -Link definitions can be placed anywhere in your Markdown document. I -tend to put them immediately after each paragraph in which they're -used, but if you want, you can put them all at the end of your -document, sort of like footnotes. - -Here's an example of reference links in action: - - I get 10 times more traffic from [Google] [1] than from - [Yahoo] [2] or [MSN] [3]. - - [1]: http://google.com/ "Google" - [2]: http://search.yahoo.com/ "Yahoo Search" - [3]: http://search.msn.com/ "MSN Search" - -Using the implicit link name shortcut, you could instead write: - - I get 10 times more traffic from [Google][] than from - [Yahoo][] or [MSN][]. - - [google]: http://google.com/ "Google" - [yahoo]: http://search.yahoo.com/ "Yahoo Search" - [msn]: http://search.msn.com/ "MSN Search" - -Both of the above examples will produce the following HTML output: - -

      I get 10 times more traffic from Google than from - Yahoo - or MSN.

      - -For comparison, here is the same paragraph written using -Markdown's inline link style: - - I get 10 times more traffic from [Google](http://google.com/ "Google") - than from [Yahoo](http://search.yahoo.com/ "Yahoo Search") or - [MSN](http://search.msn.com/ "MSN Search"). - -The point of reference-style links is not that they're easier to -write. The point is that with reference-style links, your document -source is vastly more readable. Compare the above examples: using -reference-style links, the paragraph itself is only 81 characters -long; with inline-style links, it's 176 characters; and as raw HTML, -it's 234 characters. In the raw HTML, there's more markup than there -is text. - -With Markdown's reference-style links, a source document much more -closely resembles the final output, as rendered in a browser. By -allowing you to move the markup-related metadata out of the paragraph, -you can add links without interrupting the narrative flow of your -prose. - - -

      Emphasis

      - -Markdown treats asterisks (`*`) and underscores (`_`) as indicators of -emphasis. Text wrapped with one `*` or `_` will be wrapped with an -HTML `` tag; double `*`'s or `_`'s will be wrapped with an HTML -`` tag. E.g., this input: - - *single asterisks* - - _single underscores_ - - **double asterisks** - - __double underscores__ - -will produce: - - single asterisks - - single underscores - - double asterisks - - double underscores - -You can use whichever style you prefer; the lone restriction is that -the same character must be used to open and close an emphasis span. - -Emphasis can be used in the middle of a word: - - un*fucking*believable - -But if you surround an `*` or `_` with spaces, it'll be treated as a -literal asterisk or underscore. - -To produce a literal asterisk or underscore at a position where it -would otherwise be used as an emphasis delimiter, you can backslash -escape it: - - \*this text is surrounded by literal asterisks\* - - - -

      Code

      - -To indicate a span of code, wrap it with backtick quotes (`` ` ``). -Unlike a pre-formatted code block, a code span indicates code within a -normal paragraph. For example: - - Use the `printf()` function. - -will produce: - -

      Use the printf() function.

      - -To include a literal backtick character within a code span, you can use -multiple backticks as the opening and closing delimiters: - - ``There is a literal backtick (`) here.`` - -which will produce this: - -

      There is a literal backtick (`) here.

      - -The backtick delimiters surrounding a code span may include spaces -- -one after the opening, one before the closing. This allows you to place -literal backtick characters at the beginning or end of a code span: - - A single backtick in a code span: `` ` `` - - A backtick-delimited string in a code span: `` `foo` `` - -will produce: - -

      A single backtick in a code span: `

      - -

      A backtick-delimited string in a code span: `foo`

      - -With a code span, ampersands and angle brackets are encoded as HTML -entities automatically, which makes it easy to include example HTML -tags. Markdown will turn this: - - Please don't use any `` tags. - -into: - -

      Please don't use any <blink> tags.

      - -You can write this: - - `—` is the decimal-encoded equivalent of `—`. - -to produce: - -

      &#8212; is the decimal-encoded - equivalent of &mdash;.

      - - - -

      Images

      - -Admittedly, it's fairly difficult to devise a "natural" syntax for -placing images into a plain text document format. - -Markdown uses an image syntax that is intended to resemble the syntax -for links, allowing for two styles: *inline* and *reference*. - -Inline image syntax looks like this: - - ![Alt text](/path/to/img.jpg) - - ![Alt text](/path/to/img.jpg "Optional title") - -That is: - -* An exclamation mark: `!`; -* followed by a set of square brackets, containing the `alt` - attribute text for the image; -* followed by a set of parentheses, containing the URL or path to - the image, and an optional `title` attribute enclosed in double - or single quotes. - -Reference-style image syntax looks like this: - - ![Alt text][id] - -Where "id" is the name of a defined image reference. Image references -are defined using syntax identical to link references: - - [id]: url/to/image "Optional title attribute" - -As of this writing, Markdown has no syntax for specifying the -dimensions of an image; if this is important to you, you can simply -use regular HTML `` tags. - - -* * * - - -

      Miscellaneous

      - - - -Markdown supports a shortcut style for creating "automatic" links for URLs and email addresses: simply surround the URL or email address with angle brackets. What this means is that if you want to show the actual text of a URL or email address, and also have it be a clickable link, you can do this: - - - -Markdown will turn this into: - - http://example.com/ - -Automatic links for email addresses work similarly, except that -Markdown will also perform a bit of randomized decimal and hex -entity-encoding to help obscure your address from address-harvesting -spambots. For example, Markdown will turn this: - - - -into something like this: - - address@exa - mple.com - -which will render in a browser as a clickable link to "address@example.com". - -(This sort of entity-encoding trick will indeed fool many, if not -most, address-harvesting bots, but it definitely won't fool all of -them. It's better than nothing, but an address published in this way -will probably eventually start receiving spam.) - - - -

      Backslash Escapes

      - -Markdown allows you to use backslash escapes to generate literal -characters which would otherwise have special meaning in Markdown's -formatting syntax. For example, if you wanted to surround a word with -literal asterisks (instead of an HTML `` tag), you can backslashes -before the asterisks, like this: - - \*literal asterisks\* - -Markdown provides backslash escapes for the following characters: - - \ backslash - ` backtick - * asterisk - _ underscore - {} curly braces - [] square brackets - () parentheses - # hash mark - + plus sign - - minus sign (hyphen) - . dot - ! exclamation mark - diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Nested blockquotes.html b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Nested blockquotes.html deleted file mode 100644 index e9f27abb..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Nested blockquotes.html +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - -
      -

      foo

      - -
      -

      bar

      -
      - -

      foo

      -
      - -
      -
      - -
        -
      - -
      -
      -Created by Maruku at 23:15 on Friday, January 05th, 2007.
      - diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Nested blockquotes.html.dist b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Nested blockquotes.html.dist deleted file mode 100644 index d8ec7f8e..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Nested blockquotes.html.dist +++ /dev/null @@ -1,9 +0,0 @@ -
      -

      foo

      - -
      -

      bar

      -
      - -

      foo

      -
      diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Nested blockquotes.text b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Nested blockquotes.text deleted file mode 100644 index ed3c624f..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Nested blockquotes.text +++ /dev/null @@ -1,5 +0,0 @@ -> foo -> -> > bar -> -> foo diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Ordered and unordered lists.html b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Ordered and unordered lists.html deleted file mode 100644 index 4308acd5..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Ordered and unordered lists.html +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - - -

      Unordered

      - -

      Asterisks tight:

      - -
        -
      • asterisk 1
      • - -
      • asterisk 2
      • - -
      • asterisk 3
      • -
      - -

      Asterisks loose:

      - -
        -
      • -

        asterisk 1

        -
      • - -
      • -

        asterisk 2

        -
      • - -
      • -

        asterisk 3

        -
      • -
      - -
      - -

      Pluses tight:

      - -
        -
      • Plus 1
      • - -
      • Plus 2
      • - -
      • Plus 3
      • -
      - -

      Pluses loose:

      - -
        -
      • -

        Plus 1

        -
      • - -
      • -

        Plus 2

        -
      • - -
      • -

        Plus 3

        -
      • -
      - -
      - -

      Minuses tight:

      - -
        -
      • Minus 1
      • - -
      • Minus 2
      • - -
      • Minus 3
      • -
      - -

      Minuses loose:

      - -
        -
      • -

        Minus 1

        -
      • - -
      • -

        Minus 2

        -
      • - -
      • -

        Minus 3

        -
      • -
      - -

      Ordered

      - -

      Tight:

      - -
        -
      1. First
      2. - -
      3. Second
      4. - -
      5. Third
      6. -
      - -

      and:

      - -
        -
      1. One
      2. - -
      3. Two
      4. - -
      5. Three
      6. -
      - -

      Loose using tabs:

      - -
        -
      1. -

        First

        -
      2. - -
      3. -

        Second

        -
      4. - -
      5. -

        Third

        -
      6. -
      - -

      and using spaces:

      - -
        -
      1. -

        One

        -
      2. - -
      3. -

        Two

        -
      4. - -
      5. -

        Three

        -
      6. -
      - -

      Multiple paragraphs:

      - -
        -
      1. -

        Item 1, graf one.

        - -

        Item 2. graf two. The quick brown fox jumped over the lazy dog's back.

        -
      2. - -
      3. -

        Item 2.

        -
      4. - -
      5. -

        Item 3.

        -
      6. -
      - -

      Nested

      - -
        -
      • Tab * Tab * Tab
      • -
      - -

      Here's another:

      - -
        -
      1. -

        First

        -
      2. - -
      3. -

        Second:

        - -
          -
        • Fee
        • - -
        • Fie
        • - -
        • Foe
        • -
        -
      4. - -
      5. -

        Third

        -
      6. -
      - -

      Same thing but with paragraphs:

      - -
        -
      1. -

        First

        -
      2. - -
      3. -

        Second:

        - -
          -
        • Fee
        • - -
        • Fie
        • - -
        • Foe
        • -
        -
      4. - -
      5. -

        Third

        -
      6. -
      - -
      -
      - -
        -
      - -
      -
      -Created by Maruku at 23:15 on Friday, January 05th, 2007.
      - diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Ordered and unordered lists.html.dist b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Ordered and unordered lists.html.dist deleted file mode 100644 index ce85c3aa..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Ordered and unordered lists.html.dist +++ /dev/null @@ -1,137 +0,0 @@ -

      Unordered

      - -

      Asterisks tight:

      - -
        -
      • asterisk 1
      • -
      • asterisk 2
      • -
      • asterisk 3
      • -
      - -

      Asterisks loose:

      - -
        -
      • asterisk 1

      • -
      • asterisk 2

      • -
      • asterisk 3

      • -
      - -
      - -

      Pluses tight:

      - -
        -
      • Plus 1
      • -
      • Plus 2
      • -
      • Plus 3
      • -
      - -

      Pluses loose:

      - -
        -
      • Plus 1

      • -
      • Plus 2

      • -
      • Plus 3

      • -
      - -
      - -

      Minuses tight:

      - -
        -
      • Minus 1
      • -
      • Minus 2
      • -
      • Minus 3
      • -
      - -

      Minuses loose:

      - -
        -
      • Minus 1

      • -
      • Minus 2

      • -
      • Minus 3

      • -
      - -

      Ordered

      - -

      Tight:

      - -
        -
      1. First
      2. -
      3. Second
      4. -
      5. Third
      6. -
      - -

      and:

      - -
        -
      1. One
      2. -
      3. Two
      4. -
      5. Three
      6. -
      - -

      Loose using tabs:

      - -
        -
      1. First

      2. -
      3. Second

      4. -
      5. Third

      6. -
      - -

      and using spaces:

      - -
        -
      1. One

      2. -
      3. Two

      4. -
      5. Three

      6. -
      - -

      Multiple paragraphs:

      - -
        -
      1. Item 1, graf one.

        - -

        Item 2. graf two. The quick brown fox jumped over the lazy dog's -back.

      2. -
      3. Item 2.

      4. -
      5. Item 3.

      6. -
      - -

      Nested

      - -
        -
      • Tab -
          -
        • Tab -
            -
          • Tab
          • -
        • -
      • -
      - -

      Here's another:

      - -
        -
      1. First
      2. -
      3. Second: -
          -
        • Fee
        • -
        • Fie
        • -
        • Foe
        • -
      4. -
      5. Third
      6. -
      - -

      Same thing but with paragraphs:

      - -
        -
      1. First

      2. -
      3. Second:

        - -
          -
        • Fee
        • -
        • Fie
        • -
        • Foe
        • -
      4. -
      5. Third

      6. -
      diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Ordered and unordered lists.text b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Ordered and unordered lists.text deleted file mode 100644 index 621db581..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Ordered and unordered lists.text +++ /dev/null @@ -1,122 +0,0 @@ -## Unordered - -Asterisks tight: - -* asterisk 1 -* asterisk 2 -* asterisk 3 - - -Asterisks loose: - -* asterisk 1 - -* asterisk 2 - -* asterisk 3 - -* * * - -Pluses tight: - -+ Plus 1 -+ Plus 2 -+ Plus 3 - - -Pluses loose: - -+ Plus 1 - -+ Plus 2 - -+ Plus 3 - -* * * - - -Minuses tight: - -- Minus 1 -- Minus 2 -- Minus 3 - - -Minuses loose: - -- Minus 1 - -- Minus 2 - -- Minus 3 - - -## Ordered - -Tight: - -1. First -2. Second -3. Third - -and: - -1. One -2. Two -3. Three - - -Loose using tabs: - -1. First - -2. Second - -3. Third - -and using spaces: - -1. One - -2. Two - -3. Three - -Multiple paragraphs: - -1. Item 1, graf one. - - Item 2. graf two. The quick brown fox jumped over the lazy dog's - back. - -2. Item 2. - -3. Item 3. - - - -## Nested - -* Tab - * Tab - * Tab - -Here's another: - -1. First -2. Second: - * Fee - * Fie - * Foe -3. Third - -Same thing but with paragraphs: - -1. First - -2. Second: - * Fee - * Fie - * Foe - -3. Third diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Strong and em together.html b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Strong and em together.html deleted file mode 100644 index fb77c762..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Strong and em together.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -

      This is strong and em.

      - -

      So is this word.

      - -

      This is strong and em.

      - -

      So is this word.

      - -
      -
      - -
        -
      - -
      -
      -Created by Maruku at 23:15 on Friday, January 05th, 2007.
      - diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Strong and em together.html.dist b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Strong and em together.html.dist deleted file mode 100644 index 71ec78c7..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Strong and em together.html.dist +++ /dev/null @@ -1,7 +0,0 @@ -

      This is strong and em.

      - -

      So is this word.

      - -

      This is strong and em.

      - -

      So is this word.

      diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Strong and em together.text b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Strong and em together.text deleted file mode 100644 index 95ee690d..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Strong and em together.text +++ /dev/null @@ -1,7 +0,0 @@ -***This is strong and em.*** - -So is ***this*** word. - -___This is strong and em.___ - -So is ___this___ word. diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Tabs.html b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Tabs.html deleted file mode 100644 index 1fac814e..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Tabs.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - -
        -
      • -

        this is a list item indented with tabs

        -
      • - -
      • -

        this is a list item indented with spaces

        -
      • -
      - -

      Code:

      - -
      this code block is indented by one tab
      -
      - -

      And:

      - -
      	this code block is indented by two tabs
      -
      - -

      And:

      - -
      +	this is an example list item
      -	indented with tabs
      -
      -+   this is an example list item
      -    indented with spaces
      - -
      -
      - -
        -
      - -
      -
      -Created by Maruku at 23:15 on Friday, January 05th, 2007.
      - diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Tabs.html.dist b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Tabs.html.dist deleted file mode 100644 index 3301ba80..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Tabs.html.dist +++ /dev/null @@ -1,25 +0,0 @@ -
        -
      • this is a list item -indented with tabs

      • -
      • this is a list item -indented with spaces

      • -
      - -

      Code:

      - -
      this code block is indented by one tab
      -
      - -

      And:

      - -
          this code block is indented by two tabs
      -
      - -

      And:

      - -
      +   this is an example list item
      -    indented with tabs
      -
      -+   this is an example list item
      -    indented with spaces
      -
      diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Tabs.text b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Tabs.text deleted file mode 100644 index 589d1136..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Tabs.text +++ /dev/null @@ -1,21 +0,0 @@ -+ this is a list item - indented with tabs - -+ this is a list item - indented with spaces - -Code: - - this code block is indented by one tab - -And: - - this code block is indented by two tabs - -And: - - + this is an example list item - indented with tabs - - + this is an example list item - indented with spaces diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Tidyness.html b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Tidyness.html deleted file mode 100644 index 82b36396..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Tidyness.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - -
      -

      A list within a blockquote:

      - -
        -
      • asterisk 1
      • - -
      • asterisk 2
      • - -
      • asterisk 3
      • -
      -
      - -
      -
      - -
        -
      - -
      -
      -Created by Maruku at 23:15 on Friday, January 05th, 2007.
      - diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Tidyness.html.dist b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Tidyness.html.dist deleted file mode 100644 index f2a8ce70..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Tidyness.html.dist +++ /dev/null @@ -1,8 +0,0 @@ -
      -

      A list within a blockquote:

      -
        -
      • asterisk 1
      • -
      • asterisk 2
      • -
      • asterisk 3
      • -
      -
      diff --git a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Tidyness.text b/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Tidyness.text deleted file mode 100644 index 5f18b8da..00000000 --- a/vendor/plugins/maruku/tests/MarkdownTest_1.0/Tests/Tidyness.text +++ /dev/null @@ -1,5 +0,0 @@ -> A list within a blockquote: -> -> * asterisk 1 -> * asterisk 2 -> * asterisk 3 diff --git a/vendor/plugins/maruku/tests/bugs/code_in_links.md b/vendor/plugins/maruku/tests/bugs/code_in_links.md deleted file mode 100644 index 0b510b61..00000000 --- a/vendor/plugins/maruku/tests/bugs/code_in_links.md +++ /dev/null @@ -1,16 +0,0 @@ -**This bug is now solved** - -Previously, a bug would not let you use `code` inside links text. - -So this: - Use the [`syntax`][syntax] -produces: -> Use the [`syntax`][syntax] - -And this: - Use the `[syntax][syntax]` -produces: -> Use the `[syntax][syntax]` - -[syntax]: http://gogole.com - diff --git a/vendor/plugins/maruku/tests/bugs/complex_escaping.md b/vendor/plugins/maruku/tests/bugs/complex_escaping.md deleted file mode 100644 index 89135374..00000000 --- a/vendor/plugins/maruku/tests/bugs/complex_escaping.md +++ /dev/null @@ -1,4 +0,0 @@ - - -What do you see here? `\\` it should be two backslashes. - diff --git a/vendor/plugins/maruku/tests/convert_all.sh b/vendor/plugins/maruku/tests/convert_all.sh deleted file mode 100755 index ea645173..00000000 --- a/vendor/plugins/maruku/tests/convert_all.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -ruby -I../lib ../bin/maruku MarkdownTest_1.0/Tests/*.text - -ruby -I../lib ../bin/maruku others/*.md -#ruby -I../lib ../bin/marutex others/*.md diff --git a/vendor/plugins/maruku/tests/math/math.css b/vendor/plugins/maruku/tests/math/math.css deleted file mode 100644 index 7d9f3183..00000000 --- a/vendor/plugins/maruku/tests/math/math.css +++ /dev/null @@ -1,40 +0,0 @@ - -body { - max-width: 36em; -} - -div.maruku-equation { - display: block; - padding-top: 0.5em; - padding-bottom: 0.5em; -} - -div.maruku-equation span.maruku-eq-number { - float: right; - padding-right: 2em; -} - -div.maruku-equation div.maruku-eq-tex { - font-size: 70%; - float: left; - margin-top: -3em; - padding: .5em; - border: dashed 1px pink; -} - -div.maruku-equation div.maruku-eq-tex:hover { - float: none; - display: block; - padding: 3em; - /*background-color: lightgray;*/ -} - -div.maruku-equation div.maruku-eq-tex code { - display: none; - background-color: #ffe; - padding: 1em; -} - -div.maruku-equation div.maruku-eq-tex:hover code { - display: block !important; -} \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/math/preamble.tex b/vendor/plugins/maruku/tests/math/preamble.tex deleted file mode 100644 index 4bf1cf38..00000000 --- a/vendor/plugins/maruku/tests/math/preamble.tex +++ /dev/null @@ -1,2 +0,0 @@ -%\def\text{\textrm} -\usepackage{amssymb,amsmath} diff --git a/vendor/plugins/maruku/tests/math/run.sh b/vendor/plugins/maruku/tests/math/run.sh deleted file mode 100755 index 5289fa4f..00000000 --- a/vendor/plugins/maruku/tests/math/run.sh +++ /dev/null @@ -1,7 +0,0 @@ - -# -ruby -I../../lib use_itex.rb < private.txt - -# creates the pdf - -ruby -I../../lib ../../bin/maruku --pdf private.txt diff --git a/vendor/plugins/maruku/tests/math/syntax.md b/vendor/plugins/maruku/tests/math/syntax.md deleted file mode 100644 index d98d124b..00000000 --- a/vendor/plugins/maruku/tests/math/syntax.md +++ /dev/null @@ -1,46 +0,0 @@ -LaTeX preamble: preamble.tex -CSS: math.css - -Here are some formulas: - -* $\alpha$ -* $x^{n}+y^{n} \neq z^{n}$ - -Some inline maths: $\sum_{n=1}^\infty \frac{(-1)^n}{n} = \ln 2$. - -Some display maths: - -\[ \sum_{n=1}^\infty \frac{1}{n} \] -\[ \sum_{n=1}^\infty \frac{1}{n} \text{ is divergent, but } \lim_{n \to \infty} \sum_{i=1}^n \frac{1}{i} - \ln n \text{ exists.} \] (a) - -Some random AMSTeX symbols - thanks to Robin Snader for adding these: - -$$ \beth \Subset \bigtriangleup \smallsmile \bumpeq \ggg \pitchfork $$ - -Note that $\hat g$ , $J$, and $\gamma_1\gamma_2$ all restrict to - -$x_1 \overline{x_2} \oplus x_2 \overline{x_1}$ and that this module -is linear in $x_1$ and $x_2$. - -See label \eqref{a}. - -$$ \href{#hello}{\alpha+\beta} $$ - -## Cross references ## - -The following are 4 equations, labeled A,B,C,D: - -$$ \alpha $$ (A) - -\[ - \beta -\] (B) - -$$ \gamma \label{C} $$ - -\[ - \delta \label{D} -\] - -You can now refer to (eq:A), (eq:B), \eqref{C}, \eqref{D}. - diff --git a/vendor/plugins/maruku/tests/math/syntax.xhtml b/vendor/plugins/maruku/tests/math/syntax.xhtml deleted file mode 100644 index faf8ef52..00000000 --- a/vendor/plugins/maruku/tests/math/syntax.xhtml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - -

      Here are some formulas:

      - -
        -
      • α
      • - -
      • x n+y nz n
      • -
      - -

      Some inline maths: n=1 (1 ) nn=ln2 .

      - -

      Some display maths:

      -
      n=1 1 n
      \sum_{n=1}^\infty \frac{1}{n}
      (1) n=1 1 n is divergent, but lim n i=1 n1 ilnn exists.
      \sum_{n=1}^\infty \frac{1}{n} \text{ is divergent, but } \lim_{n \to \infty} \sum_{i=1}^n \frac{1}{i} - \ln n \text{ exists.}
      -

      Some random AMSTeX symbols - thanks to Robin Snader for adding these:

      -
      smallsmile
      \beth \Subset \bigtriangleup \smallsmile \bumpeq \ggg \pitchfork
      -

      Note that ĝ , J, and γ 1 γ 2 all restrict to

      - -

      x 1 x 2 x 2 x 1 and that this module is linear in x 1 and x 2 .

      - -

      See label (1).

      -
      α+β
      \href{#hello}{\alpha+\beta}
      -

      Cross references

      - -

      The following are 4 equations, labeled A,B,C,D:

      -
      (2)α
      \alpha
      (3)β
      \beta - -
      (4)γ
      \gamma
      (5)δ
      \delta - -
      -

      You can now refer to (2), (3), (4), (5).

      -

      Created by Maruku at 21:13 on Sunday, January 14th, 2007.
      diff --git a/vendor/plugins/maruku/tests/math/use_itex.rb b/vendor/plugins/maruku/tests/math/use_itex.rb deleted file mode 100644 index 5a3ec196..00000000 --- a/vendor/plugins/maruku/tests/math/use_itex.rb +++ /dev/null @@ -1,34 +0,0 @@ - -# run this as: -# ruby -I../../lib use_itex.rb < private.txt - -require 'maruku' - -module MaRuKu; module Out; module HTML - - def to_html_inline_math_itex - # You can: either return a REXML::Element - # return Element.new 'div' - # or return an empty array on error - # return [] - # or have a string parsed by REXML: - tex = self.math - tex.gsub!('&','&') - mathml = "#{tex}" - return Document.new(mathml).root - end - - def to_html_equation_itex - return to_html_inline_math_itex - end - -end end end - -MaRuKu::Globals[:html_math_engine] = 'itex' - -doc = Maruku.new($stdin.read, {:on_error => :raise}) - -File.open('output.xhtml','w') do |f| - f.puts doc.to_html_document -end - diff --git a/vendor/plugins/maruku/tests/math_usage/document.md b/vendor/plugins/maruku/tests/math_usage/document.md deleted file mode 100644 index 5ade2241..00000000 --- a/vendor/plugins/maruku/tests/math_usage/document.md +++ /dev/null @@ -1,13 +0,0 @@ -css: math.css - -This is an example document. Inline: $a$, $b$, $q$ and stop. - -$$ \int_a^b f(x) dx $$ (1) - -See for example (eq:1). - -Equation inline: $ \int_a^b f(x) dx $ and that's it. - - -Spacing: Maruku outputs sizes and alignment for images in `ex`. An `ex` is one `x`: -x, $\textrm{x}$, $x$ should have the same height. diff --git a/vendor/plugins/maruku/tests/math_usage/math.css b/vendor/plugins/maruku/tests/math_usage/math.css deleted file mode 100644 index 3d5eb7c9..00000000 --- a/vendor/plugins/maruku/tests/math_usage/math.css +++ /dev/null @@ -1,26 +0,0 @@ - -body { - max-width: 35em; -} - -span.maruku-inline .maruku-mathml { - //display: none; -} - -div.maruku-equation .maruku-mathml { - //display: none; -} - -span.maruku-inline .maruku-png { -} - -div.maruku-equation .maruku-png { -} - -div.maruku-equation { - text-align: center; -} - -div.maruku-equation span.maruku-eq-number { - display: block; float: right; padding-right: 2em; -} diff --git a/vendor/plugins/maruku/tests/math_usage/script.sh b/vendor/plugins/maruku/tests/math_usage/script.sh deleted file mode 100755 index b027b6aa..00000000 --- a/vendor/plugins/maruku/tests/math_usage/script.sh +++ /dev/null @@ -1,13 +0,0 @@ - -maruku="ruby -I../../lib ../../bin/maruku" - -#input="private.txt" -input="document.md" - -$maruku -m itex2mml -o itex2mml.xhtml $input -$maruku -m ritex -o ritex.xhtml $input -$maruku -m none -o none.html $input -$maruku -m blahtex -o blahtex.xhtml $input -$maruku -m none --math-images blahtex -o blahtexi.html $input -$maruku -m blahtex --math-images blahtex -o blahtexmi.xhtml $input - diff --git a/vendor/plugins/maruku/tests/others/Backslash escapes.text b/vendor/plugins/maruku/tests/others/Backslash escapes.text deleted file mode 100644 index d4bf4289..00000000 --- a/vendor/plugins/maruku/tests/others/Backslash escapes.text +++ /dev/null @@ -1,106 +0,0 @@ -These should all get escaped: - -Backslash: \\ - -Backtick: \` - -Asterisk: \* - -Underscore: \_ - -Left brace: \{ - -Right brace: \} - -Left bracket: \[ - -Right bracket: \] - -Left paren: \( - -Right paren: \) - -Greater-than: \> - -Hash: \# - -Period: \. - -Bang: \! - -Plus: \+ - -Minus: \- - -So, these are TeX's special chars: -> \\ { } $ & # ^ _ % ~ - - -These should not, because they occur within a code block: - - Backslash: \\ - - Backtick: \` - - Asterisk: \* - - Underscore: \_ - - Left brace: \{ - - Right brace: \} - - Left bracket: \[ - - Right bracket: \] - - Left paren: \( - - Right paren: \) - - Greater-than: \> - - Hash: \# - - Period: \. - - Bang: \! - - Plus: \+ - - Minus: \- - - -Nor should these, which occur in code spans: - -Backslash: `\\` - -Backtick: `` \` `` - -Asterisk: `\*` - -Underscore: `\_` - -Left brace: `\{` - -Right brace: `\}` - -Left bracket: `\[` - -Right bracket: `\]` - -Left paren: `\(` - -Right paren: `\)` - -Greater-than: `\>` - -Hash: `\#` - -Period: `\.` - -Bang: `\!` - -Plus: `\+` - -Minus: `\-` diff --git a/vendor/plugins/maruku/tests/others/abbreviations.html b/vendor/plugins/maruku/tests/others/abbreviations.html deleted file mode 100644 index 11ad0711..00000000 --- a/vendor/plugins/maruku/tests/others/abbreviations.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - -

      The HTML specification is maintained by the W3C.

      - -

      Operation Tigra Genesis is going well.

      - -
      -
      -Created by Maruku at 00:19 on Wednesday, January 03rd, 2007.
      - diff --git a/vendor/plugins/maruku/tests/others/abbreviations.md b/vendor/plugins/maruku/tests/others/abbreviations.md deleted file mode 100644 index 06253d1e..00000000 --- a/vendor/plugins/maruku/tests/others/abbreviations.md +++ /dev/null @@ -1,11 +0,0 @@ - -The HTML specification is maintained by the W3C. - -*[HTML]: Hyper Text Markup Language -*[W3C]: World Wide Web Consortium - - - -Operation Tigra Genesis is going well. - -*[Tigra Genesis]: \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/others/blank.html b/vendor/plugins/maruku/tests/others/blank.html deleted file mode 100644 index 749c8ac0..00000000 --- a/vendor/plugins/maruku/tests/others/blank.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - -

      Linea 1

      - -

      Linea 2

      - -
      -
      -Created by Maruku at 00:19 on Wednesday, January 03rd, 2007.
      - diff --git a/vendor/plugins/maruku/tests/others/blank.md b/vendor/plugins/maruku/tests/others/blank.md deleted file mode 100644 index 78d83a21..00000000 --- a/vendor/plugins/maruku/tests/others/blank.md +++ /dev/null @@ -1,4 +0,0 @@ - -Linea 1 - -Linea 2 \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/others/code.html b/vendor/plugins/maruku/tests/others/code.html deleted file mode 100644 index ed7d1888..00000000 --- a/vendor/plugins/maruku/tests/others/code.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - -

      Here is an example of AppleScript:

      - -
      tell application "Foo"
      -    beep
      -end tell
      - -
      -
      -Created by Maruku at 00:19 on Wednesday, January 03rd, 2007.
      - diff --git a/vendor/plugins/maruku/tests/others/code.md b/vendor/plugins/maruku/tests/others/code.md deleted file mode 100644 index ce027b7b..00000000 --- a/vendor/plugins/maruku/tests/others/code.md +++ /dev/null @@ -1,5 +0,0 @@ -Here is an example of AppleScript: - - tell application "Foo" - beep - end tell diff --git a/vendor/plugins/maruku/tests/others/code2.html b/vendor/plugins/maruku/tests/others/code2.html deleted file mode 100644 index ead4ef40..00000000 --- a/vendor/plugins/maruku/tests/others/code2.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
      -

      This is a header.

      - -
        -
      1. This is the first list item.
      2. - -
      3. This is the second list item.
      4. -
      - -

      Here's some example code:

      - -
      return shell_exec("echo $input | $markdown_script");
      -
      - -
      -
      -Created by Maruku at 00:19 on Wednesday, January 03rd, 2007.
      - diff --git a/vendor/plugins/maruku/tests/others/code2.md b/vendor/plugins/maruku/tests/others/code2.md deleted file mode 100644 index eea196e9..00000000 --- a/vendor/plugins/maruku/tests/others/code2.md +++ /dev/null @@ -1,8 +0,0 @@ -> ## This is a header. -> -> 1. This is the first list item. -> 2. This is the second list item. -> -> Here's some example code: -> -> return shell_exec("echo $input | $markdown_script"); \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/others/code3.html b/vendor/plugins/maruku/tests/others/code3.html deleted file mode 100644 index 17c337e2..00000000 --- a/vendor/plugins/maruku/tests/others/code3.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - -

      This is code (4 spaces):

      - -
      Code
      - -

      This is not code

      - -
      Code
      -
      - -

      This is code (1 tab):

      - -
      Code
      - -

      This is not code

      - -
      Code
      - -
      -
      -Created by Maruku at 00:19 on Wednesday, January 03rd, 2007.
      - diff --git a/vendor/plugins/maruku/tests/others/code3.md b/vendor/plugins/maruku/tests/others/code3.md deleted file mode 100644 index fd3b027f..00000000 --- a/vendor/plugins/maruku/tests/others/code3.md +++ /dev/null @@ -1,16 +0,0 @@ - -This is code (4 spaces): - - Code -This is not code - - Code - -This is code (1 tab): - - Code -This is not code - - Code - - diff --git a/vendor/plugins/maruku/tests/others/email.html b/vendor/plugins/maruku/tests/others/email.html deleted file mode 100644 index 0b6b2357..00000000 --- a/vendor/plugins/maruku/tests/others/email.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - -

      This is an email address: andrea@invalid.it

      - -
      -
      -Created by Maruku at 00:19 on Wednesday, January 03rd, 2007.
      - diff --git a/vendor/plugins/maruku/tests/others/email.md b/vendor/plugins/maruku/tests/others/email.md deleted file mode 100644 index ed31f085..00000000 --- a/vendor/plugins/maruku/tests/others/email.md +++ /dev/null @@ -1,4 +0,0 @@ - - -This is an email address: - \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/others/entities.html b/vendor/plugins/maruku/tests/others/entities.html deleted file mode 100644 index afab3d30..00000000 --- a/vendor/plugins/maruku/tests/others/entities.html +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - -

      Maruku translates HTML entities to the equivalent in LaTeX:

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      EntityResult
      &copy;©
      &pound;£
      a&nbsp;ba b
      &lambda;λ
      &mdash;
      - -

      Entity-substitution does not happen in code blocks or inline code.

      - -

      The following should not be translated:

      - -
      &copy;
      -
      - -

      It should read just like this: &copy;.

      - -
      -
      -Created by Maruku at 00:19 on Wednesday, January 03rd, 2007.
      - diff --git a/vendor/plugins/maruku/tests/others/entities.md b/vendor/plugins/maruku/tests/others/entities.md deleted file mode 100644 index 56cb3e47..00000000 --- a/vendor/plugins/maruku/tests/others/entities.md +++ /dev/null @@ -1,19 +0,0 @@ -Maruku translates HTML entities to the equivalent in LaTeX: - -Entity | Result -------------|---------- -`©` | © -`£` | £ -`a b` | a b -`λ` | λ -`—` | — - - -Entity-substitution does not happen in code blocks or inline code. - -The following should not be translated: - - © - -It should read just like this: `©`. - diff --git a/vendor/plugins/maruku/tests/others/escaping.html b/vendor/plugins/maruku/tests/others/escaping.html deleted file mode 100644 index 3c39b1bc..00000000 --- a/vendor/plugins/maruku/tests/others/escaping.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -

      Hello: ! ! ` { } [ ] ( ) # . ! * *

      - -

      Ora, emphasis, bold, * <- due asterischi-> * , un underscore-> _ , emphasis, incrediblee!

      - -

      This is Code with an escape: -> ` <- (after)

      - -

      This is Code with a special: -> ` <-(after)

      - -

      Start of paragraph

      - -

      End of paragraph

      - -

      Exactly one space: and also here:

      - -
      -
      -Created by Maruku at 00:19 on Wednesday, January 03rd, 2007.
      - diff --git a/vendor/plugins/maruku/tests/others/escaping.md b/vendor/plugins/maruku/tests/others/escaping.md deleted file mode 100644 index b1b56f82..00000000 --- a/vendor/plugins/maruku/tests/others/escaping.md +++ /dev/null @@ -1,16 +0,0 @@ - Hello: ! \! \` \{ \} \[ \] \( \) \# \. \! * \* - - -Ora, *emphasis*, **bold**, * <- due asterischi-> * , un underscore-> _ , _emphasis_, - incre*dible*e! - - -This is ``Code with an escape: -> ` <- `` (after) - -This is ```Code with a special: -> ` <- ```(after) - -`Start ` of paragraph - -End of `paragraph ` - -Exactly one space: ` ` and also here: `` `` \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/others/extra_dl.html b/vendor/plugins/maruku/tests/others/extra_dl.html deleted file mode 100644 index 4801519e..00000000 --- a/vendor/plugins/maruku/tests/others/extra_dl.html +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - -
      -
      Apple
      - -
      Pomaceous fruit of plants of the genus Malus in the family Rosaceae.
      - -
      Orange
      - -
      The fruit of an evergreen tree of the genus Citrus.
      -
      - -
      - -
      -
      Apple
      - -
      Pomaceous fruit of plants of the genus Malus in the family Rosaceae
      - -
      Orange
      - -
      The fruit of an evergreen tree of the genus Citrus.
      -
      - -
      - -
      -
      Apple
      - -
      Pomaceous fruit of plants of the genus Malus in the family Rosaceae.
      - -
      An american computer company.
      - -
      Orange
      - -
      The fruit of an evergreen tree of the genus Citrus.
      -
      - -
      - -
      -
      Term 1
      - -
      Term 2
      - -
      Definition a
      - -
      Term 3
      - -
      Definition b
      -
      - -
      - -
      -
      Term 1
      - -
      Term 2
      - -
      Term 2a
      - -
      Term 2b
      - -
      Definition a
      - -
      Term 3
      - -
      Definition b
      -
      - -
      - -
      -
      Apple
      - -
      -

      Pomaceous fruit of plants of the genus Malus in the family Rosaceae.

      -
      - -
      Orange
      - -
      -

      The fruit of an evergreen tree of the genus Citrus.

      -
      -
      - -
      - -
      -
      Term 1
      - -
      -

      This is a definition with two paragraphs. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.

      - -

      Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.

      -
      - -
      -

      Second definition for term 1, also wrapped in a paragraph because of the blank line preceding it.

      -
      - -
      Term 2
      - -
      -

      This definition has a code block, a blockquote and a list.

      - -
      code block.
      -
      - -
      -

      block quote on two lines.

      -
      - -
        -
      1. first list item
      2. - -
      3. second list item
      4. -
      -
      -
      - -
      - -
      -
      Term 1
      - -
      Term 2
      - -
      Term 2a
      - -
      Term 2b
      - -
      Definition a
      -
      - -

      This is a paragraph

      - -
      -
      This is a term
      - -
      -

      definition

      -
      -
      - -
      -
      -Created by Maruku at 00:19 on Wednesday, January 03rd, 2007.
      - diff --git a/vendor/plugins/maruku/tests/others/extra_dl.md b/vendor/plugins/maruku/tests/others/extra_dl.md deleted file mode 100644 index f2747b01..00000000 --- a/vendor/plugins/maruku/tests/others/extra_dl.md +++ /dev/null @@ -1,101 +0,0 @@ -CSS: style.css - - -Apple -: Pomaceous fruit of plants of the genus Malus in - the family Rosaceae. - -Orange -: The fruit of an evergreen tree of the genus Citrus. - -*** - -Apple -: Pomaceous fruit of plants of the genus Malus in -the family Rosaceae. - -Orange -: The fruit of an evergreen tree of the genus Citrus. - - -*** - -Apple -: Pomaceous fruit of plants of the genus Malus in - the family Rosaceae. -: An american computer company. - -Orange -: The fruit of an evergreen tree of the genus Citrus. - -*** - -Term 1 -Term 2 -: Definition a - -Term 3 -: Definition b - -*** - - -Term 1 -Term 2 -Term 2a -Term 2b -: Definition a - -Term 3 -: Definition b - -*** - -Apple - -: Pomaceous fruit of plants of the genus Malus in - the family Rosaceae. - -Orange - -: The fruit of an evergreen tree of the genus Citrus. - -*** - -Term 1 - -: This is a definition with two paragraphs. Lorem ipsum - dolor sit amet, consectetuer adipiscing elit. Aliquam - hendrerit mi posuere lectus. - - Vestibulum enim wisi, viverra nec, fringilla in, laoreet - vitae, risus. - -: Second definition for term 1, also wrapped in a paragraph - because of the blank line preceding it. - -Term 2 - -: This definition has a code block, a blockquote and a list. - - code block. - - > block quote - > on two lines. - - 1. first list item - 2. second list item - -*** - -Term 1 -Term 2 -Term 2a -Term 2b -: Definition a - -This is a paragraph - -This is a term - -: definition \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/others/extra_header_id.html b/vendor/plugins/maruku/tests/others/extra_header_id.html deleted file mode 100644 index 86d8c215..00000000 --- a/vendor/plugins/maruku/tests/others/extra_header_id.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - -Header 1 - - -

      Header 1

      - -

      Header 2

      - -

      Header 3

      - -

      Then you can create links to different parts of the same document like this:

      - -

      Link back to header 1, Link back to header 2, Link back to header 3

      - -
      -
      -Created by Maruku at 00:19 on Wednesday, January 03rd, 2007.
      - diff --git a/vendor/plugins/maruku/tests/others/extra_header_id.md b/vendor/plugins/maruku/tests/others/extra_header_id.md deleted file mode 100644 index 05c1afd9..00000000 --- a/vendor/plugins/maruku/tests/others/extra_header_id.md +++ /dev/null @@ -1,13 +0,0 @@ -Header 1 {#header1} -======== - -Header 2 {#header2} --------- - -### Header 3 ### {#header3} - -Then you can create links to different parts of the same document like this: - -[Link back to header 1](#header1), -[Link back to header 2](#header2), -[Link back to header 3](#header3) diff --git a/vendor/plugins/maruku/tests/others/extra_table1.html b/vendor/plugins/maruku/tests/others/extra_table1.html deleted file mode 100644 index 7c383119..00000000 --- a/vendor/plugins/maruku/tests/others/extra_table1.html +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - -
      First HeaderSecond Header
      Content CellContent Cell
      Content CellContent Cell
      - -
      - - - - - - - - - - - - - - - - - - - - - - - -
      ItemValue
      Computer$1600
      Phone$12
      Pipe$1
      - -
      - - - - - - - - - - - - - - - - - -
      Function nameDescription
      help()Display the help window.
      destroy()Destroy your computer!
      - -
      - - - - - - - - - -
      Very long long head
      left
      - -
      - - - - - - - - - -
      Very long long head
      right
      - -
      - - - - - - - - - -
      Very long long head
      center
      - -
      -
      -Created by Maruku at 00:19 on Wednesday, January 03rd, 2007.
      - diff --git a/vendor/plugins/maruku/tests/others/extra_table1.md b/vendor/plugins/maruku/tests/others/extra_table1.md deleted file mode 100644 index c094f778..00000000 --- a/vendor/plugins/maruku/tests/others/extra_table1.md +++ /dev/null @@ -1,40 +0,0 @@ -CSS: style.css - -First Header | Second Header -------------- | ------------- -Content Cell | Content Cell -Content Cell | Content Cell - -*** - -| Item | Value | -| --------- | -----:| -| Computer | $1600 | -| Phone | $12 | -| Pipe | $1 | - -*** - -| Function name | Description | -| ------------- | ------------------------------ | -| `help()` | Display the help window. | -| `destroy()` | **Destroy your computer!** | - - -*** - -| Very long long head | -| :------------ | -| left | - -*** - -| Very long long head | -| -------------------: | -| right | - -*** - -| Very long long head | -| :------------------: | -| center | \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/others/footnotes.html b/vendor/plugins/maruku/tests/others/footnotes.html deleted file mode 100644 index 6ec9bdff..00000000 --- a/vendor/plugins/maruku/tests/others/footnotes.html +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - -

      That's some text with a footnote 1 and another 2 and another 3.

      - -

      This is not a footnote.

      - -
      -
      - -
        -
      1. -

        And that's the footnote. This is second sentence (same paragraph)

        -
      2. - -
      3. -

        This is the very long one.

        - -

        That's the second paragraph.

        -
      4. - -
      5. -

        And that's the footnote.

        - -

        That's the second paragraph of the footnote.

        -
      6. -
      -
      - -
      -
      -Created by Maruku at 00:19 on Wednesday, January 03rd, 2007.
      - diff --git a/vendor/plugins/maruku/tests/others/footnotes.md b/vendor/plugins/maruku/tests/others/footnotes.md deleted file mode 100644 index 5f8c9e7d..00000000 --- a/vendor/plugins/maruku/tests/others/footnotes.md +++ /dev/null @@ -1,17 +0,0 @@ -That's some text with a footnote [^b] and another [^c] and another [^a]. - -[^a]: And that's the footnote. - - That's the second paragraph of the footnote. - - -[^b]: And that's the footnote. -This is second sentence (same paragraph). - -[^c]: - This is the very long one. - - That's the second paragraph. - - -This is not a footnote. \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/others/headers.html b/vendor/plugins/maruku/tests/others/headers.html deleted file mode 100644 index ff49f33b..00000000 --- a/vendor/plugins/maruku/tests/others/headers.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - -A title with emphasis - - -

      A title with emphasis

      - -

      A title with emphasis

      - -

      A title with emphasis

      - -
      -
      -Created by Maruku at 00:19 on Wednesday, January 03rd, 2007.
      - diff --git a/vendor/plugins/maruku/tests/others/headers.md b/vendor/plugins/maruku/tests/others/headers.md deleted file mode 100644 index 5eef6825..00000000 --- a/vendor/plugins/maruku/tests/others/headers.md +++ /dev/null @@ -1,10 +0,0 @@ -A title with *emphasis* -======================= - -A title with *emphasis* ------------------------ - - -#### A title with *emphasis* #### - - diff --git a/vendor/plugins/maruku/tests/others/hrule.html b/vendor/plugins/maruku/tests/others/hrule.html deleted file mode 100644 index 9ebda12c..00000000 --- a/vendor/plugins/maruku/tests/others/hrule.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - -
      - -
      - -
      - -
      - -
      - -
      -
      -Created by Maruku at 00:19 on Wednesday, January 03rd, 2007.
      - diff --git a/vendor/plugins/maruku/tests/others/hrule.md b/vendor/plugins/maruku/tests/others/hrule.md deleted file mode 100644 index 8705b9e4..00000000 --- a/vendor/plugins/maruku/tests/others/hrule.md +++ /dev/null @@ -1,10 +0,0 @@ -* * * - -*** - -***** - -- - - - ---------------------------------------- - diff --git a/vendor/plugins/maruku/tests/others/images.html b/vendor/plugins/maruku/tests/others/images.html deleted file mode 100644 index 038a9059..00000000 --- a/vendor/plugins/maruku/tests/others/images.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - -

      This page does not utilizes

      - -

      Please mouseover to see the title:

      - -

      Please mouseover to see the title:

      - -

      I'll say it one more time: this page does not use

      - -

      This is double size:

      - -
      -
      -Created by Maruku at 00:19 on Wednesday, January 03rd, 2007.
      - diff --git a/vendor/plugins/maruku/tests/others/images.md b/vendor/plugins/maruku/tests/others/images.md deleted file mode 100644 index cbfd31bb..00000000 --- a/vendor/plugins/maruku/tests/others/images.md +++ /dev/null @@ -1,20 +0,0 @@ - -This page does not utilizes ![Cascading Style Sheets](http://jigsaw.w3.org/css-validator/images/vcss) - - -Please mouseover to see the title: ![Cascading Style Sheets](http://jigsaw.w3.org/css-validator/images/vcss "Title ok!") - -Please mouseover to see the title: ![Cascading Style Sheets](http://jigsaw.w3.org/css-validator/images/vcss 'Title ok!') - - -I'll say it one more time: this page does not use ![Cascading Style Sheets] [css] - -This is double size: ![Cascading Style Sheets] [css2] - - - -[css]: http://jigsaw.w3.org/css-validator/images/vcss "Optional title attribute" - -[css2]: http://jigsaw.w3.org/css-validator/images/vcss "Optional title attribute" class=external - style="border:0;width:188px;height:131px" - diff --git a/vendor/plugins/maruku/tests/others/inline_html.html b/vendor/plugins/maruku/tests/others/inline_html.html deleted file mode 100644 index 4676b031..00000000 --- a/vendor/plugins/maruku/tests/others/inline_html.html +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - -

      Input: Emphasis Result: Emphasis

      - -

      Input: Result on span:

      - -

      Result alone:

      - -

      Without closing:

      - -
      -

      This is true markdown text (paragraph)

      - -

      This is true markdown text (no paragraph)

      -
      - - - - - - - - - - - - -
      This is true markdown text. (no par) -

      This is true markdown text. (par)

      -
      - -

      The following is invalid HTML, and will generate an error:

      - -
      HTML parse error: 
      -<table>
      -<td markdown="1">This is *true* markdown text. (no par)</td>
      -<td markdown="block">This is *true* markdown text. (par)</td>
      -</tr>
      - -
      HTML parse error: 
      -</table>
      - -
      -
      -Created by Maruku at 00:19 on Wednesday, January 03rd, 2007.
      - diff --git a/vendor/plugins/maruku/tests/others/inline_html.md b/vendor/plugins/maruku/tests/others/inline_html.md deleted file mode 100644 index a5a68a18..00000000 --- a/vendor/plugins/maruku/tests/others/inline_html.md +++ /dev/null @@ -1,42 +0,0 @@ -CSS: style.css - -Input: - Emphasis -Result: Emphasis - -Input: - -Result on span: - -Result alone: - - - -Without closing: - - - -
      - This is *true* markdown text (paragraph) - -

      - This is *true* markdown text (no paragraph) -

      -
      - - - - - - -
      This is *true* markdown text. (no par)This is *true* markdown text. (par)
      - - -The following is invalid HTML, and will generate an error: - - - - - -
      This is *true* markdown text. (no par)This is *true* markdown text. (par)
      - diff --git a/vendor/plugins/maruku/tests/others/links.html b/vendor/plugins/maruku/tests/others/links.html deleted file mode 100644 index 21b9262e..00000000 --- a/vendor/plugins/maruku/tests/others/links.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - -

      Search on Google

      - -

      Search on Google

      - -

      Search on Google

      - -

      Search on Google

      - -

      Search on Google images

      - -

      Search on Google images

      - -

      Inline: Google images

      - -

      Inline with title: Google images

      - -

      Inline with title: Google images

      - -

      Search on http://www.gogole.com or http://Here.com or ask bill@google.com or you might ask bill@google.com.

      - -

      If all else fails, ask Google

      - -
      -
      -Created by Maruku at 00:19 on Wednesday, January 03rd, 2007.
      - diff --git a/vendor/plugins/maruku/tests/others/links.md b/vendor/plugins/maruku/tests/others/links.md deleted file mode 100644 index 9c6eac33..00000000 --- a/vendor/plugins/maruku/tests/others/links.md +++ /dev/null @@ -1,38 +0,0 @@ - -Search on [Google][] - -Search on [Google] [] - -Search on [Google] [google] - -Search on [Google] [Google] - -Search on [Google images][] - -Search on [Google images][ GoOgle_search ] - -Inline: [Google images](http://google.com) - -Inline with title: [Google images](http://google.com "Title") - -Inline with title: [Google images]( http://google.com "Title" ) - - -Search on or or ask -or you might ask bill@google.com. - -If all else fails, ask [Google](http://www.google.com) - -[google]: http://www.google.com - -[google2]: http://www.google.com 'Single quotes' - -[google3]: http://www.google.com "Double quotes" - -[google4]: http://www.google.com (Parenthesis) - -[Google Search]: - http://www.google.com "Google search" - -[Google Images]: - http://images.google.com (Google images) \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/others/list1.html b/vendor/plugins/maruku/tests/others/list1.html deleted file mode 100644 index 67ff8e3e..00000000 --- a/vendor/plugins/maruku/tests/others/list1.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - -
        -
      • -

        A list item with a blockquote:

        - -
        -

        This is a blockquote inside a list item.

        -
        -
      • -
      - -
      -
      -Created by Maruku at 00:19 on Wednesday, January 03rd, 2007.
      - diff --git a/vendor/plugins/maruku/tests/others/list1.md b/vendor/plugins/maruku/tests/others/list1.md deleted file mode 100644 index 68c79a91..00000000 --- a/vendor/plugins/maruku/tests/others/list1.md +++ /dev/null @@ -1,4 +0,0 @@ -* A list item with a blockquote: - - > This is a blockquote - > inside a list item. diff --git a/vendor/plugins/maruku/tests/others/list2.html b/vendor/plugins/maruku/tests/others/list2.html deleted file mode 100644 index e4a69095..00000000 --- a/vendor/plugins/maruku/tests/others/list2.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - -
        -
      • -

        This is a list item with two paragraphs.

        - -

        This is the second paragraph in the list item. You're only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit

        -
      • -
      - -
      -
      -Created by Maruku at 00:19 on Wednesday, January 03rd, 2007.
      - diff --git a/vendor/plugins/maruku/tests/others/list2.md b/vendor/plugins/maruku/tests/others/list2.md deleted file mode 100644 index db67519d..00000000 --- a/vendor/plugins/maruku/tests/others/list2.md +++ /dev/null @@ -1,5 +0,0 @@ -* This is a list item with two paragraphs. - - 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. diff --git a/vendor/plugins/maruku/tests/others/list3.html b/vendor/plugins/maruku/tests/others/list3.html deleted file mode 100644 index b9398cd1..00000000 --- a/vendor/plugins/maruku/tests/others/list3.html +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - -
        -
      • -

        A list item with a blockquote:

        - -
        -

        This is a blockquote inside a list item.

        -
        -
      • - -
      • -

        A list item with a code block:

        - -
        <code goes here>
        -
      • -
      - -
      -
      -Created by Maruku at 00:19 on Wednesday, January 03rd, 2007.
      - diff --git a/vendor/plugins/maruku/tests/others/list3.md b/vendor/plugins/maruku/tests/others/list3.md deleted file mode 100644 index 8cec2562..00000000 --- a/vendor/plugins/maruku/tests/others/list3.md +++ /dev/null @@ -1,8 +0,0 @@ -* A list item with a blockquote: - - > This is a blockquote - > inside a list item. - -* A list item with a code block: - - \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/others/lists.html b/vendor/plugins/maruku/tests/others/lists.html deleted file mode 100644 index 10f8e3c0..00000000 --- a/vendor/plugins/maruku/tests/others/lists.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - -
        -
      • 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.
      • -
      - -

      Ancora

      - -
        -
      • -

        This 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.

        -
      • -
      - -

      Ancora

      - -
        -
      • -

        This is a list item with two paragraphs.

        - -

        This is the second paragraph in the list item. You're only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit

        -
      • - -
      • -

        Another item in the same list.

        -
      • -
      - -
      -
      -Created by Maruku at 00:19 on Wednesday, January 03rd, 2007.
      - diff --git a/vendor/plugins/maruku/tests/others/lists.md b/vendor/plugins/maruku/tests/others/lists.md deleted file mode 100644 index 9cfdde28..00000000 --- a/vendor/plugins/maruku/tests/others/lists.md +++ /dev/null @@ -1,32 +0,0 @@ -* 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. - -Ancora - -* This 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. - - -Ancora - -* This is a list item with two paragraphs. - - 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. - -* Another item in the same list. \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/others/lists_after_paragraph.html b/vendor/plugins/maruku/tests/others/lists_after_paragraph.html deleted file mode 100644 index f3d24912..00000000 --- a/vendor/plugins/maruku/tests/others/lists_after_paragraph.html +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - -

      Paragraph, list with no space: * ciao

      - -

      Paragraph, list with 1 space: * ciao

      - -

      Paragraph, list with 3 space: * ciao

      - -

      Paragraph, list with 4 spaces: * ciao

      - -

      Paragraph, list with 1 tab: * ciao

      - -

      Paragraph (1 space after), list with no space: * ciao

      - -

      Paragraph (2 spaces after), list with no space:
      -* ciao

      - -

      Paragraph (3 spaces after), list with no space:
      -* ciao

      - -

      Paragraph with block quote:

      - -
      -

      Quoted

      -
      - -

      Paragraph with header:

      - - - -

      Paragraph with header on two lines:

      - - - -

      Paragraph with html after

      - -
      - -

      Paragraph with html after, indented: Emphasis

      - -

      Paragraph with html after, indented: Emphasis tralla Emph

      - -

      Paragraph with html after, indented: Emphasis *tralla* Emph

      - -
      -
      -Created by Maruku at 00:19 on Wednesday, January 03rd, 2007.
      - diff --git a/vendor/plugins/maruku/tests/others/lists_after_paragraph.markdown-pl b/vendor/plugins/maruku/tests/others/lists_after_paragraph.markdown-pl deleted file mode 100644 index d44ac8e7..00000000 --- a/vendor/plugins/maruku/tests/others/lists_after_paragraph.markdown-pl +++ /dev/null @@ -1,23 +0,0 @@ -

      Paragraph, list with no space: -* ciao

      - -

      Paragraph, list with 1 space: - * ciao

      - -

      Paragraph, list with 3 space: - * ciao

      - -

      Paragraph, list with 4 spaces: - * ciao

      - -

      Paragraph, list with 1 tab: - * ciao

      - -

      Paragraph (1 space after), list with no space: -* ciao

      - -

      Paragraph (2 spaces after), list with no space:
      -* ciao

      - -

      Paragraph (3 spaces after), list with no space:
      -* ciao

      diff --git a/vendor/plugins/maruku/tests/others/lists_after_paragraph.md b/vendor/plugins/maruku/tests/others/lists_after_paragraph.md deleted file mode 100644 index 441d39c2..00000000 --- a/vendor/plugins/maruku/tests/others/lists_after_paragraph.md +++ /dev/null @@ -1,44 +0,0 @@ -Paragraph, list with no space: -* ciao - -Paragraph, list with 1 space: - * ciao - -Paragraph, list with 3 space: - * ciao - -Paragraph, list with 4 spaces: - * ciao - -Paragraph, list with 1 tab: - * ciao - -Paragraph (1 space after), list with no space: -* ciao - -Paragraph (2 spaces after), list with no space: -* ciao - -Paragraph (3 spaces after), list with no space: -* ciao - -Paragraph with block quote: -> Quoted - -Paragraph with header: -### header ### - -Paragraph with header on two lines: -header ------- - - -Paragraph with html after -
      - -Paragraph with html after, indented: - Emphasis - -Paragraph with html after, indented: Emphasis *tralla* Emph - -Paragraph with html after, indented: Emphasis *tralla* Emph diff --git a/vendor/plugins/maruku/tests/others/lists_ol.html b/vendor/plugins/maruku/tests/others/lists_ol.html deleted file mode 100644 index ea4e4c60..00000000 --- a/vendor/plugins/maruku/tests/others/lists_ol.html +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - -
        -
      1. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
      2. - -
      3. Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.
      4. - -
      5. Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing
      6. - -
      7. Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing
      8. - -
      9. Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse id sem consectetuer libero luctus adipiscing.
      10. -
      - -

      Ancora

      - -
        -
      1. -

        This is a list item with two paragraphs. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.

        - -

        ATTENZIONE!

        - -
          -
        • Uno
        • - -
        • Due 1. tre 1. tre 1. tre
        • - -
        • Due
        • -
        -
      2. - -
      3. -

        Suspendisse id sem consectetuer libero luctus adipiscing.

        -
      4. -
      - -

      Ancora

      - -
        -
      • -

        This is a list item with two paragraphs.

        - -

        This is the second paragraph in the list item. You're only required to indent the first line. Lorem ipsum dolo sit amet, consectetuer adipiscing elit

        -
      • - -
      • -

        Another item in the same list.

        -
      • -
      - -
      -
      -Created by Maruku at 00:19 on Wednesday, January 03rd, 2007.
      - diff --git a/vendor/plugins/maruku/tests/others/lists_ol.md b/vendor/plugins/maruku/tests/others/lists_ol.md deleted file mode 100644 index 3e5d699e..00000000 --- a/vendor/plugins/maruku/tests/others/lists_ol.md +++ /dev/null @@ -1,39 +0,0 @@ -1. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. - Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi, - viverra nec, fringilla in, laoreet vitae, risus. - 2. Donec sit amet nisl. Aliquam semper ipsum sit amet velit. - Suspendisse id sem consectetuer libero luctus adipiscing. -3. Donec sit amet nisl. Aliquam semper ipsum sit amet velit. -Suspendisse id sem consectetuer libero luctus adipiscing. - 3. Donec sit amet nisl. Aliquam semper ipsum sit amet velit. -Suspendisse id sem consectetuer libero luctus adipiscing. - 4. Donec sit amet nisl. Aliquam semper ipsum sit amet velit. - Suspendisse id sem consectetuer libero luctus adipiscing. - -Ancora - -1. This is a list item with two paragraphs. Lorem ipsum dolor - sit amet, consectetuer adipiscing elit. Aliquam hendrerit - mi posuere lectus. - - ATTENZIONE! - - - Uno - - Due - 1. tre - 1. tre - 1. tre - - Due - -2. Suspendisse id sem consectetuer libero luctus adipiscing. - - -Ancora - -* This is a list item with two paragraphs. - - 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. - -* Another item in the same list. \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/others/misc_sw.html b/vendor/plugins/maruku/tests/others/misc_sw.html deleted file mode 100644 index 493c4251..00000000 --- a/vendor/plugins/maruku/tests/others/misc_sw.html +++ /dev/null @@ -1,92 +0,0 @@ - - - - -Software not painful to use - - -

      General

      - -
        -
      • Operating System : Mac OS X: heaven, after the purgatory of Linux and the hell of Windows.
      • - -
      • Browser: Firefox. On a Mac, Camino.
      • - -
      • Email: GMail, "search, don't sort" really works.
      • - -
      • Text Editor: TextMate, you have to buy it, but it's worth every penny. There are rumours that it's been converting (recovering) Emacs users (addicts). Unfortunately, it's Mac only. An alternative is jedit (GPL, Java).
      • -
      - -

      Development

      - -
        -
      • -

        Build system: cmake, throw the autotools away.

        -
      • - -
      • -

        Source code control system: ditch CVS for subversion.

        -
      • - -
      • -

        Project management: Trac tracks everything.

        -
      • - -
      • -

        Scripting language: Ruby is Japanese pragmatism (and has a poignant guide). Python, you say? Python is too academic and snob:

        - -
        $ python       
        -Python 2.4.1 (\#1, Jun  4 2005, 00:54:33) 
        -Type "help", "copyright", "credits" or "license" for more information.
        ->>> exit
        -'Use Ctrl-D (i.e. EOF) to exit.'
        ->>> quit
        -'Use Ctrl-D (i.e. EOF) to exit.'
        -
      • - -
      • -

        Java IDE: JBuilder is great software and has a free version (IMHO better than Eclipse). Java is not a pain anymore since it gained generics and got opensourced.

        -
      • - -
      • -

        Mark-up language: HTML is so 2001, why don't you take at look at Markdown? Look at the source of this page.

        -
      • - -
      • -

        C+ libraries: QT for GUIs. * GSL for math. * Magick++ for manipulating images. * Cairo for creating PDFs. * Boost for just about everything else.

        -
      • -
      - -

      Research

      - -
        -
      • Writing papers: LaTeX
      • - -
      • Writing papers & enjoying the process: LyX
      • - -
      • Handsome figures in your papers: xfig or, better, jfig.
      • - -
      • The occasional presentation with many graphical content: OpenOffice Impress (using the OOOlatex plugin); the alternative is PowerPoint with the TexPoint plugin.
      • - -
      • Managing BibTeX: jabref: multi-platform, for all your bibtex needs.
      • - -
      • IEEExplore and BibTeX: convert citations using BibConverter.
      • -
      - -

      Cool websites

      - - - -
      -
      -Created by Maruku at 00:19 on Wednesday, January 03rd, 2007.
      - diff --git a/vendor/plugins/maruku/tests/others/misc_sw.md b/vendor/plugins/maruku/tests/others/misc_sw.md deleted file mode 100644 index 2ba51cc1..00000000 --- a/vendor/plugins/maruku/tests/others/misc_sw.md +++ /dev/null @@ -1,105 +0,0 @@ -Subject: Software not painful to use -Subject_short: painless software -Topic: /misc/coolsw -Archive: no -Date: Nov 20 2006 -Order: -9.5 -inMenu: true - - -### General ### - -* *Operating System* : [Mac OS X][switch]: heaven, after the purgatory of Linux - and the hell of Windows. -* *Browser*: [Firefox][firefox]. On a Mac, [Camino][camino]. -* *Email*: [GMail][gmail], "search, don't sort" really works. -* *Text Editor*: [TextMate][textmate], you have to buy it, but it's worth every - penny. There are rumours that it's been converting (recovering) Emacs - users (addicts). Unfortunately, it's Mac only. An alternative is - [jedit][jedit] (GPL, Java). - -### Development ### - -* *Build system*: [cmake][cmake], throw the [autotools][autotools] away. -* *Source code control system*: ditch CVS for [subversion][subversion]. -* *Project management*: [Trac][trac] tracks everything. -* *Scripting language*: [Ruby][ruby] is Japanese pragmatism (and has a [poignant][poignant] guide). - Python, you say? Python is too academic and snob: - - $ python - Python 2.4.1 (\#1, Jun 4 2005, 00:54:33) - Type "help", "copyright", "credits" or "license" for more information. - >>> exit - 'Use Ctrl-D (i.e. EOF) to exit.' - >>> quit - 'Use Ctrl-D (i.e. EOF) to exit.' - -* *Java IDE*: [JBuilder][jbuilder] is great software and has a free version (IMHO better than Eclipse). Java - is not a pain anymore since it gained [generics][java-generics] and got opensourced. -* *Mark-up language*: HTML is so 2001, why don't you take at look at [Markdown][markdown]? [Look at the source of this page](data/misc_markdown.png). -* *C++ libraries*: - * [QT][qt] for GUIs. - * [GSL][gsl] for math. - * [Magick++][magick] for manipulating images. - * [Cairo][cairo] for creating PDFs. - * [Boost][boost] for just about everything else. - - -### Research ### - -* *Writing papers*: [LaTeX][latex] -* *Writing papers & enjoying the process*: [LyX][lyx] -* *Handsome figures in your papers*: [xfig][xfig] or, better, [jfig][jfig]. -* *The occasional presentation with many graphical content*: - [OpenOffice Impress][impress] (using the [OOOlatex plugin][ooolatex]); - the alternative is PowerPoint with the [TexPoint][texpoint] plugin. -* *Managing BibTeX*: [jabref][jabref]: multi-platform, for all your bibtex needs. -* *IEEExplore and BibTeX*: convert citations using [BibConverter][bibconverter]. - -### Cool websites ### - -* *Best site in the wwworld*: [Wikipedia][wikipedia] -* [Mutopia][mutopia] for sheet music; [the Gutenberg Project][gutenberg] for books; [LiberLiber][liberliber] for books in italian. -* *Blogs*: [Bloglines][bloglines] -* *Sharing photos*: [flickr][flickr] exposes an API you can use. - - -[firefox]: http://getfirefox.com/ -[gmail]: http://gmail.com/ -[bloglines]: http://bloglines.com/ -[wikipedia]: http://en.wikipedia.org/ -[ruby]: http://www.ruby-lang.org/ -[poignant]: http://poignantguide.net/ruby/ -[webgen]: http://webgen.rubyforge.org/ -[markdown]: http://daringfireball.net/projects/markdown/ -[latex]: http://en.wikipedia.org/wiki/LaTeX -[lyx]: http://www.lyx.org -[impress]: http://www.openoffice.org/product/impress.html -[ooolatex]: http://ooolatex.sourceforge.net/ -[texpoint]: http://texpoint.necula.org/ -[jabref]: http://jabref.sourceforge.net/ -[camino]: http://www.caminobrowser.org/ -[switch]: http://www.apple.com/getamac/ -[textmate]: http://www.apple.com/getamac/ -[cmake]: http://www.cmake.org/ -[xfig]: http://www.xfig.org/ -[jfig]: http://tams-www.informatik.uni-hamburg.de/applets/jfig/ -[subversion]: http://subversion.tigris.org -[jbuilder]: http://www.borland.com/us/products/jbuilder/index.html -[flickr]: http://www.flickr.com/ -[myflickr]: http://www.flickr.com/photos/censi -[bibconverter]: http://www.bibconverter.net/ieeexplore/ -[autotools]: http://sources.redhat.com/autobook/ -[jedit]: http://www.jedit.org/ -[qt]: http://www.trolltech.no/ -[gsl]: http://www.gnu.org/software/gsl/ -[magick]: http://www.imagemagick.org/Magick++/ -[cairo]: http://cairographics.org/ -[boost]: http://www.boost.org/ -[markdown]: http://en.wikipedia.org/wiki/Markdown -[trac]: http://trac.edgewall.org/ -[mutopia]: http://www.mutopiaproject.org/ -[liberliber]: http://www.liberliber.it/ -[gutenberg]: http://www.gutenberg.org/ -[java-generics]: http://java.sun.com/j2se/1.5.0/docs/guide/language/generics.html - diff --git a/vendor/plugins/maruku/tests/others/one.html b/vendor/plugins/maruku/tests/others/one.html deleted file mode 100644 index dd72f1c8..00000000 --- a/vendor/plugins/maruku/tests/others/one.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - -

      One line

      - -
      -
      -Created by Maruku at 00:19 on Wednesday, January 03rd, 2007.
      - diff --git a/vendor/plugins/maruku/tests/others/one.md b/vendor/plugins/maruku/tests/others/one.md deleted file mode 100644 index 7452380b..00000000 --- a/vendor/plugins/maruku/tests/others/one.md +++ /dev/null @@ -1 +0,0 @@ -One line \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/others/paragraphs.html b/vendor/plugins/maruku/tests/others/paragraphs.html deleted file mode 100644 index 97ca3038..00000000 --- a/vendor/plugins/maruku/tests/others/paragraphs.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - -

      Paragraph 1

      - -

      Paragraph 2

      - -

      Paragraph 3 Paragraph 4 Paragraph Br->
      -Paragraph 5

      - -

      Escaping: & { } !

      - -
      -
      -Created by Maruku at 00:19 on Wednesday, January 03rd, 2007.
      - diff --git a/vendor/plugins/maruku/tests/others/paragraphs.md b/vendor/plugins/maruku/tests/others/paragraphs.md deleted file mode 100644 index 2fc20f52..00000000 --- a/vendor/plugins/maruku/tests/others/paragraphs.md +++ /dev/null @@ -1,13 +0,0 @@ -Paragraph 1 - -Paragraph 2 - - -Paragraph 3 -Paragraph 4 -Paragraph Br-> -Paragraph 5 - - - -Escaping: & { } [ ] ! diff --git a/vendor/plugins/maruku/tests/others/sss06.html b/vendor/plugins/maruku/tests/others/sss06.html deleted file mode 100644 index e227a0a7..00000000 --- a/vendor/plugins/maruku/tests/others/sss06.html +++ /dev/null @@ -1,227 +0,0 @@ - - - A report about Oxford and the 2006 SLAM Summer SchoolA report about Oxford and the 2006 SLAM Summer School

      Let me quote the words of a renowned Oxford scholar:

      "Life is too important to be taken seriously."

      If you do not wholeheartedly agree with this statement, please stop reading this.


      I stayed three weeks in Oxford: one week for the SLAM school and, before that, two weeks for an English course. You might ask: why? A very good question indeed - "Why I am not on a sunny beach?" - I kept asking myself as I walked down the misty alleys of the old town, wearing a scarf on August, 16th, and realizing that - maybe - I would not need the three pairs of shorts and the swimsuit I had brought.

      Summary:

      1. The Queen's English
      2. The Harry Potter experience
      3. Parsnip, Marmite and the tea conspiracy
      4. The Summer School
      5. Minor open issues in SLAM

      Appendix: How to offend seven nationalities at once

      I. The Queen's English

      It turns out that a course of English at an advanced level is mostly about vocabulary and idioms: by the end of the first week I knew seven different ways to address a "promiscuous" woman, and I can tell which ones are applicable to American and which to British English. It remains to be seen how this will benefit my academic writing.

      It was a lot of fun to learn the differences (or, as the teacher put it, "to purify my English after years of prolonged unhealthy exposure to American media"), which are not only linguistic, but above all in attitude and social norms. For example, in the US the first question that people ask you is "What do you do?" (meaning: "How much do you earn?"), while in England such a question would be felt as unnecessary direct and impolite. As a rule, it is compulsory to exchange comments about the weather, and there is a lot of specialized vocabulary for this; the following table might prove handy to understand your acquaintance:

      • "It's a lovely day!" = "It doesn't rain"
      • "It's a nice day!" = "It doesn't rain heavily"
      • "What a wonderful day!"="This morning, at 10:13, I caught a glimpse of the sun"

      (the correct answer to any of these is "isn't it?")

      II. The Harry Potter experience

      flickr: http://www.flickr.com/photos/censi/232006603/

      During my three-week stay I tried my best to immerse myself in the English atmosphere.

      I went to a place called Oxford Story 3, where we paid £7 to go through a painfully slow indoor ride, sat on a mobile school-desk in the dark for 25 minutes. It is the claustrophobic equivalent of the American Epcot center in Disney World.

      At Epcot, I learned that the final goal of all the scientific progress in the last three millennia was to let Walt Disney broadcast Snow White using Siemens equipment (Siemens sponsored the ride). In Oxford, I learned that the glorious University is the repository of all human knowledge, and that the English understatement is a legend. At the end of the ride, I was amazed that in Italy I had managed to learn to read and write.

      flickr: http://www.flickr.com/photos/censi/232023681/

      Still, one thing the ride did not explain is how the well-educated, smart elite students of Oxford can possibly find rowing fun -- (probably it IS fun, compared to cricket).

      flickr: http://www.flickr.com/photos/censi/232529032/

      I went to a candle-light baroque concert in the Exeter college chapel. The ensemble was 75% Asian, all Oxford researchers, and we were given a twenty minute speech about the effort they put in the historical research of this obscure composer, that they had a microfilm of the original manuscript delivered from a German library, that the viola would be played in the original style, blah blah blah. Only in Oxford!

      flickr: http://www.flickr.com/photos/censi/232031895/

      I read "The Hobbit" (Tolkien was a fellow of Exeter college) - I discovered that the only two peoples in the known and invented universes to have the concept of a "second breakfast" are Hobbits and Italians.

      I watched a performance of MacBeth at an open-air theatre. I couldn't understand but one sentence, which is worth mentioning: "Alcohol provokes the desire, but it takes away the performance"

      Regarding alcohol, England is one of the places where you can't drink if you are under 21 (in Italy, at 18 you have decided to quit). Young people have their ID checked at the entrance of pubs and in liquor stores: that's only a minor annoyance, as they just need to wait outside the store for the first Spanish guy passing by that will buy the wine for them (and be compensated with just the change - did you keep the penny, Felix?).

      Anyway the guys at the door use the ID checking mostly as a form of flattery: "You are 32? I thought you were 20!" is probably the best pick-up line that the English can come up with.

      The other characteristic thing is that in English pubs there is no table service: you have to walk to the bar and ask by yourself. The first time can be confusing: and you can spend quite some time waiting at the table whining about the "poor service".

      III. Parsnip, Marmite & the tea conspiracy

      During the first week I was a guest of a lovely 79-year-old lady. Working at the University, she made a point of speaking very posh English. And she made a point of cooking traditional English food. The typical English dish is some meat with two vegetables aside. For the vegetables, pick any two in {parsnip, carrot, potato}.

      Don't look in your dictionary for a translation of "parsnip" as probably there isn't one. The lady would tell me that in the next-to-last century, this famous professor spent years raising the finest crossbreed of Parsnip as to finally obtain what is best described as a big white carrot with no taste whatsoever 4.

      Nevertheless, the many regional variants give spectacular variety to the English cuisine: the two vegetables can be boiled, fried, baked, microwaved, or roasted. There exist also exotic twists, in which the vegetables are put on top of the meat, or underneath, or even inside. In important occasions, the recipes stay the same but gain a French name.

      flickr: http://www.flickr.com/photos/censi/232526897/

      I tried a thing called Marmite, which the teacher sold to me as "the British answer to Nutella". It has the aspect and consistency of engine grease, and, as far as I know, also the taste is similar (I've never tasted the grease, but next time, presented with choice, I'd give it a go).

      The austerity of English food can be explained by the pitiless weather; but how can you explain Marmite, if not with alimentary masochism?

      But... there's one thing that is much better in England: tea. Wherever I tried it (at the old lady's, at tearooms, at coffee breaks) it was sooo delicious. In Italy we don't get the real thing. Why is that? Is this some sort of conspiracy orchestrated by the Italian coffee producers? And is it the tea cartello which does not allow good coffee to be imported in England?

      IV. The Summer School

      If you go for a career in research, in general you don't get much money, or fame, and you don't get to rescue the princess either. The two benefits that you do get are: playing with very expensive toys and the occasional trip in which you meet all sort of people.

      And when you talk with them, it's sort of strange to realize that your interlocutor is one of the 5 people - worldwide - that actually care about your research theme, and yet the things you have in common end there, as he has different culture, race, religion, and while you two happen to agree that Lie brackets are an indispensable tool to characterize the propagation of errors on the Euclidean group, you have very different answers to the important questions about life, the universe and everything. (In these cases I have anecdotal proof that it is much better to stick to research talk, and to avoid at all costs the kind of jokes that you can find in the Appendix).

      Instead, at this particular school, I would say that the European character was clearly perceived, and I enjoyed it -- but whether England is in Europe is a delicate matter.

      Here are some impressions of the people.

      • Juan Domingo Tardos (aka Mingo) is the funniest of the bunch, the man you want to go partying with.

        He taught us two deep truths about SLAM and life: 1. The size of your banana matters. 2. Never under-estimate the size of your lemons.

        I thought: wow, I want to write a paper with "banana" in the title - finally some inspiration from the school! I already had big projects for Fig. 1,2 and a full-page Fig. 3, but after a little googling I found: "Functional Programming with Bananas, Lenses, Envelopes and Barbed Wire"5 "Dealing with large bananas" 6. I gave up: I cannot beat this last one. And the existence of 6 proves once again that SLAM is a solved problem.

      • Paul Newman, the organizer, told us, more than once, that the future of SLAM is in long term operation if we want the systems to be reliable. (Personally, I disagree: I think that it is possible to build anything at the desired level of reliability, given reasonable funding, time, and an appropriate number of German engineers)

      • One of the lessons learned in the school is that almost everything has already been done by someone else. More specifically, most of the things have already been done by Durrant-Whyte some twenty years ago, when men were men, CS was electrical engineering, master students knew calculus, and Kalman filters ran free in the wild lands of Australia.

      • Frank Dellaert is a jolly chap as well, and he does interesting things with graphs. As he introduced three different formalisms in the first three slides, I regretted not to have put more CS in my curriculum, then shut my eyes. Interestingly, at summer schools and conferences, if you close your eyes people assume that you are very smart and that you are thinking about some new impressive algorithm -- I was just dreaming of a sunny beach.

      • Henrik Christensen has implemented SLAM on the cleaning robot for $45 in sensors and electronics. It puts things in perspective, especially if you consider that I paid £16 for a one-hour coach trip from Heathrow to Oxford.

      • Andy Davison is a wonderful person, he tutored the practicals with infinite patience. Never did I meet such a knowledgeable, affable, and humble person. (Probably he is the kind of person that some day will show up at work with automatic guns)

      • Wolfram Burgard - he wins my "best robot" award for the photo of our beloved Albert 7.

      • Dieter Fox wins "most nostalgic slide from the 90s": and every time we feel the same emotion as the first time.

      • Kurt Konolige reminded me why I bought a Mac.

      • Simon Lacroix - Once we sat at the same table during lunch. While he talked with Dellaert, he would send me alarmed glances, the kind of glances that you would reserve to a relative returning from death. I wanted to ask him why, but then I decided I'd better not to (was I so wasted from the night before?).

      • Simon Julier -- he seems very smart, but he lost me between slide #3 and #4. I started to be seasick from all those covariance matrices - so I muttered to my neighbours: "I wonder whether it still holds in higher-dimensional spaces...", then I closed my eyes and was back again on the sunny beach.

      • But all in all, the most interesting presentation was the magical show that Davide Scaramuzza (who at daytime pretends to work at ETHZ) gave to a selected audience after the banquet (8). It was another confirmation that all the time spent in front of a monitor is, in fact, wasted, and all of us should have studied card tricks instead: you have NO IDEA of how a girl's face brightens up and her eyes expand when she watches a magician.

      V. Other minor issues in SLAM

      We all know that the most important open problem in SLAM is that there are not enough women doing research in the area and coming at summer schools. As for the other minor issues, this is the result of asking "What is the future of SLAM?" to a random sampling of the participants. (the list does not include answers given after 10:00 PM)

      • For 30% of the respondents, SLAM is a solved problem, and we just need some German engineers to work out the details of the implementations.
      • Long term operation: make filters that reconsider their decisions at a a later time (so not delaying decisions, but explicitly reconsider).
      • Make it robust for real applications: or, your method should work in more than one experiment and possibly also outside of your lab.
      • Put more knowledge in SLAM about the environment. Teach your filter what is a tree, a road, a mirror so that it can make smarter decisions.
      • Active SLAM and SLAM-guided exploration (once we figure out good acronyms).
      • Some boring work is to be done for taking into account linearization errors in the already existing results about consistency, sparsity, etc.
      • "Where can I get some real coffee?" (2 people)
      • Methods and representations for real sensor fusion (laser, camera, etc).
      • Do robust stuff with a single camera. Omnidirectional cameras are cool. Mix different techniques at different time-scales: visual odometry between frames, then stable features, then databases of places to close the loop (or don't close the loop at all).

      Appendix. How to offend seven nationalities at once

      In Oxford I learned the ultimate rude stereotypical joke -- I think it's worth sharing.

      Heaven & Hell

      In Heaven: the policemen are British, mechanics are German, chefs are French, wives are Japanese, neighbours are Dutch, lovers are Italian, and the Swiss organize it all.

      In Hell: the policemen are German, mechanics are French, chefs are British, neighbours are Japanese, wives are Dutch, lovers are Swiss, and the Italians organize it all.

      For related work, see for example 9, 10.

      And here's the research version:

      The BEST international research project

      • The French do the overall math analysis,
      • a Chinese refines a ten-line proof of the main Theorem,
      • the Germans design the implementation,
      • Japanese undergrads do the actual work,
      • the British write the paper,
      • an American gives the presentation,
      • the Spanish organize the social events,
      • and the Italians organize the banquet.

      The WORST international research project

      • The Germans do the overall math analysis,
      • an American PhD student spends 10 CPU year on his department's 48-node cluster and proves with a Monte Carlo simulation in Matlab tha Theorem 1 indeed holds for some values of the parameters
      • the French design the implementation,
      • one Spanish undergrad does the actual work,
      • the Italians write the papers,
      • a Chinese gives the presentation,
      • the Japanese organize the social events,
      • and the British organize the banquet.

      :-)

      Flickr: http://www.flickr.com/photos/censi/232003838

      References

      [1] http://www.spellingsociety.org/news/media/poems.php
      [2]
      http://www.flickr.com/photos/censi/236722418/
      [3]

      //www.oxfords
      y.co.uk](http://www.oxfordstory.co.uk)
      [4]
      ttp://www.botani
      .com/botanical/mg

      arsni12.html](
      p://www.botanical.com/botanical/mgmh/p/parsni12.html )
      [5]

      ijer, M. Fokkinga, R
      aterson. "F
      tional Programmin
      ith Bananas, Lenses, Envelopes and Barbed Wire"
      991)
      http://c
      seer.ist.psu.edu/
      jer91functional.
      l

      [6]
      Lammel, J. Visser, J. Kort. "Dealing

      large bananas" (2000) http://citeseer.ist.psu.edu/lammel00dealing.html
      [7] http://www.informatik.uni-freiburg.de/
      rgard/

      [8]
      tp://asl.epfl.ch/~scaramuz/cabaret/cabaret.wmv](http://asl.epfl.ch/~scaramuz/cabaret/cabaret.wmv)
      [9] http://www.anth.uconn.edu/faculty/boster/cultvar/euweb/
      [10] http://www.infonegocio.com/xeron/bruno/italy.html


      Created by Maruku at 02:13 on Monday, January 01st, 2007.
      diff --git a/vendor/plugins/maruku/tests/others/sss06.md b/vendor/plugins/maruku/tests/others/sss06.md deleted file mode 100644 index fbe8b4fa..00000000 --- a/vendor/plugins/maruku/tests/others/sss06.md +++ /dev/null @@ -1,352 +0,0 @@ -Category: sss06 -Date: Sep 10 2006 -From: "Andrea Censi" -Subject: A report about Oxford and the 2006 SLAM Summer School -Encoding: BlueCloth FlickrHTML -format: bluecloth> -inMenu: true - -Let me quote the words of a renowned Oxford scholar: - -> "Life is too important to be taken seriously." - -If you do not wholeheartedly agree with this statement, -please stop reading this. - ----------------------- - -I stayed three weeks in Oxford: one week for the SLAM school and, -before that, two weeks for an English course. You might ask: why? -A very good question indeed - "Why I am not on a sunny beach?" - -I kept asking myself as I walked down the misty alleys of the old town, -wearing a scarf on August, 16th, and realizing that - maybe - I would not -need the three pairs of shorts and the swimsuit I had brought. - - -Summary: - -1. The Queen's English -2. The Harry Potter experience -3. Parsnip, Marmite and the tea conspiracy -4. The Summer School -5. Minor open issues in SLAM - -> Appendix: How to offend seven nationalities at once - -`I`. The Queen's English ----------------------- - -It turns out that a course of English at an advanced level is mostly -about vocabulary and idioms: by the end of the first week I knew seven -different ways to address a "promiscuous" woman, and I can tell which ones -are applicable to American and which to British English. It remains to be -seen how this will benefit my academic writing. - -It was a lot of fun to learn the differences (or, as the teacher put it, -"to purify my English after years of prolonged unhealthy exposure to American -media"), which are not only linguistic, but above all in attitude and -social norms. -For example, in the US the first question that people ask you is -"What do you do?" (meaning: "How much do you earn?"), while in England such -a question would be felt as unnecessary direct and impolite. -As a rule, -it is compulsory to exchange comments about the weather, and there is a lot -of specialized vocabulary for this; the following table might prove handy -to understand your acquaintance: - -- "It's a lovely day!" = "It doesn't rain" -- "It's a nice day!" = "It doesn't rain heavily" -- "What a wonderful day!"="This morning, at 10:13, I caught a glimpse of the sun" - -(the correct answer to any of these is "isn't it?") - -`II`. The Harry Potter experience -------------------------- - - flickr: http://www.flickr.com/photos/censi/232006603/ - -During my three-week stay I tried my best to immerse myself in the English -atmosphere. - -I went to a place called Oxford Story [3], where we paid £7 to go through a -painfully slow indoor ride, sat on a mobile school-desk in the dark for 25 -minutes. It is the claustrophobic equivalent of the American Epcot center in -Disney World. - -At Epcot, I learned that the final goal of all the scientific progress in the -last three millennia was to let Walt Disney broadcast Snow White using -Siemens equipment (Siemens sponsored the ride). -In Oxford, I learned that the glorious University is the repository of all -human knowledge, and that the English understatement is a legend. At the end of -the ride, I was amazed that in Italy I had managed to learn to read and write. - - flickr: http://www.flickr.com/photos/censi/232023681/ - -Still, one thing the ride did not explain is how the well-educated, -smart elite students of Oxford can possibly find rowing fun -- -(probably it IS fun, compared to cricket). - - flickr: http://www.flickr.com/photos/censi/232529032/ - -I went to a candle-light baroque concert in the Exeter college chapel. -The ensemble was 75% Asian, all Oxford researchers, and we were given -a twenty minute speech about the effort they put in the historical -research of this obscure composer, that they had a microfilm of the original -manuscript delivered from a German library, that the viola would be played -in the original style, blah blah blah. Only in Oxford! - - flickr: http://www.flickr.com/photos/censi/232031895/ - -I read "The Hobbit" (Tolkien was a fellow of Exeter college) - I discovered -that the only two peoples in the known and invented universes to have -the concept of a "second breakfast" are Hobbits and Italians. - - -I watched a performance of MacBeth at an open-air theatre. -I couldn't understand but one sentence, which is worth mentioning: -"Alcohol provokes the desire, but it takes away the performance" - -Regarding alcohol, England is one of the places where you can't drink if you -are under 21 (in Italy, at 18 you have decided to quit). -Young people have their ID checked at the entrance of pubs and in liquor -stores: that's only a minor annoyance, as they just need to wait outside -the store for the first Spanish guy passing by that will buy the wine for them -(and be compensated with just the change - did you keep the penny, Felix?). - -Anyway the guys at the door use the ID checking mostly as a form of flattery: -"You are 32? I thought you were 20!" is probably the best pick-up line that -the English can come up with. - -The other characteristic thing is that in English pubs there is no table -service: you have to walk to the bar and ask by yourself. The first time can -be confusing: and you can spend quite some time waiting at the table whining -about the "poor service". - -`III`. Parsnip, Marmite & the tea conspiracy ---------------------------------------------- - -During the first week I was a guest of a lovely 79-year-old lady. -Working at the University, she made a point of speaking very posh English. -And she made a point of cooking traditional English food. -The typical English dish is some meat with two vegetables aside. -For the vegetables, pick any two in {parsnip, carrot, potato}. - -Don't look in your dictionary for a translation of "parsnip" as probably -there isn't one. The lady would tell me that in the next-to-last century, -this famous professor spent years raising the finest crossbreed of Parsnip as -to finally obtain what is best described as a big white carrot -with no taste whatsoever [4]. - -Nevertheless, the many regional variants give spectacular variety to the -English cuisine: the two vegetables can be boiled, fried, baked, microwaved, -or roasted. There exist also exotic twists, in which the vegetables are put -on top of the meat, or underneath, or even inside. -In important occasions, the recipes stay the same but gain a French name. - - - flickr: http://www.flickr.com/photos/censi/232526897/ - - -I tried a thing called Marmite, which the teacher sold to me as "the British -answer to Nutella". It has the aspect and consistency of engine grease, and, -as far as I know, also the taste is similar (I've never tasted the grease, -but next time, presented with choice, I'd give it a go). - -The austerity of English food can be explained by the pitiless weather; but -how can you explain Marmite, if not with alimentary masochism? - -But... there's one thing that is much better in England: tea. Wherever I tried -it (at the old lady's, at tearooms, at coffee breaks) it was sooo delicious. -In Italy we don't get the real thing. Why is that? Is this some sort of -conspiracy orchestrated by the Italian coffee producers? And is it the -tea cartello which does not allow good coffee to be imported in England? - -`IV`. The Summer School ---------------------- - -If you go for a career in research, in general you don't get much money, -or fame, and you don't get to rescue the princess either. -The two benefits that you do get are: playing with very expensive toys -and the occasional trip in which you meet all sort of people. - -And when you talk with them, it's sort of strange to realize that your -interlocutor is one of the 5 people - worldwide - that actually care about your -research theme, and yet the things you have in common end there, as he has -different culture, race, religion, and while you two happen to agree that Lie -brackets are an indispensable tool to characterize the propagation of errors -on the Euclidean group, you have very different answers to the important -questions about life, the universe and everything. (In these cases I have -anecdotal proof that it is much better to stick to research talk, and to -avoid at all costs the kind of jokes that you can find in the Appendix). - -Instead, at this particular school, I would say that the European character was -clearly perceived, and I enjoyed it -- but whether England is in Europe is a -delicate matter. - - -Here are some impressions of the people. - - * Juan Domingo Tardos (aka Mingo) is the funniest of the bunch, the man you - want to go partying with. - - He taught us two deep truths about SLAM and life: - 1. The size of your banana matters. - 2. Never under-estimate the size of your lemons. - - I thought: wow, I want to write a paper with "banana" in the title - finally - some inspiration from the school! I already had big projects for Fig. 1,2 - and a full-page Fig. 3, but after a little googling I found: - "Functional Programming with Bananas, Lenses, Envelopes and Barbed Wire"[5] - "Dealing with large bananas" [6]. - I gave up: I cannot beat this last one. And the existence of [6] proves - once again that SLAM is a solved problem. - - * Paul Newman, the organizer, told us, more than once, that the future of SLAM - is in long term operation if we want the systems to be reliable. - (Personally, I disagree: I think that it is possible to build anything at - the desired level of reliability, given reasonable funding, time, and - an appropriate number of German engineers) - - * One of the lessons learned in the school is that almost everything has - already been done by someone else. - More specifically, most of the things have already been done by - Durrant-Whyte some twenty years ago, when men were men, CS was electrical - engineering, master students knew calculus, and Kalman filters ran - free in the wild lands of Australia. - - * Frank Dellaert is a jolly chap as well, and he does interesting things with - graphs. As he introduced three different formalisms in the first - three slides, I regretted not to have put more CS in my curriculum, then - shut my eyes. Interestingly, at summer schools and conferences, if you close - your eyes people assume that you are very smart and that you are thinking - about some new impressive algorithm -- I was just dreaming of a sunny beach. - - * Henrik Christensen has implemented SLAM on the cleaning robot for $45 - in sensors and electronics. It puts things in perspective, especially - if you consider that I paid £16 for a one-hour coach trip from Heathrow - to Oxford. - - * Andy Davison is a wonderful person, he tutored the practicals with - infinite patience. Never did I meet such a knowledgeable, affable, - and humble person. (Probably he is the kind of person that some day will - show up at work with automatic guns) - - * Wolfram Burgard - he wins my "best robot" award for the photo of our - beloved Albert [7]. - - * Dieter Fox wins "most nostalgic slide from the 90s": and every time we feel - the same emotion as the first time. - - * Kurt Konolige reminded me why I bought a Mac. - - * Simon Lacroix - Once we sat at the same table during lunch. While he - talked with Dellaert, he would send me alarmed glances, the kind of glances - that you would reserve to a relative returning from death. I wanted - to ask him why, but then I decided I'd better not to (was I so wasted - from the night before?). - - * Simon Julier -- he seems very smart, but he lost me between slide #3 and #4. - I started to be seasick from all those covariance matrices - - so I muttered to my neighbours: "I wonder whether it still holds in - higher-dimensional spaces...", then I closed my eyes and was back again on - the sunny beach. - - * But all in all, the most interesting presentation was the magical show - that Davide Scaramuzza (who at daytime pretends to work at ETHZ) gave to a - selected audience after the banquet ([8]). - It was another confirmation that all the time spent in front of a monitor is, - in fact, wasted, and all of us should have studied card tricks instead: - you have NO IDEA of how a girl's face brightens up and her eyes expand when - she watches a magician. - -`V`. Other minor issues in SLAM --------------------------------- - -We all know that the most important open problem in SLAM is that there are -not enough women doing research in the area and coming at summer schools. -As for the other minor issues, this is the result of asking -"What is the future of SLAM?" to a random sampling of the participants. -(the list does not include answers given after 10:00 PM) - - - For 30% of the respondents, SLAM is a solved problem, and we just need some - German engineers to work out the details of the implementations. - - Long term operation: make filters that reconsider their decisions at a - a later time (so not delaying decisions, but explicitly reconsider). - - Make it robust for real applications: or, your method should work in more - than one experiment and possibly also outside of your lab. - - Put more knowledge in SLAM about the environment. Teach your - filter what is a tree, a road, a mirror so that it can make smarter - decisions. - - Active SLAM and SLAM-guided exploration (once we figure out good acronyms). - - Some boring work is to be done for taking into account linearization errors - in the already existing results about consistency, sparsity, etc. - - "Where can I get some real coffee?" (2 people) - - Methods and representations for real sensor fusion (laser, camera, etc). - - Do robust stuff with a single camera. Omnidirectional cameras are cool. - Mix different techniques at different time-scales: visual odometry between - frames, then stable features, then databases of places to close the loop - (or don't close the loop at all). - -Appendix. How to offend seven nationalities at once --------------------------------------------------- - -In Oxford I learned the ultimate rude stereotypical joke -- I think it's -worth sharing. - -> **Heaven & Hell** -> -> *In Heaven*: the policemen are British, mechanics are German, chefs are French, -> wives are Japanese, neighbours are Dutch, lovers are Italian, -> and the Swiss organize it all. -> -> *In Hell*: the policemen are German, mechanics are French, chefs are British, -> neighbours are Japanese, wives are Dutch, lovers are Swiss, -> and the Italians organize it all. - -For related work, see for example [9], [10]. - - -And here's the research version: - -> **The BEST international research project** -> -> - The French do the overall math analysis, -> - a Chinese refines a ten-line proof of the main Theorem, -> - the Germans design the implementation, -> - Japanese undergrads do the actual work, -> - the British write the paper, -> - an American gives the presentation, -> - the Spanish organize the social events, -> - and the Italians organize the banquet. -> -> **The WORST international research project** -> -> - The Germans do the overall math analysis, -> - an American PhD student spends 10 CPU year on his department's 48-node -> cluster and proves with a Monte Carlo simulation in Matlab that -> Theorem 1 indeed holds for some values of the parameters, -> - the French design the implementation, -> - one Spanish undergrad does the actual work, -> - the Italians write the papers, -> - a Chinese gives the presentation, -> - the Japanese organize the social events, -> - and the British organize the banquet. - -`:-)` - - Flickr: - -References ----------- - -\[1\] [http://www.spellingsociety.org/news/media/poems.php](http://www.spellingsociety.org/news/media/poems.php) -\[2\] dde [http://www.flickr.com/photos/censi/236722418/](http://www.flickr.com/photos/censi/236722418/) -\[3\] [http://www.oxfordstory.co.uk](http://www.oxfordstory.co.uk) -\[4\] [http://www.botanical.com/botanical/mgmh/p/parsni12.html](http://www.botanical.com/botanical/mgmh/p/parsni12.html ) -\[5\] E. Meijer, M. Fokkinga, R. Paterson. "Functional Programming with Bananas, Lenses, Envelopes and Barbed Wire" (1991) - [http://citeseer.ist.psu.edu/meijer91functional.html](http://citeseer.ist.psu.edu/meijer91functional.html) -\[6\] R. Lammel, J. Visser, J. Kort. "Dealing with large bananas" (2000) -\[7\] [http://www.informatik.uni-freiburg.de/~burgard/](http://citeseer.ist.psu.edu/lammel00dealing.html) -\[8\] [http://asl.epfl.ch/~scaramuz/cabaret/cabaret.wmv](http://asl.epfl.ch/~scaramuz/cabaret/cabaret.wmv) -\[9\] [http://www.anth.uconn.edu/faculty/boster/cultvar/euweb/](http://www.anth.uconn.edu/faculty/boster/cultvar/euweb/) -\[10\] [http://www.infonegocio.com/xeron/bruno/italy.html](http://www.infonegocio.com/xeron/bruno/italy.html) diff --git a/vendor/plugins/maruku/tests/others/style.css b/vendor/plugins/maruku/tests/others/style.css deleted file mode 100644 index 8ed5c03b..00000000 --- a/vendor/plugins/maruku/tests/others/style.css +++ /dev/null @@ -1,27 +0,0 @@ - -BODY { - font-size: .7em; - max-width: 40em; -} - -PRE { - margin-left: 3em; - background-color: #eef; - padding: 3px; -} - -DL,DT,DD { padding: 5px; margin: 10px;} -DL { border: solid 3px black;} -DT { border: solid 3px blue;} -DD { border: solid 3px red;} - -P { border: solid 3px #888;} - - -TR { border: solid 2px #888; padding: 3px;} -TD,TH { border: solid 1px #888; padding: 3px; margin: 3px; } - -TABLE { border: solid 4px black; padding: 3px;} -TBODY, THEAD { border: solid 3px #888; padding: 3px;} - -IMG { min-width: 40px; min-height: 40px; border: solid 2px yellow;} \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/others/test.html b/vendor/plugins/maruku/tests/others/test.html deleted file mode 100644 index cc205fcf..00000000 --- a/vendor/plugins/maruku/tests/others/test.html +++ /dev/null @@ -1,24 +0,0 @@ - - -
             $ python       
      -
      -

      Created by Maruku at 02:05 on Monday, January 01st, 2007.
      diff --git a/vendor/plugins/maruku/tests/others/test.md b/vendor/plugins/maruku/tests/others/test.md deleted file mode 100644 index 96ecb936..00000000 --- a/vendor/plugins/maruku/tests/others/test.md +++ /dev/null @@ -1,4 +0,0 @@ - - $ python - - diff --git a/vendor/plugins/maruku/tests/s5/s5profiling.md b/vendor/plugins/maruku/tests/s5/s5profiling.md deleted file mode 100644 index fbf6caf4..00000000 --- a/vendor/plugins/maruku/tests/s5/s5profiling.md +++ /dev/null @@ -1,48 +0,0 @@ -subtitle: news -author: Andrea Censi -company: Università La Sapienza -css: math.css - -RDK news -======== - -Profiling ---------------------------------------------------------- - -1. `ragent2` writes profiling information on a pipe. -2. `rdk-profiler` reads the pipe and creates graphs in HTML+Javascript. -3. The user reads the data on a browser. - -Things logged ------------------------------------------------------------ - - 17288397 1730000 0 16384 END pantiltClient - 17288439 1730000 0 16384 START pantiltClient - 17288564 1730000 0 16384 LOCK pantiltClient:tilt - 17288622 1730000 0 16384 UNLOCK pantiltClient:tilt - -* `START/END`: how much does it take to ...? - -Footnotes 1/2 ---------------------------------------------------- - -You can use footnotes [^1] - -[^1]: And they work. - -Footnotes 2/2 ---------------------------------------------------- - -Each footnote on its page [^2] - -[^2]: alone. - -And now: math! ---------------------------------------------------- - -Consider, for example the group $\int_{a}^{b} x^{a} db$ of - -\[ \alpha_{\beta}^{\gamma} \] - -Unfortunately S5 and MathML are mutually exclusive. -See for explanations. \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/s5/ui/default/blank.gif b/vendor/plugins/maruku/tests/s5/ui/default/blank.gif deleted file mode 100644 index 75b945d2553848b8b6f41fe5e24599c0687b8472..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49 zcmZ?wbhEHbWMp7unE0RJ|Ns9C3=9Vj8~~DvKUo+V7?>DzfNY>Fh|Ltj$Y2csQN9XW diff --git a/vendor/plugins/maruku/tests/s5/ui/default/bodybg.gif b/vendor/plugins/maruku/tests/s5/ui/default/bodybg.gif deleted file mode 100755 index 5f448a16fe6dc7a03a4279fb19f9ba3af38eb634..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10119 zcmZX3S5T7;xAl`i3Q6cCp@jeeLNy3T$0YP70qM=qy9N+cUc}Hl(gj2a9YJ~#6*W`= z6=@&2)5qwt!QhQ8vJ0vHJS@?%%&Z zK0ZD@J-xWNxU#acy}kYU^XKp1zyJTiX8&*Q|EagXf1h4iS=`=U`TTi&aq<3tmbbTo z|5MUGIYIvgRsP%ldlP`LSEaGfVni3dkn$=h_24H*;kJyvh4_<-NG4^`kD!7uJ9lS6 zU8Iz=r;!E9GcgTlZu_G$PmchLTn~EmvUZMM`F8(R#=?LBqUG+$EI|jw8(@eK5`{;) z`df2R(<2S|bi(v}kU}Q9P8wY1C_Zj|7hzG4tHJgjT%xIEHYi~WEu`r29-*YhI|k7* zyxdB$yfO?1kAp#&^Ho)AK-YcKGd*K5?OoH2Sd=X%E$+Bxw1&9 z(%P=T$`mA)oBd#|;heV-Os1VoLH_=0H*qy~4w~-96SyJmEjd|~Cr%$ceAF}Pb<+JY z&UlJ`yYIwW@RsPUloS;m*G`i5B4yC&&}>+BNa_E||2vggX@uLZ?Y5#Vj~oSe9QG9c6I<78&I!r~%gz ziZ5!^;)2vJ%_rluN`P5bar_)9-T;gnj*-LCuELL}G!{CaYPpCZy(;5h60~xXONQ`0 zal}iE+ZMd_)}NVUTs6Ql{0s4W(%xCn`#)v4>Cgj=;DmJ3!aqAs(X-clZT5qBd6%@4 z=_172Ygb^JtVY+=X`HOVB};^J)+y*1=b4b9%m&;vNa+k=nSdihxidoFRb0j5q$}rC zPH^11Q!Fnn+YlM@TBAD@jVUk$T9qUWh5hBT8C5gyCDvp7^K*JDWa{)fI=^tR(R+Q` zro~!3zxQqde>6Y@hFE8~QC=^GH~0Pc=?dqfuBNc&XwwgE17hM?ppb?zr^ZEWKaQ@poO#_^%*oyAHq$@~Dx8R?-!+fH_yQeXoW!V&)UH_kj znQ36SkN|n=;QX5%Czpz-5l_wZf@2APOJ4L$DL?B><%d{$s zjxvT_*P8t_?j)@AQFWU&dG~xydaM&N7uq3k&d^WUMYeE=>6wl}>ROUOW4@^tq}%h7 zr{R`wf{s!~eP{Uoj^9ZCYY5p``IMWsp_CZ?k&i3#@Y+I7?BGfc*vKY%AZA~u z9Np15F%#l|`{?Sss7(AWEcl0s2|g<;dtD$d`p|}tn<|yQJ<(Ed4OLLqr2)2l(roa~ zM$b&!iO?IjD_b!W z?ktdJ9gu5VBb!57MP1inP13t?D*MmO^pOR-S)= zKI{-Pk{Dhpj#l>{^g6&iP-%o?^##Yo6ky1BPbXos0GQafp#QTs%-JM7{($K9?h zU|>O@oJ3H=_mX=#Z=*<|+}>e8<#)55yO%?*1t~mEb`j0(y)$!G-+X3Tuz8gSO(5~4 z$&|gkdkqZU_kh?Hr9H&c)H{_N0nXJM5BZvkXXVD~_c*ez@tfxPx|?ida9$T;zg1Q_pUL-2e6L{&_aFY)+A1-a#~lleKjMc@?A z`V#9Ld(BG0ases_2*h%wwSGKn6kj8|;{6k|taD!D7@eZyQ9;`mg}53z7Qa=+fej-H zQp{!*+bZM6`L4g@D`Bks zRNxs{#W+nCN2AsOJRRYFmC`oM;+f#XTPFx*hIa_3$K#BZh&Dwinw=Qoe0Xj z;UQA=!K5=bzW}Ir!zQF9-uqBfj^ca06xZT-{smER19&s3SYg-olmK$ta}KFvHC#+M z(S0v)K{(E)Oo+W_EDNWS5Gi%_)xp|Pb>&mnqjUsfR@&SJI02Z34Czh+QaS%*!I13h#?-u{`cNWL`9q;`6rrqg zS=M1O{~k8uYdHQG`p0uBD!^^>01$qx3+>a-f~YM)FAEUOX3B>Jn>~KMtJP}|J+{u} z8jio^3Qtv_({x&r(+cf}rq-kBaD2Gf2LgIX%9DcI^oW5;IbVo7pp*w1++U~eOh&ao zoND!dsP&%b$@l&Fi*-XQ9+{zgd58V?!=5qKG-~Y4$8)*h^&h@?%z^K$5@D0i5+O6f- zqi4W_EO3jQ;oVqfldgC zE+z^ijn}7LrR!=k;h`yj>ZXLi_td8&;2-&?FI+UI2E%yruY{CkJztg6V?x+pBf0XV z37Bq)(C7MM-I#VirE9CMc{*n&%rmv5;SHzl?(`4}jiCyi0__d}o|OY*z#h;+@q8%5 ziDMRJki1eZ!g=~$4W<-Fuj@2OozW*6Yo`DtAu22--}UY&*ETFCgD$#}EWJmQJWGel z&Vcvpc^fl87AdisDbQO?*}tW!%rUOk{QTBcQvdhZjnR|+`>2?G9y(yWH_`VF zI5(UEzxbD)IVAcrFy=E-fpjov30lqPQ~2}j2#e?T4F6L;(J-niZ;Z|+l-Ign;yn$l zA%eiwm9asQLDT?uzLSQ-@tA!WzcVtItNnpSA<_%TOsu6TSfU#RLCwOO@q)u2M$i!-=X*a@D7(tEZX8 z)&9Ky(A2*3391*CB#~W^3W}?Wo~{~v_1~h?zwga*LS~}zziKDUFHZF+&D&`7*Adiwf zyU;6l7zyPA=A|Wb1yClP{3`u5dz&(jL2ykIb-xpoy)Nu|m_Jk*L^!);ZcNC;S zFEdUI_I@92Fl159Y`7v1_I}U9zOV!+GPoWduQI6-@}A^wx`>3+oivCVCUdbb!FnO~ zu~>7&+d!lXF|9p!e z3VjYn&N^GPl%u;tG+oBcff<*TgS@HGlW8t3-hIilp>6IiZLv5ouDmTqI-zS(rZp4& zoFQhq-TswRXoaTvhA!N{2Dmkzh3`jxjgz+T?3%u-SmRI_bm#)3*Qv~;ya;L6fW~mS ziIJ)NE76$n)6QQ_A~)5w9a#KFAm|OV4$@3)P)=Acy zn3cVAD%Hgf2nmnje>~JPAKj%-R3iiZNxz{{2Rgi~QrKSD-3H$4L$Kl1EB2AeQZ?aW z(OM}p*`7&#jYY{-A2=LEFffz;hA_VFVE*)boLdfn!YUB$QuvGNeE|TexY%*589s2K z-rXi;e!o0gbe~He_f&r+6&lr zB@SRRv1~489y9a-hN6q40*dy)a>LbMOM_p5hg%L7&HOIok4`LWQiaO0M7n?;dkBJ# z>!BOm?hV+qW`SxleP|$u0p!npr0)A-o{mha zEIiZMMW&Kdi^ZQckV#Z{+B+#TmK=uo=)8??)vB!gYx$#m-Z@uZ=>CwmCE8-ojLkT( zoe5HUT7cD@#U-kn-1iapbLX*CKbb?9BGOpM@MS&8UMjgJoMBJBt8MUuSO72o}sV^6KB=NYf?|l z;{+py28)EEoOaF&)i|`4aW+X+8n6YayL!{aBmUe;J*#2SIglVSqMCPnu;(5I&ewiQ zy>um+Go6XZqk-;eQN6w)je8`S5eDch7vp0uEQY~q zo){&pTUpgWbg6K3b_y5T;qbI^=eC1cv{^BYOS5%OR+A?)a*$k9$cFUABcH-R)TB)( z7%xLtPDB;~UVOFC=2f6%2ZOdSN7g}$4=IC$q7t^TUYvUEsecz-I=O}n;G^OAD_cAt zg+PNd;F$cjT?`2O)u$uIt+Y>~$e4>bCnFK6_zPNmT>w!Y17VXIW79OM#ItC5 z>jVpB5m{jR-K6Kx93Kq_>KVdb-mI%F(RsY)DwpFNtm!AwRW)eKk-q;r6ldmga5k{Z zE7akYEJNh8FI3}|O9zeCQz#O;SutD*F{ioR`*&Hd5z4-_e3E-;V7Dzs_H|4&T_N6Q zsid!JU7{meiIzPgehHGKT3B^y>aA9dstEZ>vvA{!8W@Ji>$S{%?+|^@$r1L2Lyh8o zJa&!JqiOn;*u{LfHI$0M#xriOMe(JYIKNRs1Je^Uv~7#%{>9es2`f8%`G&_c%g|P< zil;YyWPZuU-NF98yfMKrD(N)Qq&Ax@((;DEARMY@N0=K2;@`KaKkn{*7vZ<@=&(Pq zcZ9pg%tv8l{F9XiXY*6@yiH6u6-E>a9gg|;cK`lk(d-6;N2O?LQ^u=B$lUnOBzc=o zRb4mN_?CDQo)0`-+jgc1XBPsAr#P;3_6{;t*mDHXc}*VR+NGBT-D`Iu`YtW=>{rEI z;871_MYVDA=PwW13MafroYUj@v!fKlboUG@#Aiwp5f5PewwDXycnikbIxnBdlM)n6 z$qBlcw6U9ehm^0r*SbzN_f;zmQS*>YP3EIt8F5v6#r@k%J@ZguWnw6{U-1@3Y3#Vb z%3l-Xq7Acd-k$`Nd~g@<|Xb6t&h z0l8IY!z-tZVssj<@Uez0V;IUDcaCh>^)u$=i~kH1zq~4&c}kj7?ClqevrscSYIYX+ z@m&tl1~lUVNgIbwB?~C`=8^M3eqVarctr^**8buaiuT-IpTDkRq2zOTIg9D6 z!9LGzol7906&(CH;QM*2CVjZLUmVi@kvX9%+;KGF43}-RMGbC>{1?FA$df+C-0$@B@Xq(Yt} zXtBEhvhx^H=el^S$;%ZUea(@f^lq5i0nm37ya~xII%&+E#4TN1b~;ilH)Ym?VClid zjk#BGgZI<=C!suAx{Oh91TL5@#sNlXf;JsML2mLTCATuWZ`o{im-ihS)Dh%Gu0_1i z2yhU!NQ2S_^X3%$Lht+byu$94)6O@*O?GKUb=*9UMk0eBCL&BseUj>_gDGQNm{Jlc z{zfyNxKj=lI*$pg6w6)GpFH~dmUQd(A{N{YSe5{TJ`Z6@nbG0lb&28u_v ztEwuXol7N@8P_MSoLAPgC_nm1D&PL>sqAU~ijuSEpwi`YWB<8wrNTjOp{2X(=8ZO8 zO@sQZcO^v9)*DV<4(|D-UgptnlR|Jk7;oj6^mQ&x1~HJvBUO>_5&#m7-bQ)qaMW-^ zVuf<(`URj=ZgB%8wgtz!|06A9(cT+JBgx<~`13~Qf+h%JlVNlvDXNqdconiaU4ALG zF;NeK&ia{Y;-iEQQtn+#79*N-oi*V5wi-JWS|WdydJ)nR`>|LJWtFQR#{-_%picvI zMA3GxSX|m)H{zOewa_A9U?FZHZ*@iX9Jah*Z4=dBdaQ#GlNmmnWx?woUczI`1-V*; zCm+qdu)v(&gjdwIDO~ME7B82zxFR5M%?o}!e~WesAoPMoh-Agl4da&rEsX&5YTZ;l zj>E#i=XT{2g{_AE^$d#X+SZjUKa&m5!`ar*=$6ij58pm!_sl!bax@;viaNB>xoubw zR|-&h;~INa8;Nsu6tz~pz~JDk97)!!JX$}4`9WB;bmfvHiz63y$u#e)8O_YBx_EmC zCYu=vN^LdCcwsYLzmzSdUmrYYN%SX)C^^)Zf>0j(mxi*eV~suK9$8*Y1l_`aU$LB? zF!$$8j_mgk;7y5qErimXKXYuiBww~D%omhgq$Sar!QpV~4uaFc`G=oNu*@9=v|Bq) z$_nBjz2j_VrB1k>?R_AU96ZhdP!S8kW(_BxcP*;pyl<|R*qjHMBnPdma=MC$4K=sq zbgqtiz;Njo<`M9hevg>Xp;NF95ghILz>JY{M0Q;gh=a4ohz?S% zR!4uzbj+AahTtXam+q*I{(d{SorNn3i6tG#-*2_j=kW~Jp#rR1m|N{*@1{6Gj5E?U zXQdu|g@TM7bTo2?P&`pxPyZRzfq*r`k3K&Fo%!)-(lDnp9l|~3nFP7)N}3n3WRsx_ z+Hb?vISOUA4xTw%ac~T9RvUc14XhN}VQ)Gg^gTI=veoJp{a};)%;WV%>yY4+8hy(m zXPYJw0ohCzcLZ81hkvzVum5#^X{QFz^I(<*`S|Avm+?R5W_+*8n)bm#aQ{9w$M)EA zvbh>X`P5f*zPI7ccaSF+Uj&twF}}Z@twhD4)a)X!Yu;UYunA}Jmi`($rZiV8By@AG z&FgHu{Kdef-5_Z|f3m07!uahsyRY|Qb?If}^Y`xhM0jzt#L&SJP&2{yL&hJC2_jd; zMhEjgD%O9_9RK!8)3LX$CVmr5I+(I^mjGO{3JRzH-HQd{4j&Q2jB4&_u0!GgitHhU z17gAyGNpH3FIpZBw{b9pcA%W|n`L;0G_jI0epp zo8nEJr@fx^*C<~YwgSdwszcr>6PgPhFqxHJFa1SuJ>m#LN9D{^J<6G7Vcj-@x}f~R z1XXxL#r1gjqlKoV;dixB%^GHf(RIbXuGv09%E(p;0TDJJTv}F=UX$%^g8spU6Vt-! zMpw)$nFXaf88ua{FO|H2D>%q2+VT6j)6mYpOgwFQG;h(<6&zBUl}uzTQj3z8&bFB3 z{;WyVc(vHSih-Rq`w*bm8Pa$b$Fqy05j|txR~&}45t}!fqPvy!@?ukcGBhx0bX~nYM%mTa|Kyh05B?n2cMi8UagcW3`n{f;8p`M;Ii!~ekihqmJXC6?bNr6; zdE1hYPbEGiyZ($03x_Wqt*Cn*zpogqCfEMHijS?01#bC4cP8F^TTP;JYZLG5dtSV0 zeQe_svA()o*la5nDB?HsY1Ry$h=W~yTmIsrUaBajNZ&ELu?G0D+WL9t`on%Q=t0sv zIU!g3_}1lsC@}4 z?w&e2CGG`|&97Kcyxid^i34$I0{m)J24_M{G8s)cGvpB)lU*0Q_f4gHVUX18WYC(& z=YI;blxWT?){HB>Hx-e2O=w5HhIZyR_|@OXw|5IZ2X;@toIAQbtef~e`NKb#+PnuI zN~^uDj9h!O6rj_n^2zZ(DY%2g=YdD26$aBRMu$1(PMh`FsCAuCN0oB}kHdcMigku< zs&xE(q-(62{j_o$C5edmGB&_O-e;H6kqvb%jHCJ&-R{nlFGl};9NBzre!%3yuj#J5 z{h(maZQ1W}3)#lLN(MLfBJ&o#JMv@uimvJqnRlLx@_ZN8+eJFP{jv1pt=@U?UA@RIG@|&YDuB_iK7ain<)On)ZpC8>`DXwlPOuvUye#$iUo6-i+UGjKn=uTc z(2P5?1vQx*ua+U*sX9-V39d|7-f)7c$$L>8P)IWdu**NaVeL2*25sZ~2z-21qzsqV zoTR<9%I%x@pT7%xs0#6mMx~QO;*EJl))a+c3h*_)t+xVc!>BEY4xvT}TXT3&EG!@` z;+`m&GNchf`)XQ)4oviz82PO=DqP{ia~$`Fyv9+nCYt1hsDHZ|vnCO^hRq)~?pza? zTMQh;@@~~&jX+5@Zv_i$B>LC3h7bxlYd?f#xU90ND&V-j37q^IzK|)lTg=&gL-6mY zRB82ZU2H48$}WHX>nyt}CQ;%EUWR&W{h*|{7h^8tG%RT1OL$Vd_cA+jz!HtBRbBBx zluFBet4@9MhQD#05ap|AB={s`-H24BVkE2lU`$|ll}m3zq}}vbAl6cmmliC8Jd*Zc z_-%opVhJ^B-e!7fbwBznMQKn25$~gjYQa?*J@1V#ee1$-KXrk1_3ks6Q^>e6)?0YG zq3^PhL~Tg}pj}gPiHKi-;M)Ua1!bg7zin*as70qZ2g31afp=df>kNiXdDe3XRpzFP zo@_~PF`0J>P8*b1|218IF+I;ExoYkHceWzfAEJ^nJWLr%iglsn_@<1t65PR8@}uFp zV6mSecyn8h{mdvX(O|(pNoVu)aE<{@&c(Umt=D>>NrPm&rHi|Sr=#^I_o{`vpXIMw zuy?s`)m&|}+$dzD44!I#Sm*g3OZkRRS=)4N@d_?+bXBwTrbvA5o9ZFT-y!4CIwP&5 zMxVHbH_usWfAO>y*{^QAuERC9aq=69YYuwSo=|iDsEVQ=cmTM)=lJ z$@9k7tAWWwSyFskPmkndY~Nz5WY76FjujL~o(c$;-yV8dE3(pXfNDDJxn?X%!y4~1KVT7=Czt-Pdz zd-2WESTSVfn>IJMWP%tm%~hE>BCeH>s^O?OQL6BZ>{a1q_lvP}P#=CDomv)BdTLVK z{`D2#^3)TEh^jM8fos1fcI)ScYqHWr35}60kUviHM$YU0EwD46K*8fTfAhW1nF&!o z&whNOAJPhjRBy>(wsLfw*CR{(9+*t!9ABu+f=al(uU5~nGD|T4Lz>qytqUYUqvqBm zuTvjw%1#I>``^4_vY0c<3jA}EP_<=!34CZEm^LG??dIE`m#IkQ>@5{su5amiUac#` zH*go;Q`*|vwp*ea?q(TN_}MY%@6K z{9bI!r}f8L@KD0Y$*FCuo{BwSWqV*TD?`SpBiO1py#@A`Y`gaAUL4`#87tG{-nojslH zKlkCIa7jyrfUjqp^T(e*6{8GKAMW926^HwlkZGr^Kf|R=Ey5?ge8w@$eG~5k9rvQV zo0bDN7Y&P+-Bo|hEY4y>9>z)!iHzl9TZ?Pw>vr%f-&Eb#!+69V70Ta$oUQf%2-EzV zOJ|L#cLmPouG2I_mF{m@zjAo&q38Qi^5eTnd5@KK>58jkNd>g_PkoDL zx74>5Z^*B|TGQL|zq9q`nRMHjdf?8o=f7W7yS`07-F*D`{mLO?L-oYt=HvWJ%QCwZ zPw$FWp1V^N{2Y8vVSoM2tU-(wYYlo@3qI?v~>LRb>lmMu$RD=O`m&uhh6W` z|Cv{5)7eXf^De&q^6+G;&tCf~d$?w{0X^x>yn^T$nG9yHNM1;)b(}gT@-1+F?agDc zc3Ah;T+-%GvGrA5DXPseGyz~Y(*HQ++1(0nO>sXwMNIvxI(^9%WtV8kv+w;h@yR${ zuR^XpH*rx!of=pd=o#>xryc!@8F+L}hB4IRyU*=g^?arIneABt^8@N>-QC6-JGZ2-U1NIYX>ZEDSV3Ebbc52_&>Eg;OSiwWj0ei{na~R~I z$f&zRhP(fy9UjfXTW58ubqDC=b3C2Gw~9;LD-g{Yl53q{dtt0R8^~ Duh@-b diff --git a/vendor/plugins/maruku/tests/s5/ui/default/framing.css b/vendor/plugins/maruku/tests/s5/ui/default/framing.css deleted file mode 100644 index 14d8509e..00000000 --- a/vendor/plugins/maruku/tests/s5/ui/default/framing.css +++ /dev/null @@ -1,23 +0,0 @@ -/* The following styles size, place, and layer the slide components. - Edit these if you want to change the overall slide layout. - The commented lines can be uncommented (and modified, if necessary) - to help you with the rearrangement process. */ - -/* target = 1024x768 */ - -div#header, div#footer, .slide {width: 100%; top: 0; left: 0;} -div#header {top: 0; height: 3em; z-index: 1;} -div#footer {top: auto; bottom: 0; height: 2.5em; z-index: 5;} -.slide {top: 0; width: 92%; padding: 3.5em 4% 4%; z-index: 2; list-style: none;} -div#controls {left: 50%; bottom: 0; width: 50%; z-index: 100;} -div#controls form {position: absolute; bottom: 0; right: 0; width: 100%; - margin: 0;} -#currentSlide {position: absolute; width: 10%; left: 45%; bottom: 1em; z-index: 10;} -html>body #currentSlide {position: fixed;} - -/* -div#header {background: #FCC;} -div#footer {background: #CCF;} -div#controls {background: #BBD;} -div#currentSlide {background: #FFC;} -*/ diff --git a/vendor/plugins/maruku/tests/s5/ui/default/iepngfix.htc b/vendor/plugins/maruku/tests/s5/ui/default/iepngfix.htc deleted file mode 100644 index bba2db75..00000000 --- a/vendor/plugins/maruku/tests/s5/ui/default/iepngfix.htc +++ /dev/null @@ -1,42 +0,0 @@ - - - - - \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/s5/ui/default/opera.css b/vendor/plugins/maruku/tests/s5/ui/default/opera.css deleted file mode 100644 index 9e9d2a3c..00000000 --- a/vendor/plugins/maruku/tests/s5/ui/default/opera.css +++ /dev/null @@ -1,7 +0,0 @@ -/* DO NOT CHANGE THESE unless you really want to break Opera Show */ -.slide { - visibility: visible !important; - position: static !important; - page-break-before: always; -} -#slide0 {page-break-before: avoid;} diff --git a/vendor/plugins/maruku/tests/s5/ui/default/outline.css b/vendor/plugins/maruku/tests/s5/ui/default/outline.css deleted file mode 100644 index 62db519e..00000000 --- a/vendor/plugins/maruku/tests/s5/ui/default/outline.css +++ /dev/null @@ -1,15 +0,0 @@ -/* don't change this unless you want the layout stuff to show up in the outline view! */ - -.layout div, #footer *, #controlForm * {display: none;} -#footer, #controls, #controlForm, #navLinks, #toggle { - display: block; visibility: visible; margin: 0; padding: 0;} -#toggle {float: right; padding: 0.5em;} -html>body #toggle {position: fixed; top: 0; right: 0;} - -/* making the outline look pretty-ish */ - -#slide0 h1, #slide0 h2, #slide0 h3, #slide0 h4 {border: none; margin: 0;} -#slide0 h1 {padding-top: 1.5em;} -.slide h1 {margin: 1.5em 0 0; padding-top: 0.25em; - border-top: 1px solid #888; border-bottom: 1px solid #AAA;} -#toggle {border: 1px solid; border-width: 0 0 1px 1px; background: #FFF;} diff --git a/vendor/plugins/maruku/tests/s5/ui/default/pretty.css b/vendor/plugins/maruku/tests/s5/ui/default/pretty.css deleted file mode 100644 index 3d3aceff..00000000 --- a/vendor/plugins/maruku/tests/s5/ui/default/pretty.css +++ /dev/null @@ -1,86 +0,0 @@ -/* Following are the presentation styles -- edit away! */ - -body {background: #FFF url(bodybg.gif) -16px 0 no-repeat; color: #000; font-size: 2em;} -:link, :visited {text-decoration: none; color: #00C;} -#controls :active {color: #88A !important;} -#controls :focus {outline: 1px dotted #227;} -h1, h2, h3, h4 {font-size: 100%; margin: 0; padding: 0; font-weight: inherit;} -ul, pre {margin: 0; line-height: 1em;} -html, body {margin: 0; padding: 0;} - -blockquote, q {font-style: italic;} -blockquote {padding: 0 2em 0.5em; margin: 0 1.5em 0.5em; text-align: center; font-size: 1em;} -blockquote p {margin: 0;} -blockquote i {font-style: normal;} -blockquote b {display: block; margin-top: 0.5em; font-weight: normal; font-size: smaller; font-style: normal;} -blockquote b i {font-style: italic;} - -kbd {font-weight: bold; font-size: 1em;} -sup {font-size: smaller; line-height: 1px;} - -.slide code {padding: 2px 0.25em; font-weight: bold; color: #533;} -.slide code.bad, code del {color: red;} -.slide code.old {color: silver;} -.slide pre {padding: 0; margin: 0.25em 0 0.5em 0.5em; color: #533; font-size: 90%;} -.slide pre code {display: block;} -.slide ul {margin-left: 5%; margin-right: 7%; list-style: disc;} -.slide li {margin-top: 0.75em; margin-right: 0;} -.slide ul ul {line-height: 1;} -.slide ul ul li {margin: .2em; font-size: 85%; list-style: square;} -.slide img.leader {display: block; margin: 0 auto;} - -div#header, div#footer {background: #005; color: #AAB; - font-family: Verdana, Helvetica, sans-serif;} -div#header {background: #005 url(bodybg.gif) -16px 0 no-repeat; - line-height: 1px;} -div#footer {font-size: 0.5em; font-weight: bold; padding: 1em 0;} -#footer h1, #footer h2 {display: block; padding: 0 1em;} -#footer h2 {font-style: italic;} - -div.long {font-size: 0.75em;} -.slide h1 {position: absolute; top: 0.7em; left: 87px; z-index: 1; - margin: 0; padding: 0.3em 0 0 50px; white-space: nowrap; - font: bold 150%/1em Helvetica, sans-serif; text-transform: capitalize; - color: #DDE; background: #005;} -.slide h3 {font-size: 130%;} -h1 abbr {font-variant: small-caps;} - -div#controls {position: absolute; left: 50%; bottom: 0; - width: 50%; - text-align: right; font: bold 0.9em Verdana, Helvetica, sans-serif;} -html>body div#controls {position: fixed; padding: 0 0 1em 0; - top: auto;} -div#controls form {position: absolute; bottom: 0; right: 0; width: 100%; - margin: 0; padding: 0;} -#controls #navLinks a {padding: 0; margin: 0 0.5em; - background: #005; border: none; color: #779; - cursor: pointer;} -#controls #navList {height: 1em;} -#controls #navList #jumplist {position: absolute; bottom: 0; right: 0; background: #DDD; color: #227;} - -#currentSlide {text-align: center; font-size: 0.5em; color: #449;} - -#slide0 {padding-top: 3.5em; font-size: 90%;} -#slide0 h1 {position: static; margin: 1em 0 0; padding: 0; - font: bold 2em Helvetica, sans-serif; white-space: normal; - color: #000; background: transparent;} -#slide0 h2 {font: bold italic 1em Helvetica, sans-serif; margin: 0.25em;} -#slide0 h3 {margin-top: 1.5em; font-size: 1.5em;} -#slide0 h4 {margin-top: 0; font-size: 1em;} - -ul.urls {list-style: none; display: inline; margin: 0;} -.urls li {display: inline; margin: 0;} -.note {display: none;} -.external {border-bottom: 1px dotted gray;} -html>body .external {border-bottom: none;} -.external:after {content: " \274F"; font-size: smaller; color: #77B;} - -.incremental, .incremental *, .incremental *:after {color: #DDE; visibility: visible;} -img.incremental {visibility: hidden;} -.slide .current {color: #B02;} - - -/* diagnostics - -li:after {content: " [" attr(class) "]"; color: #F88;} - */ \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/s5/ui/default/print.css b/vendor/plugins/maruku/tests/s5/ui/default/print.css deleted file mode 100644 index e7a71d14..00000000 --- a/vendor/plugins/maruku/tests/s5/ui/default/print.css +++ /dev/null @@ -1 +0,0 @@ -/* The following rule is necessary to have all slides appear in print! DO NOT REMOVE IT! */ .slide, ul {page-break-inside: avoid; visibility: visible !important;} h1 {page-break-after: avoid;} body {font-size: 12pt; background: white;} * {color: black;} #slide0 h1 {font-size: 200%; border: none; margin: 0.5em 0 0.25em;} #slide0 h3 {margin: 0; padding: 0;} #slide0 h4 {margin: 0 0 0.5em; padding: 0;} #slide0 {margin-bottom: 3em;} h1 {border-top: 2pt solid gray; border-bottom: 1px dotted silver;} .extra {background: transparent !important;} div.extra, pre.extra, .example {font-size: 10pt; color: #333;} ul.extra a {font-weight: bold;} p.example {display: none;} #header {display: none;} #footer h1 {margin: 0; border-bottom: 1px solid; color: gray; font-style: italic;} #footer h2, #controls {display: none;} /* The following rule keeps the layout stuff out of print. Remove at your own risk! */ .layout, .layout * {display: none !important;} \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/s5/ui/default/s5-core.css b/vendor/plugins/maruku/tests/s5/ui/default/s5-core.css deleted file mode 100644 index 86444e04..00000000 --- a/vendor/plugins/maruku/tests/s5/ui/default/s5-core.css +++ /dev/null @@ -1,9 +0,0 @@ -/* Do not edit or override these styles! The system will likely break if you do. */ - -div#header, div#footer, div#controls, .slide {position: absolute;} -html>body div#header, html>body div#footer, - html>body div#controls, html>body .slide {position: fixed;} -.handout {display: none;} -.layout {display: block;} -.slide, .hideme, .incremental {visibility: hidden;} -#slide0 {visibility: visible;} diff --git a/vendor/plugins/maruku/tests/s5/ui/default/slides.css b/vendor/plugins/maruku/tests/s5/ui/default/slides.css deleted file mode 100644 index 0786d7db..00000000 --- a/vendor/plugins/maruku/tests/s5/ui/default/slides.css +++ /dev/null @@ -1,3 +0,0 @@ -@import url(s5-core.css); /* required to make the slide show run at all */ -@import url(framing.css); /* sets basic placement and size of slide components */ -@import url(pretty.css); /* stuff that makes the slides look better than blah */ \ No newline at end of file diff --git a/vendor/plugins/maruku/tests/s5/ui/default/slides.js b/vendor/plugins/maruku/tests/s5/ui/default/slides.js deleted file mode 100644 index 07f40ff8..00000000 --- a/vendor/plugins/maruku/tests/s5/ui/default/slides.js +++ /dev/null @@ -1,552 +0,0 @@ -// S5 v1.1 slides.js -- released into the Public Domain -// -// Please see http://www.meyerweb.com/eric/tools/s5/credits.html for information -// about all the wonderful and talented contributors to this code! - -var undef; -var slideCSS = ''; -var snum = 0; -var smax = 1; -var incpos = 0; -var number = undef; -var s5mode = true; -var defaultView = 'slideshow'; -var controlVis = 'visible'; - -var isIE = navigator.appName == 'Microsoft Internet Explorer' ? 1 : 0; -var isOp = navigator.userAgent.indexOf('Opera') > -1 ? 1 : 0; -var isGe = navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('Safari') < 1 ? 1 : 0; - -function hasClass(object, className) { - if (!object.className) return false; - return (object.className.search('(^|\\s)' + className + '(\\s|$)') != -1); -} - -function hasValue(object, value) { - if (!object) return false; - return (object.search('(^|\\s)' + value + '(\\s|$)') != -1); -} - -function removeClass(object,className) { - if (!object) return; - object.className = object.className.replace(new RegExp('(^|\\s)'+className+'(\\s|$)'), RegExp.$1+RegExp.$2); -} - -function addClass(object,className) { - if (!object || hasClass(object, className)) return; - if (object.className) { - object.className += ' '+className; - } else { - object.className = className; - } -} - -function GetElementsWithClassName(elementName,className) { - var allElements = document.getElementsByTagName(elementName); - var elemColl = new Array(); - for (var i = 0; i< allElements.length; i++) { - if (hasClass(allElements[i], className)) { - elemColl[elemColl.length] = allElements[i]; - } - } - return elemColl; -} - -function isParentOrSelf(element, id) { - if (element == null || element.nodeName=='BODY') return false; - else if (element.id == id) return true; - else return isParentOrSelf(element.parentNode, id); -} - -function nodeValue(node) { - var result = ""; - if (node.nodeType == 1) { - var children = node.childNodes; - for (var i = 0; i < children.length; ++i) { - result += nodeValue(children[i]); - } - } - else if (node.nodeType == 3) { - result = node.nodeValue; - } - return(result); -} - -function slideLabel() { - var slideColl = GetElementsWithClassName('*','slide'); - var list = document.getElementById('jumplist'); - smax = slideColl.length; - for (var n = 0; n < smax; n++) { - var obj = slideColl[n]; - - var did = 'slide' + n.toString(); - obj.setAttribute('id',did); - if (isOp) continue; - - var otext = ''; - var menu = obj.firstChild; - if (!menu) continue; // to cope with empty slides - while (menu && menu.nodeType == 3) { - menu = menu.nextSibling; - } - if (!menu) continue; // to cope with slides with only text nodes - - var menunodes = menu.childNodes; - for (var o = 0; o < menunodes.length; o++) { - otext += nodeValue(menunodes[o]); - } - list.options[list.length] = new Option(n + ' : ' + otext, n); - } -} - -function currentSlide() { - var cs; - if (document.getElementById) { - cs = document.getElementById('currentSlide'); - } else { - cs = document.currentSlide; - } - cs.innerHTML = '' + snum + '<\/span> ' + - '\/<\/span> ' + - '' + (smax-1) + '<\/span>'; - if (snum == 0) { - cs.style.visibility = 'hidden'; - } else { - cs.style.visibility = 'visible'; - } -} - -function go(step) { - if (document.getElementById('slideProj').disabled || step == 0) return; - var jl = document.getElementById('jumplist'); - var cid = 'slide' + snum; - var ce = document.getElementById(cid); - if (incrementals[snum].length > 0) { - for (var i = 0; i < incrementals[snum].length; i++) { - removeClass(incrementals[snum][i], 'current'); - removeClass(incrementals[snum][i], 'incremental'); - } - } - if (step != 'j') { - snum += step; - lmax = smax - 1; - if (snum > lmax) snum = lmax; - if (snum < 0) snum = 0; - } else - snum = parseInt(jl.value); - var nid = 'slide' + snum; - var ne = document.getElementById(nid); - if (!ne) { - ne = document.getElementById('slide0'); - snum = 0; - } - if (step < 0) {incpos = incrementals[snum].length} else {incpos = 0;} - if (incrementals[snum].length > 0 && incpos == 0) { - for (var i = 0; i < incrementals[snum].length; i++) { - if (hasClass(incrementals[snum][i], 'current')) - incpos = i + 1; - else - addClass(incrementals[snum][i], 'incremental'); - } - } - if (incrementals[snum].length > 0 && incpos > 0) - addClass(incrementals[snum][incpos - 1], 'current'); - ce.style.visibility = 'hidden'; - ne.style.visibility = 'visible'; - jl.selectedIndex = snum; - currentSlide(); - number = 0; -} - -function goTo(target) { - if (target >= smax || target == snum) return; - go(target - snum); -} - -function subgo(step) { - if (step > 0) { - removeClass(incrementals[snum][incpos - 1],'current'); - removeClass(incrementals[snum][incpos], 'incremental'); - addClass(incrementals[snum][incpos],'current'); - incpos++; - } else { - incpos--; - removeClass(incrementals[snum][incpos],'current'); - addClass(incrementals[snum][incpos], 'incremental'); - addClass(incrementals[snum][incpos - 1],'current'); - } -} - -function toggle() { - var slideColl = GetElementsWithClassName('*','slide'); - var slides = document.getElementById('slideProj'); - var outline = document.getElementById('outlineStyle'); - if (!slides.disabled) { - slides.disabled = true; - outline.disabled = false; - s5mode = false; - fontSize('1em'); - for (var n = 0; n < smax; n++) { - var slide = slideColl[n]; - slide.style.visibility = 'visible'; - } - } else { - slides.disabled = false; - outline.disabled = true; - s5mode = true; - fontScale(); - for (var n = 0; n < smax; n++) { - var slide = slideColl[n]; - slide.style.visibility = 'hidden'; - } - slideColl[snum].style.visibility = 'visible'; - } -} - -function showHide(action) { - var obj = GetElementsWithClassName('*','hideme')[0]; - switch (action) { - case 's': obj.style.visibility = 'visible'; break; - case 'h': obj.style.visibility = 'hidden'; break; - case 'k': - if (obj.style.visibility != 'visible') { - obj.style.visibility = 'visible'; - } else { - obj.style.visibility = 'hidden'; - } - break; - } -} - -// 'keys' code adapted from MozPoint (http://mozpoint.mozdev.org/) -function keys(key) { - if (!key) { - key = event; - key.which = key.keyCode; - } - if (key.which == 84) { - toggle(); - return; - } - if (s5mode) { - switch (key.which) { - case 10: // return - case 13: // enter - if (window.event && isParentOrSelf(window.event.srcElement, 'controls')) return; - if (key.target && isParentOrSelf(key.target, 'controls')) return; - if(number != undef) { - goTo(number); - break; - } - case 32: // spacebar - case 34: // page down - case 39: // rightkey - case 40: // downkey - if(number != undef) { - go(number); - } else if (!incrementals[snum] || incpos >= incrementals[snum].length) { - go(1); - } else { - subgo(1); - } - break; - case 33: // page up - case 37: // leftkey - case 38: // upkey - if(number != undef) { - go(-1 * number); - } else if (!incrementals[snum] || incpos <= 0) { - go(-1); - } else { - subgo(-1); - } - break; - case 36: // home - goTo(0); - break; - case 35: // end - goTo(smax-1); - break; - case 67: // c - showHide('k'); - break; - } - if (key.which < 48 || key.which > 57) { - number = undef; - } else { - if (window.event && isParentOrSelf(window.event.srcElement, 'controls')) return; - if (key.target && isParentOrSelf(key.target, 'controls')) return; - number = (((number != undef) ? number : 0) * 10) + (key.which - 48); - } - } - return false; -} - -function clicker(e) { - number = undef; - var target; - if (window.event) { - target = window.event.srcElement; - e = window.event; - } else target = e.target; - if (target.getAttribute('href') != null || hasValue(target.rel, 'external') || isParentOrSelf(target, 'controls') || isParentOrSelf(target,'embed') || isParentOrSelf(target,'object')) return true; - if (!e.which || e.which == 1) { - if (!incrementals[snum] || incpos >= incrementals[snum].length) { - go(1); - } else { - subgo(1); - } - } -} - -function findSlide(hash) { - var target = null; - var slides = GetElementsWithClassName('*','slide'); - for (var i = 0; i < slides.length; i++) { - var targetSlide = slides[i]; - if ( (targetSlide.name && targetSlide.name == hash) - || (targetSlide.id && targetSlide.id == hash) ) { - target = targetSlide; - break; - } - } - while(target != null && target.nodeName != 'BODY') { - if (hasClass(target, 'slide')) { - return parseInt(target.id.slice(5)); - } - target = target.parentNode; - } - return null; -} - -function slideJump() { - if (window.location.hash == null) return; - var sregex = /^#slide(\d+)$/; - var matches = sregex.exec(window.location.hash); - var dest = null; - if (matches != null) { - dest = parseInt(matches[1]); - } else { - dest = findSlide(window.location.hash.slice(1)); - } - if (dest != null) - go(dest - snum); -} - -function fixLinks() { - var thisUri = window.location.href; - thisUri = thisUri.slice(0, thisUri.length - window.location.hash.length); - var aelements = document.getElementsByTagName('A'); - for (var i = 0; i < aelements.length; i++) { - var a = aelements[i].href; - var slideID = a.match('\#slide[0-9]{1,2}'); - if ((slideID) && (slideID[0].slice(0,1) == '#')) { - var dest = findSlide(slideID[0].slice(1)); - if (dest != null) { - if (aelements[i].addEventListener) { - aelements[i].addEventListener("click", new Function("e", - "if (document.getElementById('slideProj').disabled) return;" + - "go("+dest+" - snum); " + - "if (e.preventDefault) e.preventDefault();"), true); - } else if (aelements[i].attachEvent) { - aelements[i].attachEvent("onclick", new Function("", - "if (document.getElementById('slideProj').disabled) return;" + - "go("+dest+" - snum); " + - "event.returnValue = false;")); - } - } - } - } -} - -function externalLinks() { - if (!document.getElementsByTagName) return; - var anchors = document.getElementsByTagName('a'); - for (var i=0; i' + - '