From f27413219e4183af2da1a8d7e443cc1b732dd4b6 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 11 Sep 2013 15:52:37 -0400 Subject: [PATCH] Support for MDTest --- .../discourse/components/markdown.js | 5 +- .../discourse/dialects/bbcode_dialect.js | 5 - .../dialects/bold_italics_dialect.js | 6 + .../javascripts/discourse/dialects/dialect.js | 86 +- .../discourse/dialects/github_code_dialect.js | 10 +- .../javascripts/discourse/dialects/html.js | 8 + .../discourse/dialects/mention_dialect.js | 1 - .../discourse/dialects/newline_dialect.js | 2 +- .../discourse/dialects/onebox_dialect.js | 1 - .../discourse/dialects/quote_dialect.js | 3 +- lib/pretty_text.rb | 43 +- spec/components/pretty_text_spec.rb | 2 +- spec/models/post_analyzer_spec.rb | 2 +- spec/models/post_spec.rb | 2 +- test/javascripts/components/bbcode_test.js | 5 + test/javascripts/components/markdown_test.js | 34 +- .../fixtures/Amps and angle encoding.text | 21 + .../fixtures/Amps and angle encoding.xhtml | 22 + .../mdtest/fixtures/Auto links.text | 13 + .../mdtest/fixtures/Auto links.xhtml | 18 + .../mdtest/fixtures/Backslash escapes.text | 120 +++ .../mdtest/fixtures/Backslash escapes.xhtml | 125 +++ .../Blockquotes with code blocks.text | 11 + .../Blockquotes with code blocks.xhtml | 20 + .../mdtest/fixtures/Code Blocks.text | 14 + .../mdtest/fixtures/Code Blocks.xhtml | 17 + .../mdtest/fixtures/Code Spans.text | 5 + .../mdtest/fixtures/Code Spans.xhtml | 12 + ...apped paragraphs with list-like lines.text | 8 + ...pped paragraphs with list-like lines.xhtml | 8 + .../mdtest/fixtures/Horizontal rules.text | 67 ++ .../mdtest/fixtures/Horizontal rules.xhtml | 71 ++ test/javascripts/mdtest/fixtures/Images.text | 26 + test/javascripts/mdtest/fixtures/Images.xhtml | 21 + .../fixtures/Inline HTML (Advanced).text | 30 + .../fixtures/Inline HTML (Advanced).xhtml | 36 + .../mdtest/fixtures/Inline HTML (Simple).text | 54 + .../fixtures/Inline HTML (Simple).xhtml | 63 ++ .../mdtest/fixtures/Inline HTML comments.text | 13 + .../fixtures/Inline HTML comments.xhtml | 13 + .../mdtest/fixtures/Links, inline style.text | 24 + .../mdtest/fixtures/Links, inline style.xhtml | 28 + .../fixtures/Links, reference style.text | 71 ++ .../fixtures/Links, reference style.xhtml | 52 + .../fixtures/Links, shortcut references.text | 20 + .../fixtures/Links, shortcut references.xhtml | 9 + .../fixtures/Literal quotes in titles.text | 7 + .../fixtures/Literal quotes in titles.xhtml | 3 + .../Markdown Documentation - Basics.text | 306 ++++++ .../Markdown Documentation - Basics.xhtml | 319 ++++++ .../Markdown Documentation - Syntax.text | 888 ++++++++++++++++ .../Markdown Documentation - Syntax.xhtml | 949 ++++++++++++++++++ .../mdtest/fixtures/Nested blockquotes.text | 5 + .../mdtest/fixtures/Nested blockquotes.xhtml | 9 + .../fixtures/Ordered and unordered lists.text | 131 +++ .../Ordered and unordered lists.xhtml | 148 +++ .../fixtures/Strong and em together.text | 7 + .../fixtures/Strong and em together.xhtml | 7 + test/javascripts/mdtest/fixtures/Tabs.text | 21 + test/javascripts/mdtest/fixtures/Tabs.xhtml | 25 + .../javascripts/mdtest/fixtures/Tidyness.text | 5 + .../mdtest/fixtures/Tidyness.xhtml | 8 + test/javascripts/mdtest/mdtest.js.erb | 53 + vendor/assets/javascripts/better_markdown.js | 95 +- 64 files changed, 4082 insertions(+), 131 deletions(-) create mode 100644 app/assets/javascripts/discourse/dialects/html.js create mode 100755 test/javascripts/mdtest/fixtures/Amps and angle encoding.text create mode 100755 test/javascripts/mdtest/fixtures/Amps and angle encoding.xhtml create mode 100755 test/javascripts/mdtest/fixtures/Auto links.text create mode 100755 test/javascripts/mdtest/fixtures/Auto links.xhtml create mode 100755 test/javascripts/mdtest/fixtures/Backslash escapes.text create mode 100755 test/javascripts/mdtest/fixtures/Backslash escapes.xhtml create mode 100755 test/javascripts/mdtest/fixtures/Blockquotes with code blocks.text create mode 100755 test/javascripts/mdtest/fixtures/Blockquotes with code blocks.xhtml create mode 100755 test/javascripts/mdtest/fixtures/Code Blocks.text create mode 100755 test/javascripts/mdtest/fixtures/Code Blocks.xhtml create mode 100755 test/javascripts/mdtest/fixtures/Code Spans.text create mode 100755 test/javascripts/mdtest/fixtures/Code Spans.xhtml create mode 100755 test/javascripts/mdtest/fixtures/Hard-wrapped paragraphs with list-like lines.text create mode 100755 test/javascripts/mdtest/fixtures/Hard-wrapped paragraphs with list-like lines.xhtml create mode 100755 test/javascripts/mdtest/fixtures/Horizontal rules.text create mode 100755 test/javascripts/mdtest/fixtures/Horizontal rules.xhtml create mode 100755 test/javascripts/mdtest/fixtures/Images.text create mode 100755 test/javascripts/mdtest/fixtures/Images.xhtml create mode 100755 test/javascripts/mdtest/fixtures/Inline HTML (Advanced).text create mode 100755 test/javascripts/mdtest/fixtures/Inline HTML (Advanced).xhtml create mode 100755 test/javascripts/mdtest/fixtures/Inline HTML (Simple).text create mode 100755 test/javascripts/mdtest/fixtures/Inline HTML (Simple).xhtml create mode 100755 test/javascripts/mdtest/fixtures/Inline HTML comments.text create mode 100755 test/javascripts/mdtest/fixtures/Inline HTML comments.xhtml create mode 100755 test/javascripts/mdtest/fixtures/Links, inline style.text create mode 100755 test/javascripts/mdtest/fixtures/Links, inline style.xhtml create mode 100755 test/javascripts/mdtest/fixtures/Links, reference style.text create mode 100755 test/javascripts/mdtest/fixtures/Links, reference style.xhtml create mode 100755 test/javascripts/mdtest/fixtures/Links, shortcut references.text create mode 100755 test/javascripts/mdtest/fixtures/Links, shortcut references.xhtml create mode 100755 test/javascripts/mdtest/fixtures/Literal quotes in titles.text create mode 100755 test/javascripts/mdtest/fixtures/Literal quotes in titles.xhtml create mode 100755 test/javascripts/mdtest/fixtures/Markdown Documentation - Basics.text create mode 100755 test/javascripts/mdtest/fixtures/Markdown Documentation - Basics.xhtml create mode 100755 test/javascripts/mdtest/fixtures/Markdown Documentation - Syntax.text create mode 100755 test/javascripts/mdtest/fixtures/Markdown Documentation - Syntax.xhtml create mode 100755 test/javascripts/mdtest/fixtures/Nested blockquotes.text create mode 100755 test/javascripts/mdtest/fixtures/Nested blockquotes.xhtml create mode 100755 test/javascripts/mdtest/fixtures/Ordered and unordered lists.text create mode 100755 test/javascripts/mdtest/fixtures/Ordered and unordered lists.xhtml create mode 100755 test/javascripts/mdtest/fixtures/Strong and em together.text create mode 100755 test/javascripts/mdtest/fixtures/Strong and em together.xhtml create mode 100755 test/javascripts/mdtest/fixtures/Tabs.text create mode 100755 test/javascripts/mdtest/fixtures/Tabs.xhtml create mode 100755 test/javascripts/mdtest/fixtures/Tidyness.text create mode 100755 test/javascripts/mdtest/fixtures/Tidyness.xhtml create mode 100644 test/javascripts/mdtest/mdtest.js.erb diff --git a/app/assets/javascripts/discourse/components/markdown.js b/app/assets/javascripts/discourse/components/markdown.js index fdd387fbb11..d702d7df2e6 100644 --- a/app/assets/javascripts/discourse/components/markdown.js +++ b/app/assets/javascripts/discourse/components/markdown.js @@ -125,6 +125,7 @@ Discourse.Markdown = { if (Discourse.Markdown.validClasses[val]) { return val; } }, + /** Sanitize text using the sanitizer @@ -152,10 +153,6 @@ Discourse.Markdown = { text = Discourse.Dialect.cook(text, opts); if (!text) return ""; - if (opts.sanitize) { - text = Discourse.Markdown.sanitize(text); - } - return text; } }; diff --git a/app/assets/javascripts/discourse/dialects/bbcode_dialect.js b/app/assets/javascripts/discourse/dialects/bbcode_dialect.js index 4ae3157a2ba..00fc0f55bae 100644 --- a/app/assets/javascripts/discourse/dialects/bbcode_dialect.js +++ b/app/assets/javascripts/discourse/dialects/bbcode_dialect.js @@ -103,8 +103,3 @@ Discourse.Dialect.replaceBlock({ } }); -Discourse.Markdown.whiteListClass("bbcode-b", "bbcode-i", "bbcode-u", "bbcode-s", "spoiler"); - -for(var i=1; i<=40; i++) { - Discourse.Markdown.whiteListClass("bbcode-size-" + i); -} \ No newline at end of file diff --git a/app/assets/javascripts/discourse/dialects/bold_italics_dialect.js b/app/assets/javascripts/discourse/dialects/bold_italics_dialect.js index 40bf4098ea3..3c35b3b777f 100644 --- a/app/assets/javascripts/discourse/dialects/bold_italics_dialect.js +++ b/app/assets/javascripts/discourse/dialects/bold_italics_dialect.js @@ -10,6 +10,12 @@ Discourse.Dialect.inlineBetween({ emitter: function(contents) { return ['strong', ['em'].concat(contents)]; } }); +Discourse.Dialect.inlineBetween({ + between: '___', + wordBoundary: true, + emitter: function(contents) { return ['strong', ['em'].concat(contents)]; } +}); + // Builds a common markdown replacer var replaceMarkdown = function(match, tag) { Discourse.Dialect.inlineBetween({ diff --git a/app/assets/javascripts/discourse/dialects/dialect.js b/app/assets/javascripts/discourse/dialects/dialect.js index 58bb55f7a17..68d3d0ac4b9 100644 --- a/app/assets/javascripts/discourse/dialects/dialect.js +++ b/app/assets/javascripts/discourse/dialects/dialect.js @@ -31,19 +31,31 @@ function initializeDialects() { @returns {Array} the parsed tree **/ function parseTree(tree, path, insideCounts) { + if (tree instanceof Array) { Discourse.Dialect.trigger('parseNode', {node: tree, path: path, dialect: dialect, insideCounts: insideCounts || {}}); + path = path || []; insideCounts = insideCounts || {}; path.push(tree); - tree.slice(1).forEach(function (n) { - var tagName = n[0]; + + for (var i=1; i$/m.exec(n[1])) { + // Remove paragraphs around comment-only nodes. + tree[i] = n[1]; + } else { + parseTree(n, path, insideCounts); + } + insideCounts[tagName] = insideCounts[tagName] - 1; - }); + } path.pop(); } return tree; @@ -207,6 +219,19 @@ Discourse.Dialect = { }; }, + /** + Registers a block for processing. This is more complicated than using one of + the other helpers such as `replaceBlock` so consider using them first! + + @method registerBlock + @param {String} the name of the block handler + @param {Function} the handler + + **/ + registerBlock: function(name, handler) { + dialect.block[name] = handler; + }, + /** Replaces a block of text between a start and stop. As opposed to inline, these might span multiple lines. @@ -233,9 +258,11 @@ Discourse.Dialect = { **/ replaceBlock: function(args) { - dialect.block[args.start.toString()] = function(block, next) { + this.registerBlock(args.start.toString(), function(block, next) { + args.start.lastIndex = 0; var m = (args.start).exec(block); + if (!m) { return; } var startPos = block.indexOf(m[0]), @@ -261,16 +288,33 @@ Discourse.Dialect = { } lineNumber++; + + + var blockClosed = false; + if (next.length > 0) { + for (var i=0; i= 0) { + blockClosed = true; + break; + } + } + } + + if (!blockClosed) { + if (m[2]) { next.shift(); } + return; + } + while (next.length > 0) { var b = next.shift(), blockLine = b.lineNumber, - diff = ((typeof blockLine === "undefined") ? lineNumber : blockLine) - lineNumber; - - var endFound = b.indexOf(args.stop), + diff = ((typeof blockLine === "undefined") ? lineNumber : blockLine) - lineNumber, + endFound = b.indexOf(args.stop), leadingContents = b.slice(0, endFound), trailingContents = b.slice(endFound+args.stop.length); - for (var i=1; i= 0) { blockClosed = true; } + for (var j=1; j]+\>/)) { + return [ block.toString() ]; + } +}); \ No newline at end of file diff --git a/app/assets/javascripts/discourse/dialects/mention_dialect.js b/app/assets/javascripts/discourse/dialects/mention_dialect.js index 669d5e980d0..55687257bc1 100644 --- a/app/assets/javascripts/discourse/dialects/mention_dialect.js +++ b/app/assets/javascripts/discourse/dialects/mention_dialect.js @@ -20,4 +20,3 @@ Discourse.Dialect.inlineRegexp({ } }); -Discourse.Markdown.whiteListClass('mention'); \ No newline at end of file diff --git a/app/assets/javascripts/discourse/dialects/newline_dialect.js b/app/assets/javascripts/discourse/dialects/newline_dialect.js index 1d51d4b9cd2..22c90f65ccf 100644 --- a/app/assets/javascripts/discourse/dialects/newline_dialect.js +++ b/app/assets/javascripts/discourse/dialects/newline_dialect.js @@ -29,4 +29,4 @@ Discourse.Dialect.postProcessText(function (text, event) { } } -}); \ No newline at end of file +}); diff --git a/app/assets/javascripts/discourse/dialects/onebox_dialect.js b/app/assets/javascripts/discourse/dialects/onebox_dialect.js index c7d981f7e63..86f571d181c 100644 --- a/app/assets/javascripts/discourse/dialects/onebox_dialect.js +++ b/app/assets/javascripts/discourse/dialects/onebox_dialect.js @@ -77,4 +77,3 @@ Discourse.Dialect.on("parseNode", function(event) { } }); -Discourse.Markdown.whiteListClass("onebox", "onebox-result", "onebox-result-body", "source", "clearfix", "thumbnail", "info"); \ No newline at end of file diff --git a/app/assets/javascripts/discourse/dialects/quote_dialect.js b/app/assets/javascripts/discourse/dialects/quote_dialect.js index ee254043358..9db791278cb 100644 --- a/app/assets/javascripts/discourse/dialects/quote_dialect.js +++ b/app/assets/javascripts/discourse/dialects/quote_dialect.js @@ -44,7 +44,7 @@ Discourse.Dialect.replaceBlock({ return ['p', ['aside', params, ['div', {'class': 'title'}, ['div', {'class': 'quote-controls'}], - avatarImg ? avatarImg : "", + avatarImg ? ['__RAW', avatarImg] : "", I18n.t('user.said', {username: username}) ], contents @@ -69,4 +69,3 @@ Discourse.Dialect.on("parseNode", function(event) { }); -Discourse.Markdown.whiteListClass("quote", "title", "quote-controls", "avatar"); \ No newline at end of file diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index 7ccd573256c..c1619d8f910 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -5,47 +5,6 @@ require_dependency 'post' module PrettyText - def self.whitelist - { - elements: %w[ - a abbr aside b bdo blockquote br caption cite code col colgroup dd div del dfn dl - dt em hr figcaption figure h1 h2 h3 h4 h5 h6 hgroup i img ins kbd li mark - ol p pre q rp rt ruby s samp small span strike strong sub sup table tbody td - tfoot th thead time tr u ul var wbr - ], - - attributes: { - :all => ['dir', 'lang', 'title', 'class'], - 'aside' => ['data-post', 'data-full', 'data-topic'], - 'a' => ['href'], - 'blockquote' => ['cite'], - 'col' => ['span', 'width'], - 'colgroup' => ['span', 'width'], - 'del' => ['cite', 'datetime'], - 'img' => ['align', 'alt', 'height', 'src', 'width'], - 'ins' => ['cite', 'datetime'], - 'ol' => ['start', 'reversed', 'type'], - 'q' => ['cite'], - 'span' => ['style'], - 'table' => ['summary', 'width', 'style', 'cellpadding', 'cellspacing'], - 'td' => ['abbr', 'axis', 'colspan', 'rowspan', 'width', 'style'], - 'th' => ['abbr', 'axis', 'colspan', 'rowspan', 'scope', 'width', 'style'], - 'time' => ['datetime', 'pubdate'], - 'ul' => ['type'] - }, - - protocols: { - 'a' => {'href' => ['ftp', 'http', 'https', 'mailto', :relative]}, - 'blockquote' => {'cite' => ['http', 'https', :relative]}, - 'del' => {'cite' => ['http', 'https', :relative]}, - 'img' => {'src' => ['http', 'https', :relative]}, - 'ins' => {'cite' => ['http', 'https', :relative]}, - 'q' => {'cite' => ['http', 'https', :relative]} - } - } - end - - class Helpers def t(key, opts) @@ -226,7 +185,7 @@ module PrettyText cloned = opts.dup # we have a minor inconsistency cloned[:topicId] = opts[:topic_id] - sanitized = Sanitize.clean(markdown(text.dup, cloned), PrettyText.whitelist) + sanitized = markdown(text.dup, cloned) if SiteSetting.add_rel_nofollow_to_user_content sanitized = add_rel_nofollow_to_user_content(sanitized) end diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb index 8625496b62b..d85e245625c 100644 --- a/spec/components/pretty_text_spec.rb +++ b/spec/components/pretty_text_spec.rb @@ -32,7 +32,7 @@ describe PrettyText do end it "should sanitize the html" do - PrettyText.cook("").should match_html "

" + PrettyText.cook("").should match_html "" end it 'should allow for @mentions to have punctuation' do diff --git a/spec/models/post_analyzer_spec.rb b/spec/models/post_analyzer_spec.rb index 97671fb04a7..d8f69462bb2 100644 --- a/spec/models/post_analyzer_spec.rb +++ b/spec/models/post_analyzer_spec.rb @@ -184,7 +184,7 @@ describe PostAnalyzer do end it "ignores code" do - post_analyzer = PostAnalyzer.new("@Jake @Finn", default_topic_id) + post_analyzer = PostAnalyzer.new("@Jake `@Finn`", default_topic_id) post_analyzer.raw_mentions.should == ['jake'] end diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb index 847ca356ab4..7ae8e5cb191 100644 --- a/spec/models/post_spec.rb +++ b/spec/models/post_spec.rb @@ -376,7 +376,7 @@ describe Post do end it "ignores code" do - post = Fabricate.build(:post, post_args.merge(raw: "@Jake @Finn")) + post = Fabricate.build(:post, post_args.merge(raw: "@Jake `@Finn`")) post.raw_mentions.should == ['jake'] end diff --git a/test/javascripts/components/bbcode_test.js b/test/javascripts/components/bbcode_test.js index 1fb59dca108..a3b44951b51 100644 --- a/test/javascripts/components/bbcode_test.js +++ b/test/javascripts/components/bbcode_test.js @@ -22,6 +22,11 @@ test('basic bbcode', function() { "allows embedding of tags"); }); +test('invalid bbcode', function() { + var cooked = Discourse.Markdown.cook("[code]I am not closed\n\nThis text exists.", {lookupAvatar: false}); + equal(cooked, "

[code]I am not closed

\n\n

This text exists.

", "does not raise an error with an open bbcode tag."); +}); + test('lists', function() { format("[ul][li]option one[/li][/ul]", "
  • option one
", "creates an ul"); format("[ol][li]option one[/li][/ol]", "
  1. option one
", "creates an ol"); diff --git a/test/javascripts/components/markdown_test.js b/test/javascripts/components/markdown_test.js index 4010b05fd89..5d22b45bcc5 100644 --- a/test/javascripts/components/markdown_test.js +++ b/test/javascripts/components/markdown_test.js @@ -8,6 +8,12 @@ module("Discourse.Markdown", { var cooked = function(input, expected, text) { var result = Discourse.Markdown.cook(input, {mentionLookup: false, sanitize: true}); + + if (result !== expected) { + console.log(JSON.stringify(result)); + console.log(JSON.stringify(expected)); + } + equal(result, expected, text); }; @@ -31,7 +37,7 @@ test("basic cooking", function() { test("Traditional Line Breaks", function() { var input = "1\n2\n3"; - cooked(input, "

1
2
3

", "automatically handles trivial newlines"); + cooked(input, "

1
2
3

", "automatically handles trivial newlines"); var traditionalOutput = "

1\n2\n3

"; @@ -46,7 +52,7 @@ test("Traditional Line Breaks", function() { test("Line Breaks", function() { cooked("[] first choice\n[] second choice", - "

[] first choice
[] second choice

", + "

[] first choice
[] second choice

", "it handles new lines correctly with [] options"); }); @@ -89,10 +95,10 @@ test("Links", function() { "autolinks a URL with parentheses (like Wikipedia)"); cooked("Here's a tweet:\nhttps://twitter.com/evil_trout/status/345954894420787200", - "

Here's a tweet:
https://twitter.com/evil_trout/status/345954894420787200

", + "

Here's a tweet:
https://twitter.com/evil_trout/status/345954894420787200

", "It doesn't strip the new line."); - cooked("1. View @eviltrout's profile here: http://meta.discourse.org/users/eviltrout/activity
next line.", + cooked("1. View @eviltrout's profile here: http://meta.discourse.org/users/eviltrout/activity
next line.", "
  1. View @eviltrout's profile here: http://meta.discourse.org/users/eviltrout/activity
    next line.
", "allows autolinking within a list without inserting a paragraph."); @@ -105,7 +111,7 @@ test("Links", function() { 'allows multiple links on one line'); cooked("* [Evil Trout][1]\n [1]: http://eviltrout.com", - "", + "", "allows markdown link references in a list"); }); @@ -121,9 +127,9 @@ test("simple quotes", function() { "it allows nesting of blockquotes with spaces"); cooked("- hello\n\n > world\n > eviltrout", - "
  • hello
\n\n

world
eviltrout

", + "
  • hello
\n\n

world
eviltrout

", "it allows quotes within a list."); - cooked(" > indent 1\n > indent 2", "

indent 1
indent 2

", "allow multiple spaces to indent"); + cooked(" > indent 1\n > indent 2", "

indent 1
indent 2

", "allow multiple spaces to indent"); }); @@ -136,7 +142,7 @@ test("Quotes", function() { "works with multiple lines"); cookedOptions("1[quote=\"bob, post:1\"]my quote[/quote]2", - { topicId: 2, lookupAvatar: function(name) { return "" + name; } }, + { topicId: 2, lookupAvatar: function(name) { return "" + name; }, sanitize: true }, "

1

\n\n

\n\n

2

", "handles quotes properly"); @@ -160,7 +166,7 @@ test("Mentions", function() { cooked("robin@email.host", "

robin@email.host

", "won't add mention class to an email address"); cooked("hanzo55@yahoo.com", "

hanzo55@yahoo.com

", "won't be affected by email addresses that have a number before the @ symbol"); cooked("@EvilTrout yo", "

@EvilTrout yo

", "it handles mentions at the beginning of a string"); - cooked("yo\n@EvilTrout", "

yo
@EvilTrout

", "it handles mentions at the beginning of a new line"); + cooked("yo\n@EvilTrout", "

yo
@EvilTrout

", "it handles mentions at the beginning of a new line"); cooked("`evil` @EvilTrout `trout`", "

evil @EvilTrout trout

", "deals correctly with multiple blocks"); @@ -171,7 +177,7 @@ test("Mentions", function() { "handles mentions in simple quotes"); cooked("> foo bar baz @eviltrout ohmagerd\nlook at this", - "

foo bar baz @eviltrout ohmagerd
look at this

", + "

foo bar baz @eviltrout ohmagerd
look at this

", "does mentions properly with trailing text within a simple quote"); cooked("`code` is okay before @mention", @@ -224,7 +230,7 @@ test("Oneboxing", function() { cooked("http://en.wikipedia.org/wiki/Homicide:_Life_on_the_Street", "

http://en.wikipedia.org/wiki/Homicide:_Life_on_the_Street

", + " target=\"_blank\">http://en.wikipedia.org/wiki/Homicide:_Life_on_the_Street

", "works with links that have underscores in them"); }); @@ -248,7 +254,7 @@ test("Code Blocks", function() { "it maintains new lines inside a code block."); cooked("hello\nworld\n```json\nline 1\n\nline 2\n\n\nline3\n```", - "

hello
world

\n\n

line 1\n\nline 2\n\n\nline3

", + "

hello
world

\n\n

line 1\n\nline 2\n\n\nline3

", "it maintains new lines inside a code block with leading content."); cooked("```text\n
hello
\n```", @@ -287,7 +293,7 @@ test("sanitize", function() { cooked("hello", "

hello

", "it sanitizes while cooking"); cooked("disney reddit", - "

disney reddit

", + "disney reddit", "we can embed proper links"); }); @@ -295,7 +301,7 @@ test("sanitize", function() { test("URLs in BBCode tags", function() { cooked("[img]http://eviltrout.com/eviltrout.png[/img][img]http://samsaffron.com/samsaffron.png[/img]", - "

", + "

", "images are properly parsed"); cooked("[url]http://discourse.org[/url]", diff --git a/test/javascripts/mdtest/fixtures/Amps and angle encoding.text b/test/javascripts/mdtest/fixtures/Amps and angle encoding.text new file mode 100755 index 00000000000..0e9527f9311 --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Amps and angle encoding.text @@ -0,0 +1,21 @@ +AT&T has an ampersand in their name. + +AT&T is another way to write it. + +This & that. + +4 < 5. + +6 > 5. + +Here's a [link] [1] with an ampersand in the URL. + +Here's a link with an amersand in the link text: [AT&T] [2]. + +Here's an inline [link](/script?foo=1&bar=2). + +Here's an inline [link](). + + +[1]: http://example.com/?foo=1&bar=2 +[2]: http://att.com/ "AT&T" \ No newline at end of file diff --git a/test/javascripts/mdtest/fixtures/Amps and angle encoding.xhtml b/test/javascripts/mdtest/fixtures/Amps and angle encoding.xhtml new file mode 100755 index 00000000000..c458eb03517 --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Amps and angle encoding.xhtml @@ -0,0 +1,22 @@ + +

AT&T has an ampersand in their name.

+ +

AT&T is another way to write it.

+ +

This & that.

+ +

4 < 5.

+ +

6 > 5.

+ +

Here's a link with an ampersand in the URL.

+ +

Here's a link with an amersand in the link text: AT&T.

+ +

Here's an inline link.

+ +

Here's an inline link.

diff --git a/test/javascripts/mdtest/fixtures/Auto links.text b/test/javascripts/mdtest/fixtures/Auto links.text new file mode 100755 index 00000000000..abbc48869de --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Auto links.text @@ -0,0 +1,13 @@ +Link: . + +With an ampersand: + +* In a list? +* +* It should. + +> Blockquoted: + +Auto-links should not occur here: `` + + or here: \ No newline at end of file diff --git a/test/javascripts/mdtest/fixtures/Auto links.xhtml b/test/javascripts/mdtest/fixtures/Auto links.xhtml new file mode 100755 index 00000000000..f8df9852c7d --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Auto links.xhtml @@ -0,0 +1,18 @@ +

Link: http://example.com/.

+ +

With an ampersand: http://example.com/?foo=1&bar=2

+ + + +
+

Blockquoted: http://example.com/

+
+ +

Auto-links should not occur here: <http://example.com/>

+ +
or here: <http://example.com/>
+
diff --git a/test/javascripts/mdtest/fixtures/Backslash escapes.text b/test/javascripts/mdtest/fixtures/Backslash escapes.text new file mode 100755 index 00000000000..5b014cb33d1 --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Backslash escapes.text @@ -0,0 +1,120 @@ +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: \- + + + +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: `\-` + + +These should get escaped, even though they're matching pairs for +other Markdown constructs: + +\*asterisks\* + +\_underscores\_ + +\`backticks\` + +This is a code span with a literal backslash-backtick sequence: `` \` `` + +This is a tag with unescaped backticks bar. + +This is a tag with backslashes bar. diff --git a/test/javascripts/mdtest/fixtures/Backslash escapes.xhtml b/test/javascripts/mdtest/fixtures/Backslash escapes.xhtml new file mode 100755 index 00000000000..6c54bdc68d4 --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Backslash escapes.xhtml @@ -0,0 +1,125 @@ + +

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: -

+ +

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: \-

+ + +

These should get escaped, even though they're matching pairs for +other Markdown constructs:

+ +

*asterisks*

+ +

_underscores_

+ +

`backticks`

+ +

This is a code span with a literal backslash-backtick sequence: \`

+ +

This is a tag with unescaped backticks bar.

+ +

This is a tag with backslashes bar.

diff --git a/test/javascripts/mdtest/fixtures/Blockquotes with code blocks.text b/test/javascripts/mdtest/fixtures/Blockquotes with code blocks.text new file mode 100755 index 00000000000..c31d171049d --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Blockquotes with code blocks.text @@ -0,0 +1,11 @@ +> Example: +> +> sub status { +> print "working"; +> } +> +> Or: +> +> sub status { +> return "working"; +> } diff --git a/test/javascripts/mdtest/fixtures/Blockquotes with code blocks.xhtml b/test/javascripts/mdtest/fixtures/Blockquotes with code blocks.xhtml new file mode 100755 index 00000000000..2f9c92bef05 --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Blockquotes with code blocks.xhtml @@ -0,0 +1,20 @@ + +
+

Example:

+ +
sub status {
+    print "working";
+}
+
+ +

Or:

+ +
sub status {
+    return "working";
+}
+
+
diff --git a/test/javascripts/mdtest/fixtures/Code Blocks.text b/test/javascripts/mdtest/fixtures/Code Blocks.text new file mode 100755 index 00000000000..b54b09285a7 --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Code Blocks.text @@ -0,0 +1,14 @@ + code block on the first line + +Regular text. + + code block indented by spaces + +Regular text. + + the lines in this block + all contain trailing spaces + +Regular Text. + + code block on the last line \ No newline at end of file diff --git a/test/javascripts/mdtest/fixtures/Code Blocks.xhtml b/test/javascripts/mdtest/fixtures/Code Blocks.xhtml new file mode 100755 index 00000000000..f6461051af6 --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Code Blocks.xhtml @@ -0,0 +1,17 @@ +
code block on the first line
+
+ +

Regular text.

+ +
code block indented by spaces
+
+ +

Regular text.

+ +
the lines in this block  
+all contain trailing spaces
+ +

Regular Text.

+ +
code block on the last line
+
diff --git a/test/javascripts/mdtest/fixtures/Code Spans.text b/test/javascripts/mdtest/fixtures/Code Spans.text new file mode 100755 index 00000000000..5c229c7ad31 --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Code Spans.text @@ -0,0 +1,5 @@ +`` + +Fix for backticks within HTML tag: like this + +Here's how you put `` `backticks` `` in a code span. \ No newline at end of file diff --git a/test/javascripts/mdtest/fixtures/Code Spans.xhtml b/test/javascripts/mdtest/fixtures/Code Spans.xhtml new file mode 100755 index 00000000000..b28505047b7 --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Code Spans.xhtml @@ -0,0 +1,12 @@ + +

<test a=" content of attribute ">

+ +

Fix for backticks within HTML tag: like this

+ +

Here's how you put `backticks` in a code span.

diff --git a/test/javascripts/mdtest/fixtures/Hard-wrapped paragraphs with list-like lines.text b/test/javascripts/mdtest/fixtures/Hard-wrapped paragraphs with list-like lines.text new file mode 100755 index 00000000000..f8a5b27bf41 --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Hard-wrapped paragraphs with list-like lines.text @@ -0,0 +1,8 @@ +In Markdown 1.0.0 and earlier. Version +8. This line turns into a list item. +Because a hard-wrapped line in the +middle of a paragraph looked like a +list item. + +Here's one with a bullet. +* criminey. diff --git a/test/javascripts/mdtest/fixtures/Hard-wrapped paragraphs with list-like lines.xhtml b/test/javascripts/mdtest/fixtures/Hard-wrapped paragraphs with list-like lines.xhtml new file mode 100755 index 00000000000..e21ac79a2e0 --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Hard-wrapped paragraphs with list-like lines.xhtml @@ -0,0 +1,8 @@ +

In Markdown 1.0.0 and earlier. Version +8. This line turns into a list item. +Because a hard-wrapped line in the +middle of a paragraph looked like a +list item.

+ +

Here's one with a bullet. +* criminey.

diff --git a/test/javascripts/mdtest/fixtures/Horizontal rules.text b/test/javascripts/mdtest/fixtures/Horizontal rules.text new file mode 100755 index 00000000000..1594bda27b4 --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Horizontal rules.text @@ -0,0 +1,67 @@ +Dashes: + +--- + + --- + + --- + + --- + + --- + +- - - + + - - - + + - - - + + - - - + + - - - + + +Asterisks: + +*** + + *** + + *** + + *** + + *** + +* * * + + * * * + + * * * + + * * * + + * * * + + +Underscores: + +___ + + ___ + + ___ + + ___ + + ___ + +_ _ _ + + _ _ _ + + _ _ _ + + _ _ _ + + _ _ _ diff --git a/test/javascripts/mdtest/fixtures/Horizontal rules.xhtml b/test/javascripts/mdtest/fixtures/Horizontal rules.xhtml new file mode 100755 index 00000000000..2dc2ab65659 --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Horizontal rules.xhtml @@ -0,0 +1,71 @@ +

Dashes:

+ +
+ +
+ +
+ +
+ +
---
+
+ +
+ +
+ +
+ +
+ +
- - -
+
+ +

Asterisks:

+ +
+ +
+ +
+ +
+ +
***
+
+ +
+ +
+ +
+ +
+ +
* * *
+
+ +

Underscores:

+ +
+ +
+ +
+ +
+ +
___
+
+ +
+ +
+ +
+ +
+ +
_ _ _
+
diff --git a/test/javascripts/mdtest/fixtures/Images.text b/test/javascripts/mdtest/fixtures/Images.text new file mode 100755 index 00000000000..5707590915a --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Images.text @@ -0,0 +1,26 @@ +![Alt text](/path/to/img.jpg) + +![Alt text](/path/to/img.jpg "Optional title") + +Inline within a paragraph: [alt text](/url/). + +![alt text](/url/ "title preceded by two spaces") + +![alt text](/url/ "title has spaces afterward" ) + +![alt text]() + +![alt text]( "with a title"). + +![Empty]() + +![this is a stupid URL](http://example.com/(parens).jpg) + + +![alt text][foo] + + [foo]: /url/ + +![alt text][bar] + + [bar]: /url/ "Title here" \ No newline at end of file diff --git a/test/javascripts/mdtest/fixtures/Images.xhtml b/test/javascripts/mdtest/fixtures/Images.xhtml new file mode 100755 index 00000000000..925bc1476eb --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Images.xhtml @@ -0,0 +1,21 @@ +

Alt text

+ +

Alt text

+ +

Inline within a paragraph: alt text.

+ +

alt text

+ +

alt text

+ +

alt text

+ +

alt text.

+ +

Empty

+ +

this is a stupid URL

+ +

alt text

+ +

alt text

diff --git a/test/javascripts/mdtest/fixtures/Inline HTML (Advanced).text b/test/javascripts/mdtest/fixtures/Inline HTML (Advanced).text new file mode 100755 index 00000000000..0c59e89516f --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Inline HTML (Advanced).text @@ -0,0 +1,30 @@ +Simple block on one line: + +
foo
+ +And nested without indentation: + +
+
+
+foo +
+
+
+
bar
+
+ +And with attributes: + +
+
+
+
+ +This was broken in 1.0.2b7: + +
+
+foo +
+
diff --git a/test/javascripts/mdtest/fixtures/Inline HTML (Advanced).xhtml b/test/javascripts/mdtest/fixtures/Inline HTML (Advanced).xhtml new file mode 100755 index 00000000000..1914c2a4353 --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Inline HTML (Advanced).xhtml @@ -0,0 +1,36 @@ + +

Simple block on one line:

+ +
foo
+ +

And nested without indentation:

+ +
+
+
+foo +
+
+
+
bar
+
+ +

And with attributes:

+ +
+
+
+
+ +

This was broken in 1.0.2b7:

+ +
+
+foo +
+
diff --git a/test/javascripts/mdtest/fixtures/Inline HTML (Simple).text b/test/javascripts/mdtest/fixtures/Inline HTML (Simple).text new file mode 100755 index 00000000000..d3e1d4efc7c --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Inline HTML (Simple).text @@ -0,0 +1,54 @@ +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/test/javascripts/mdtest/fixtures/Inline HTML (Simple).xhtml b/test/javascripts/mdtest/fixtures/Inline HTML (Simple).xhtml new file mode 100755 index 00000000000..f872b904809 --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Inline HTML (Simple).xhtml @@ -0,0 +1,63 @@ + +

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/test/javascripts/mdtest/fixtures/Inline HTML comments.text b/test/javascripts/mdtest/fixtures/Inline HTML comments.text new file mode 100755 index 00000000000..41d830d0385 --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Inline HTML comments.text @@ -0,0 +1,13 @@ +Paragraph one. + + + + + +Paragraph two. + + + +The end. diff --git a/test/javascripts/mdtest/fixtures/Inline HTML comments.xhtml b/test/javascripts/mdtest/fixtures/Inline HTML comments.xhtml new file mode 100755 index 00000000000..3f167a1610e --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Inline HTML comments.xhtml @@ -0,0 +1,13 @@ +

Paragraph one.

+ + + + + +

Paragraph two.

+ + + +

The end.

diff --git a/test/javascripts/mdtest/fixtures/Links, inline style.text b/test/javascripts/mdtest/fixtures/Links, inline style.text new file mode 100755 index 00000000000..aba96583517 --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Links, inline style.text @@ -0,0 +1,24 @@ +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"). + +[URL and title](/url/ "title has spaces afterward" ). + +[URL wrapped in angle brackets](). + +[URL w/ angle brackets + title]( "Here's the title"). + +[Empty](). + +[With parens in the URL](http://en.wikipedia.org/wiki/WIMP_(computing)) + +(With outer parens and [parens in url](/foo(bar))) + + +[With parens in the URL](/foo(bar) "and a title") + +(With outer parens and [parens in url](/foo(bar) "and a title")) diff --git a/test/javascripts/mdtest/fixtures/Links, inline style.xhtml b/test/javascripts/mdtest/fixtures/Links, inline style.xhtml new file mode 100755 index 00000000000..5802fe612a3 --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Links, inline style.xhtml @@ -0,0 +1,28 @@ + +

Just a URL.

+ +

URL and title.

+ +

URL and title.

+ +

URL and title.

+ +

URL and title.

+ +

URL wrapped in angle brackets.

+ +

URL w/ angle brackets + title.

+ +

Empty.

+ +

With parens in the URL

+ +

(With outer parens and parens in url)

+ +

With parens in the URL

+ +

(With outer parens and parens in url)

diff --git a/test/javascripts/mdtest/fixtures/Links, reference style.text b/test/javascripts/mdtest/fixtures/Links, reference style.text new file mode 100755 index 00000000000..341ec88e3d0 --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Links, reference style.text @@ -0,0 +1,71 @@ +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/ + +* * * + +[this] [this] should work + +So should [this][this]. + +And [this] []. + +And [this][]. + +And [this]. + +But not [that] []. + +Nor [that][]. + +Nor [that]. + +[Something in brackets like [this][] should work] + +[Same with [this].] + +In this case, [this](/somethingelse/) points to something else. + +Backslashing should suppress \[this] and [this\]. + +[this]: foo + + +* * * + +Here's one where the [link +breaks] across lines. + +Here's another where the [link +breaks] across lines, but with a line-ending space. + + +[link breaks]: /url/ diff --git a/test/javascripts/mdtest/fixtures/Links, reference style.xhtml b/test/javascripts/mdtest/fixtures/Links, reference style.xhtml new file mode 100755 index 00000000000..8e70c32f4d4 --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Links, reference style.xhtml @@ -0,0 +1,52 @@ +

Foo bar.

+ +

Foo bar.

+ +

Foo bar.

+ +

With embedded [brackets].

+ +

Indented once.

+ +

Indented twice.

+ +

Indented thrice.

+ +

Indented [four][] times.

+ +
[four]: /url
+
+ +
+ +

this should work

+ +

So should this.

+ +

And this.

+ +

And this.

+ +

And this.

+ +

But not [that] [].

+ +

Nor [that][].

+ +

Nor [that].

+ +

[Something in brackets like this should work]

+ +

[Same with this.]

+ +

In this case, this points to something else.

+ +

Backslashing should suppress [this] and [this].

+ +
+ +

Here's one where the link +breaks across lines.

+ +

Here's another where the link +breaks across lines, but with a line-ending space.

diff --git a/test/javascripts/mdtest/fixtures/Links, shortcut references.text b/test/javascripts/mdtest/fixtures/Links, shortcut references.text new file mode 100755 index 00000000000..8c44c98feed --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Links, shortcut references.text @@ -0,0 +1,20 @@ +This is the [simple case]. + +[simple case]: /simple + + + +This one has a [line +break]. + +This one has a [line +break] with a line-ending space. + +[line break]: /foo + + +[this] [that] and the [other] + +[this]: /this +[that]: /that +[other]: /other diff --git a/test/javascripts/mdtest/fixtures/Links, shortcut references.xhtml b/test/javascripts/mdtest/fixtures/Links, shortcut references.xhtml new file mode 100755 index 00000000000..bf81e939f5e --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Links, shortcut references.xhtml @@ -0,0 +1,9 @@ +

This is the simple case.

+ +

This one has a line +break.

+ +

This one has a line +break with a line-ending space.

+ +

this and the other

diff --git a/test/javascripts/mdtest/fixtures/Literal quotes in titles.text b/test/javascripts/mdtest/fixtures/Literal quotes in titles.text new file mode 100755 index 00000000000..29d0e4235b2 --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Literal quotes in titles.text @@ -0,0 +1,7 @@ +Foo [bar][]. + +Foo [bar](/url/ "Title with "quotes" inside"). + + + [bar]: /url/ "Title with "quotes" inside" + diff --git a/test/javascripts/mdtest/fixtures/Literal quotes in titles.xhtml b/test/javascripts/mdtest/fixtures/Literal quotes in titles.xhtml new file mode 100755 index 00000000000..611c1ac61f0 --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Literal quotes in titles.xhtml @@ -0,0 +1,3 @@ +

Foo bar.

+ +

Foo bar.

diff --git a/test/javascripts/mdtest/fixtures/Markdown Documentation - Basics.text b/test/javascripts/mdtest/fixtures/Markdown Documentation - Basics.text new file mode 100755 index 00000000000..01ce740d5ee --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Markdown Documentation - Basics.text @@ -0,0 +1,306 @@ +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. +
  2. Green
    3. +
  3. Blue
    4. +
+ +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 `&mdash;` + instead of decimal-encoded entites like `&#8212;`. + +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/test/javascripts/mdtest/fixtures/Markdown Documentation - Basics.xhtml b/test/javascripts/mdtest/fixtures/Markdown Documentation - Basics.xhtml new file mode 100755 index 00000000000..2b85112ab28 --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Markdown Documentation - Basics.xhtml @@ -0,0 +1,319 @@ + +

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 `&amp;mdash;`
+instead of decimal-encoded entites like `&amp;#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/test/javascripts/mdtest/fixtures/Markdown Documentation - Syntax.text b/test/javascripts/mdtest/fixtures/Markdown Documentation - Syntax.text new file mode 100755 index 00000000000..cb70921d1e9 --- /dev/null +++ b/test/javascripts/mdtest/fixtures/Markdown Documentation - Syntax.text @@ -0,0 +1,888 @@ +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. +
  2. McHale
    3. +
  3. Parish
    4. +
+ +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:
+
+        

+            © 2004 Foo Corporation
+        

+
+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/test/javascripts/mdtest/fixtures/Markdown Documentation - Syntax.xhtml b/test/javascripts/mdtest/fixtures/Markdown Documentation - Syntax.xhtml
new file mode 100755
index 00000000000..fb7b7693521
--- /dev/null
+++ b/test/javascripts/mdtest/fixtures/Markdown Documentation - Syntax.xhtml	
@@ -0,0 +1,949 @@
+
+
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.

+
+
Headers

+
+
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

+
+
Links

+
+
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

+
+
Automatic Links

+
+
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/test/javascripts/mdtest/fixtures/Nested blockquotes.text b/test/javascripts/mdtest/fixtures/Nested blockquotes.text
new file mode 100755
index 00000000000..ed3c624ffbe
--- /dev/null
+++ b/test/javascripts/mdtest/fixtures/Nested blockquotes.text	
@@ -0,0 +1,5 @@
+> foo
+>
+> > bar
+>
+> foo
diff --git a/test/javascripts/mdtest/fixtures/Nested blockquotes.xhtml b/test/javascripts/mdtest/fixtures/Nested blockquotes.xhtml
new file mode 100755
index 00000000000..d8ec7f8e03f
--- /dev/null
+++ b/test/javascripts/mdtest/fixtures/Nested blockquotes.xhtml	
@@ -0,0 +1,9 @@
+

+  
foo

+  
+  

+    
bar

+  

+  
+  
foo

+

diff --git a/test/javascripts/mdtest/fixtures/Ordered and unordered lists.text b/test/javascripts/mdtest/fixtures/Ordered and unordered lists.text
new file mode 100755
index 00000000000..37dee0fa98f
--- /dev/null
+++ b/test/javascripts/mdtest/fixtures/Ordered and unordered lists.text	
@@ -0,0 +1,131 @@
+## 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
+
+
+This was an error in Markdown 1.0.1:
+
+*	this
+
+	*	sub
+
+	that
diff --git a/test/javascripts/mdtest/fixtures/Ordered and unordered lists.xhtml b/test/javascripts/mdtest/fixtures/Ordered and unordered lists.xhtml
new file mode 100755
index 00000000000..ba71eab3951
--- /dev/null
+++ b/test/javascripts/mdtest/fixtures/Ordered and unordered lists.xhtml	
@@ -0,0 +1,148 @@
+
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. 
+
  2. Second
    3. 
+
  3. Third
    4. 
+

+
+
and:

+
+
    
+
  1. One
    2. 
+
  2. Two
    3. 
+
  3. Three
    4. 
+

+
+
Loose using tabs:

+
+
    
+
  1. First
    2. 
+
  2. Second
    3. 
+
  3. Third
    4. 
+

+
+
and using spaces:

+
+
    
+
  1. One
    2. 
+
  2. Two
    3. 
+
  3. Three
    4. 
+

+
+
Multiple paragraphs:

+
+
    
+
  1. Item 1, graf one.
    
+
+
    Item 2. graf two. The quick brown fox jumped over the lazy dog's
+back.
    2. 
+
  2. Item 2.
    3. 
+
  3. Item 3.
    4. 
+

+
+
Nested

+
+
    
+
  • Tab
+
      
+
    • Tab
+
        
+
      • Tab
        • 
+
      • 
+
    • 
+

+
+
Here's another:

+
+
    
+
  1. First
    2. 
+
  2. Second:
+
      
+
    • Fee
      • 
+
    • Fie
      • 
+
    • Foe
      • 
+
    3. 
+
  3. Third
    4. 
+

+
+
Same thing but with paragraphs:

+
+
    
+
  1. First
    2. 
+
  2. Second:
    
+
+
      
+
    • Fee
      • 
+
    • Fie
      • 
+
    • Foe
      • 
+
    3. 
+
  3. Third
    4. 
+

+
+
+
This was an error in Markdown 1.0.1:

+
+
    
+
  • this
    
+
+
    • sub
    
+
+
    that
    • 
+

diff --git a/test/javascripts/mdtest/fixtures/Strong and em together.text b/test/javascripts/mdtest/fixtures/Strong and em together.text
new file mode 100755
index 00000000000..95ee690dbe2
--- /dev/null
+++ b/test/javascripts/mdtest/fixtures/Strong and em together.text	
@@ -0,0 +1,7 @@
+***This is strong and em.***
+
+So is ***this*** word.
+
+___This is strong and em.___
+
+So is ___this___ word.
diff --git a/test/javascripts/mdtest/fixtures/Strong and em together.xhtml b/test/javascripts/mdtest/fixtures/Strong and em together.xhtml
new file mode 100755
index 00000000000..71ec78c7092
--- /dev/null
+++ b/test/javascripts/mdtest/fixtures/Strong and em together.xhtml	
@@ -0,0 +1,7 @@
+
This is strong and em.

+
+
So is this word.

+
+
This is strong and em.

+
+
So is this word.

diff --git a/test/javascripts/mdtest/fixtures/Tabs.text b/test/javascripts/mdtest/fixtures/Tabs.text
new file mode 100755
index 00000000000..589d1136e19
--- /dev/null
+++ b/test/javascripts/mdtest/fixtures/Tabs.text
@@ -0,0 +1,21 @@
++	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/test/javascripts/mdtest/fixtures/Tabs.xhtml b/test/javascripts/mdtest/fixtures/Tabs.xhtml
new file mode 100755
index 00000000000..3301ba803b7
--- /dev/null
+++ b/test/javascripts/mdtest/fixtures/Tabs.xhtml
@@ -0,0 +1,25 @@
+
    
+
  • 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/test/javascripts/mdtest/fixtures/Tidyness.text b/test/javascripts/mdtest/fixtures/Tidyness.text
new file mode 100755
index 00000000000..5f18b8da214
--- /dev/null
+++ b/test/javascripts/mdtest/fixtures/Tidyness.text
@@ -0,0 +1,5 @@
+> A list within a blockquote:
+> 
+> *	asterisk 1
+> *	asterisk 2
+> *	asterisk 3
diff --git a/test/javascripts/mdtest/fixtures/Tidyness.xhtml b/test/javascripts/mdtest/fixtures/Tidyness.xhtml
new file mode 100755
index 00000000000..f2a8ce70f57
--- /dev/null
+++ b/test/javascripts/mdtest/fixtures/Tidyness.xhtml
@@ -0,0 +1,8 @@
+

+
A list within a blockquote:

+
    
+
  • asterisk 1
    • 
+
  • asterisk 2
    • 
+
  • asterisk 3
    • 
+

+

diff --git a/test/javascripts/mdtest/mdtest.js.erb b/test/javascripts/mdtest/mdtest.js.erb
new file mode 100644
index 00000000000..0384b3464cf
--- /dev/null
+++ b/test/javascripts/mdtest/mdtest.js.erb
@@ -0,0 +1,53 @@
+module("MDTest", {
+  setup: function() {
+    Discourse.SiteSettings.traditional_markdown_linebreaks = false;
+  }
+});
+
+// This is cheating, but the trivial differences between sanitization
+// do not affect formatting.
+function normalize(str) {
+  return str.replace(/\n\s*/g, '').
+             replace(/ \/\>/g, '/>').
+             replace(/    ?/g, "\t").
+             replace(/"/g, '"');
+}
+
+var md = function(input, expected, text) {
+  var result = Discourse.Markdown.cook(input, {mentionLookup: false, sanitize: true, traditional_markdown_linebreaks: true}),
+      resultNorm = normalize(result),
+      expectedNorm = normalize(expected),
+      same = (result === expected) || (resultNorm === expectedNorm);
+
+
+  if (same) {
+    ok(same, text);
+  } else {
+    console.log(resultNorm);
+    console.log(expectedNorm);
+    equal(resultNorm, expectedNorm, text);
+  }
+};
+
+test("first", function(){
+  equal(1, 1, "cool")
+});
+
+<%
+  def mdtest_suite
+    result = ""
+    Dir.glob("#{Rails.root}/test/javascripts/mdtest/fixtures/*.text").each do |f|
+
+      filename_no_ext = f.sub(/\.text$/, '')
+      filename = Pathname.new(filename_no_ext)
+
+      text = File.read(f)
+      html = File.read("#{filename_no_ext}.xhtml").gsub(/\<\!\-\-(.*?)\-\-\>/m, '')
+      result << "test(\"#{filename}\", function() { md(#{text.to_json}, #{html.to_json}, 'passes MDTest'); });\n"
+    end
+    result
+  end
+
+%>
+
+<%= mdtest_suite %>
\ No newline at end of file
diff --git a/vendor/assets/javascripts/better_markdown.js b/vendor/assets/javascripts/better_markdown.js
index ab3ffaae690..c73224f0306 100644
--- a/vendor/assets/javascripts/better_markdown.js
+++ b/vendor/assets/javascripts/better_markdown.js
@@ -4,16 +4,10 @@
   * We have replaced the strong/em handlers because we prefer them only to work on word
     boundaries.
 
-  * We removed the maraku support as we don't use it.
+  // Fix code within attrs
+  if (prev && (typeof prev[0] === "string") && prev[0].match(/<[^>]+$/)) { return; }
 
-  * We don't escape the contents of HTML as we prefer to use a whitelist.
-
-  * We fixed a bug where references can be created directly following a list.
-
-  * Fix to blockquote to handle spaces in front and when nested.
-
-  * Note the name BetterMarkdown doesn't mean it's *better* than markdown-js, it refers
-    to it being better than our previous markdown parser!
+  // __RAW__
 
 */
 
@@ -260,27 +254,26 @@ function create_reference(attrs, m) {
  * the block processing.
  */
 Markdown.prototype.processBlock = function processBlock( block, next ) {
-  var cbs = this.dialect.block,
-      ord = cbs.__order__;
+    var cbs = this.dialect.block,
+        ord = cbs.__order__;
 
-  if ( "__call__" in cbs ) {
-    return cbs.__call__.call(this, block, next);
-  }
+    if ( "__call__" in cbs )
+      return cbs.__call__.call(this, block, next);
 
-  for ( var i = 0; i < ord.length; i++ ) {
-    //D:this.debug( "Testing", ord[i] );
-    var res = cbs[ ord[i] ].call( this, block, next );
-    if ( res ) {
-      //D:this.debug("  matched");
-      if ( !isArray(res) || ( res.length > 0 && !( isArray(res[0]) ) ) )
-        this.debug(ord[i], "didn't return a proper array");
-      //D:this.debug( "" );
-      return res;
+    for ( var i = 0; i < ord.length; i++ ) {
+      //D:this.debug( "Testing", ord[i] );
+      var res = cbs[ ord[i] ].call( this, block, next );
+      if ( res ) {
+        //D:this.debug("  matched");
+        if ( !isArray(res) || ( res.length > 0 && !( isArray(res[0]) ) && ( typeof res[0] !== "string")) )
+          this.debug(ord[i], "didn't return a proper array");
+        //D:this.debug( "" );
+        return res;
+      }
     }
-  }
 
-  // Uhoh! no match! Should we throw an error?
-  return [];
+    // Uhoh! no match! Should we throw an error?
+    return [];
 };
 
 Markdown.prototype.processInline = function processInline( block ) {
@@ -551,6 +544,7 @@ Markdown.dialects.Gruber = {
         if ( last_li[1] instanceof Array && last_li[1][0] == "para" ) {
           return;
         }
+
         if ( i + 1 == stack.length ) {
           // Last stack frame
           // Keep the same array, but replace the contents
@@ -558,6 +552,7 @@ Markdown.dialects.Gruber = {
         }
         else {
           var sublist = last_li.pop();
+
           last_li.push( ["para"].concat( last_li.splice(1, last_li.length - 1) ), sublist );
         }
       }
@@ -671,7 +666,13 @@ Markdown.dialects.Gruber = {
           } // tight_search
 
           if ( li_accumulate.length ) {
+
             add( last_li, loose, this.processInline( li_accumulate ), nl );
+
+            if(last_li[last_li.length-1] === "\n") {
+              last_li.pop();
+            }
+
             // Loose mode will have been dealt with. Reset it
             loose = false;
             li_accumulate = "";
@@ -693,6 +694,7 @@ Markdown.dialects.Gruber = {
 
 
           if ( next_block.match(is_list_re) || (next_block.match(/^ /) && (!next_block.match(/^ *\>/))) ) {
+
             block = next.shift();
 
             // Check for an HR following a list: features/lists/hr_abutting
@@ -703,8 +705,10 @@ Markdown.dialects.Gruber = {
               break;
             }
 
-            // Make sure all listitems up the stack are paragraphs
-            forEach( stack, paragraphify, this);
+            // Add paragraphs if the indentation level stays the same
+            if (stack[stack.length-1].indent === block.match(/^\s*/)[0]) {
+              forEach( stack, paragraphify, this);
+            }
 
             loose = true;
             continue loose_search;
@@ -712,7 +716,6 @@ Markdown.dialects.Gruber = {
           break;
         } // loose_search
 
-
         return ret;
       };
     })(),
@@ -781,7 +784,7 @@ Markdown.dialects.Gruber = {
 
     referenceDefn: function referenceDefn( block, next) {
 
-      var re = /^\s*\[(.*?)\]:\s*(\S+)(?:\s+(?:(['"])(.*?)\3|\((.*?)\)))?\n?/;
+      var re = /^\s*\[(.*?)\]:\s*(\S+)(?:\s+(?:(['"])(.*)\3|\((.*?)\)))?\n?/;
       // interesting matches are [ , ref_id, url, , title, title ]
 
       if ( !block.match(re) )
@@ -864,7 +867,7 @@ Markdown.dialects.Gruber.inline = {
     "]": function () {},
     "}": function () {},
 
-    __escape__ : /^\\[\\`\*_{}\[\]()#\+.!\-]/,
+    __escape__ : /^\\[\\`\*_\<\>{}\[\]()#\+.!\-]/,
 
     "\\": function escaped( text ) {
       // [ length of input processed, node/children to add... ]
@@ -883,7 +886,11 @@ Markdown.dialects.Gruber.inline = {
 
       // ![Alt text](/path/to/img.jpg "Optional title")
       //      1          2            3       4         <--- captures
-      var m = text.match( /^!\[(.*?)\][ \t]*\([ \t]*([^")]*?)(?:[ \t]+(["'])(.*?)\3)?[ \t]*\)/ );
+      //
+      // First attempt to use a strong URL regexp to catch things like parentheses. If it misses, use the
+      // old one.
+      var m = text.match( /^!\[(.*?)][ \t]*\(((?:https?:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.])(?:[^\s()<>]+|\([^\s()<>]+\))+(?:\([^\s()<>]+\)|[^`!()\[\]{};:'".,<>?«»“”‘’\s]))\)([ \t])*(["'].*["'])?/ ) ||
+              text.match( /^!\[(.*?)\][ \t]*\([ \t]*([^")]*?)(?:[ \t]+(["'])(.*?)\3)?[ \t]*\)/ );
 
       if ( m ) {
         if ( m[2] && m[2][0] == "<" && m[2][m[2].length-1] == ">" )
@@ -938,7 +945,7 @@ Markdown.dialects.Gruber.inline = {
       // The parens have to be balanced
       var m = text.match( /^\s*\([ \t]*([^"']*)(?:[ \t]+(["'])(.*?)\2)?[ \t]*\)/ );
       if ( m ) {
-        var url = m[1];
+        var url = m[1].replace(/ +$/, '');
         consumed += m[0].length;
 
         if ( url && url[0] == "<" && url[url.length-1] == ">" )
@@ -991,7 +998,7 @@ Markdown.dialects.Gruber.inline = {
         return [ consumed, link ];
       }
 
-      m = orig.match(/^\s*\[(.*?)\]:\s*(\S+)(?:\s+(?:(['"])(.*?)\3|\((.*?)\)))?\n?/);
+      m = orig.match(/^\s*\[(.*?)\]:\s*(\S+)(?:\s+(?:(['"])(.*?)\3|\((.*?)\)))?\n?/m);
       if (m) {
 
         var attrs = create_attrs.call(this);
@@ -1004,7 +1011,8 @@ Markdown.dialects.Gruber.inline = {
       // Only if id is plain (no formatting.)
       if ( children.length == 1 && typeof children[0] == "string" ) {
 
-        attrs = { ref: children[0].toLowerCase(),  original: orig.substr( 0, consumed ) };
+        var normalized = children[0].toLowerCase().replace(/\n/, " ").replace(/\s+/, ' ');
+        attrs = { ref: normalized,  original: orig.substr( 0, consumed ) };
         link = [ "link_ref", attrs, children[0] ];
         return [ consumed, link ];
       }
@@ -1032,7 +1040,11 @@ Markdown.dialects.Gruber.inline = {
       return [ 1, "<" ];
     },
 
-    "`": function inlineCode( text ) {
+    "`": function inlineCode( text, match, prev ) {
+
+      // If we're in a tag, don't do it.
+      if (prev && (typeof prev[0] === "string") && prev[0].match(/<[^>]+$/)) { return; }
+
       // Inline code block. as many backticks as you like to start it
       // Always skip over the opening ticks.
       var m = text.match( /(`+)(([\s\S]*?)\1)/ );
@@ -1217,6 +1229,10 @@ function render_tree( jsonml ) {
     return jsonml;
   }
 
+  if ( jsonml[0] == "__RAW" ) {
+    return jsonml[1];
+  }
+
   var tag = jsonml.shift(),
       attributes = {},
       content = [];
@@ -1230,6 +1246,13 @@ function render_tree( jsonml ) {
   }
 
   var tag_attrs = "";
+
+  // MDTest has src attributes first
+  if (typeof attributes.src !== 'undefined') {
+    tag_attrs += ' src="' + escapeHTML( attributes.src ) + '"';
+    delete attributes.src;
+  }
+
   for ( var a in attributes ) {
     tag_attrs += " " + a + '="' + escapeHTML( attributes[ a ] ) + '"';
   }