aboutsummaryrefslogtreecommitdiffstats
path: root/tests/markdown-test
diff options
context:
space:
mode:
authorWaylan Limberg <waylan@gmail.com>2008-09-03 13:30:04 -0400
committerWaylan Limberg <waylan@gmail.com>2008-09-03 13:46:52 -0400
commita1c636a05557b1faa207828c9e7102391bdde5c9 (patch)
treee223f4a97d811ce956073be7647695fbcc3e6f4c /tests/markdown-test
parenta4c80246770b87ca3d2cce5b5184901fd2495a7d (diff)
downloadmarkdown-a1c636a05557b1faa207828c9e7102391bdde5c9.tar.gz
markdown-a1c636a05557b1faa207828c9e7102391bdde5c9.tar.bz2
markdown-a1c636a05557b1faa207828c9e7102391bdde5c9.zip
Replaced indentation with linebreaks only. At least its more consistant - and it better matches other markdown implementations. Also updated tests.
Diffstat (limited to 'tests/markdown-test')
-rw-r--r--tests/markdown-test/amps-and-angle-encoding.html2
-rw-r--r--tests/markdown-test/angle-links-and-img.html11
-rw-r--r--tests/markdown-test/auto-links.html23
-rw-r--r--tests/markdown-test/backlash-escapes.html48
-rw-r--r--tests/markdown-test/blockquotes-with-code-blocks.html8
-rw-r--r--tests/markdown-test/links-inline.html12
-rw-r--r--tests/markdown-test/markdown-documentation-basics.html3
-rw-r--r--tests/markdown-test/markdown-syntax.html111
-rw-r--r--tests/markdown-test/ordered-and-unordered-list.html2
-rw-r--r--tests/markdown-test/strong-and-em-together.html20
-rw-r--r--tests/markdown-test/tabs.html12
11 files changed, 85 insertions, 167 deletions
diff --git a/tests/markdown-test/amps-and-angle-encoding.html b/tests/markdown-test/amps-and-angle-encoding.html
index fc1b2c3..2c466c1 100644
--- a/tests/markdown-test/amps-and-angle-encoding.html
+++ b/tests/markdown-test/amps-and-angle-encoding.html
@@ -6,4 +6,4 @@
<p>Here's a <a href="http://example.com/?foo=1&amp;bar=2">link</a> with an ampersand in the URL.</p>
<p>Here's a link with an amersand in the link text: <a href="http://att.com/" title="AT&amp;T">AT&amp;T</a>.</p>
<p>Here's an inline <a href="/script?foo=1&amp;bar=2">link</a>.</p>
-<p>Here's an inline <a href="/script?foo=1&amp;bar=2">link</a>.</p>
+<p>Here's an inline <a href="/script?foo=1&amp;bar=2">link</a>.</p> \ No newline at end of file
diff --git a/tests/markdown-test/angle-links-and-img.html b/tests/markdown-test/angle-links-and-img.html
index e32b6e6..1ca3b0b 100644
--- a/tests/markdown-test/angle-links-and-img.html
+++ b/tests/markdown-test/angle-links-and-img.html
@@ -1,7 +1,4 @@
-<p>
- <a href="simple link" title="title">link</a>
- <img alt="image" src="http://example.com/image.jpg" />
- <a href="http://example.com/(()((())923)(">link</a>
- <img alt="image" src="link(()))(" />
-</p>
-
+<p><a href="simple link" title="title">link</a>
+<img alt="image" src="http://example.com/image.jpg" />
+<a href="http://example.com/(()((())923)(">link</a>
+<img alt="image" src="link(()))(" /></p> \ No newline at end of file
diff --git a/tests/markdown-test/auto-links.html b/tests/markdown-test/auto-links.html
index 913e1a4..7481fe2 100644
--- a/tests/markdown-test/auto-links.html
+++ b/tests/markdown-test/auto-links.html
@@ -1,22 +1,15 @@
<p>Link: <a href="http://example.com/">http://example.com/</a>.</p>
-<p>Https link: <a href="https://example.com">https://example.com</a>
-</p>
-<p>Ftp link: <a href="ftp://example.com">ftp://example.com</a>
-</p>
-<p>With an ampersand: <a href="http://example.com/?foo=1&amp;bar=2">http://example.com/?foo=1&amp;bar=2</a>
-</p>
+<p>Https link: <a href="https://example.com">https://example.com</a></p>
+<p>Ftp link: <a href="ftp://example.com">ftp://example.com</a></p>
+<p>With an ampersand: <a href="http://example.com/?foo=1&amp;bar=2">http://example.com/?foo=1&amp;bar=2</a></p>
<ul>
- <li>In a list?</li>
- <li>
- <a href="http://example.com/">http://example.com/</a>
- </li>
- <li>It should.</li>
+<li>In a list?</li>
+<li><a href="http://example.com/">http://example.com/</a></li>
+<li>It should.</li>
</ul>
<blockquote>
- <p>Blockquoted: <a href="http://example.com/">http://example.com/</a>
- </p>
+<p>Blockquoted: <a href="http://example.com/">http://example.com/</a></p>
</blockquote>
-<p>Auto-links should not occur here: <code>&lt;http://example.com/&gt;</code>
-</p>
+<p>Auto-links should not occur here: <code>&lt;http://example.com/&gt;</code></p>
<pre><code>or here: &lt;http://example.com/&gt;
</code></pre> \ No newline at end of file
diff --git a/tests/markdown-test/backlash-escapes.html b/tests/markdown-test/backlash-escapes.html
index 18a67cc..876775f 100644
--- a/tests/markdown-test/backlash-escapes.html
+++ b/tests/markdown-test/backlash-escapes.html
@@ -49,35 +49,19 @@ Plus: \+
Minus: \-
</code></pre>
<p>Nor should these, which occur in code spans:</p>
-<p>Backslash: <code>\\</code>
-</p>
-<p>Backtick: <code>\`</code>
-</p>
-<p>Asterisk: <code>\*</code>
-</p>
-<p>Underscore: <code>\_</code>
-</p>
-<p>Left brace: <code>\{</code>
-</p>
-<p>Right brace: <code>\}</code>
-</p>
-<p>Left bracket: <code>\[</code>
-</p>
-<p>Right bracket: <code>\]</code>
-</p>
-<p>Left paren: <code>\(</code>
-</p>
-<p>Right paren: <code>\)</code>
-</p>
-<p>Greater-than: <code>\&gt;</code>
-</p>
-<p>Hash: <code>\#</code>
-</p>
-<p>Period: <code>\.</code>
-</p>
-<p>Bang: <code>\!</code>
-</p>
-<p>Plus: <code>\+</code>
-</p>
-<p>Minus: <code>\-</code>
-</p> \ No newline at end of file
+<p>Backslash: <code>\\</code></p>
+<p>Backtick: <code>\`</code></p>
+<p>Asterisk: <code>\*</code></p>
+<p>Underscore: <code>\_</code></p>
+<p>Left brace: <code>\{</code></p>
+<p>Right brace: <code>\}</code></p>
+<p>Left bracket: <code>\[</code></p>
+<p>Right bracket: <code>\]</code></p>
+<p>Left paren: <code>\(</code></p>
+<p>Right paren: <code>\)</code></p>
+<p>Greater-than: <code>\&gt;</code></p>
+<p>Hash: <code>\#</code></p>
+<p>Period: <code>\.</code></p>
+<p>Bang: <code>\!</code></p>
+<p>Plus: <code>\+</code></p>
+<p>Minus: <code>\-</code></p> \ No newline at end of file
diff --git a/tests/markdown-test/blockquotes-with-code-blocks.html b/tests/markdown-test/blockquotes-with-code-blocks.html
index 4b09449..5fc98b1 100644
--- a/tests/markdown-test/blockquotes-with-code-blocks.html
+++ b/tests/markdown-test/blockquotes-with-code-blocks.html
@@ -1,11 +1,11 @@
<blockquote>
- <p>Example:</p>
- <pre><code>sub status {
+<p>Example:</p>
+<pre><code>sub status {
print "working";
}
</code></pre>
- <p>Or:</p>
- <pre><code>sub status {
+<p>Or:</p>
+<pre><code>sub status {
return "working";
}
</code></pre>
diff --git a/tests/markdown-test/links-inline.html b/tests/markdown-test/links-inline.html
index e1aaf27..707937a 100644
--- a/tests/markdown-test/links-inline.html
+++ b/tests/markdown-test/links-inline.html
@@ -1,9 +1,5 @@
<p>Just a <a href="/url/">URL</a>.</p>
-<p>
-<a href="/url/" title="title">URL and title</a>.</p>
-<p>
-<a href="/url/" title="title preceded by two spaces">URL and title</a>.</p>
-<p>
-<a href="/url/" title="title preceded by a tab">URL and title</a>.</p>
-<p>
-<a href="">Empty</a>.</p> \ No newline at end of file
+<p><a href="/url/" title="title">URL and title</a>.</p>
+<p><a href="/url/" title="title preceded by two spaces">URL and title</a>.</p>
+<p><a href="/url/" title="title preceded by a tab">URL and title</a>.</p>
+<p><a href="">Empty</a>.</p> \ No newline at end of file
diff --git a/tests/markdown-test/markdown-documentation-basics.html b/tests/markdown-test/markdown-documentation-basics.html
index e0edcdc..3bcaea9 100644
--- a/tests/markdown-test/markdown-documentation-basics.html
+++ b/tests/markdown-test/markdown-documentation-basics.html
@@ -17,8 +17,7 @@ HTML output produced by Markdown.</p>
<p>It's also helpful to simply try Markdown out; the <a href="/projects/markdown/dingus" title="Markdown Dingus">Dingus</a> is a
web application that allows you type your own Markdown-formatted text
and translate it to XHTML.</p>
-<p>
- <strong>Note:</strong> This document is itself written using Markdown; you
+<p><strong>Note:</strong> This document is itself written using Markdown; you
can <a href="/projects/markdown/basics.text">see the source for it by adding '.text' to the URL</a>.</p>
<h2>Paragraphs, Headers, Blockquotes</h2>
<p>A paragraph is simply one or more consecutive lines of text, separated
diff --git a/tests/markdown-test/markdown-syntax.html b/tests/markdown-test/markdown-syntax.html
index c53c045..2f63b4b 100644
--- a/tests/markdown-test/markdown-syntax.html
+++ b/tests/markdown-test/markdown-syntax.html
@@ -8,74 +8,35 @@
</ul>
<ul>
- <li>
- <a href="#overview">Overview</a>
- <ul>
- <li>
- <a href="#philosophy">Philosophy</a>
- </li>
- <li>
- <a href="#html">Inline HTML</a>
- </li>
- <li>
- <a href="#autoescape">Automatic Escaping for Special Characters</a>
- </li>
- </ul>
- </li>
- <li>
- <a href="#block">Block Elements</a>
- <ul>
- <li>
- <a href="#p">Paragraphs and Line Breaks</a>
- </li>
- <li>
- <a href="#header">Headers</a>
- </li>
- <li>
- <a href="#blockquote">Blockquotes</a>
- </li>
- <li>
- <a href="#list">Lists</a>
- </li>
- <li>
- <a href="#precode">Code Blocks</a>
- </li>
- <li>
- <a href="#hr">Horizontal Rules</a>
- </li>
- </ul>
- </li>
- <li>
- <a href="#span">Span Elements</a>
- <ul>
- <li>
- <a href="#link">Links</a>
- </li>
- <li>
- <a href="#em">Emphasis</a>
- </li>
- <li>
- <a href="#code">Code</a>
- </li>
- <li>
- <a href="#img">Images</a>
- </li>
- </ul>
- </li>
- <li>
- <a href="#misc">Miscellaneous</a>
- <ul>
- <li>
- <a href="#backslash">Backslash Escapes</a>
- </li>
- <li>
- <a href="#autolink">Automatic Links</a>
- </li>
- </ul>
- </li>
+<li><a href="#overview">Overview</a><ul>
+<li><a href="#philosophy">Philosophy</a></li>
+<li><a href="#html">Inline HTML</a></li>
+<li><a href="#autoescape">Automatic Escaping for Special Characters</a></li>
</ul>
-<p>
- <strong>Note:</strong> This document is itself written using Markdown; you
+</li>
+<li><a href="#block">Block Elements</a><ul>
+<li><a href="#p">Paragraphs and Line Breaks</a></li>
+<li><a href="#header">Headers</a></li>
+<li><a href="#blockquote">Blockquotes</a></li>
+<li><a href="#list">Lists</a></li>
+<li><a href="#precode">Code Blocks</a></li>
+<li><a href="#hr">Horizontal Rules</a></li>
+</ul>
+</li>
+<li><a href="#span">Span Elements</a><ul>
+<li><a href="#link">Links</a></li>
+<li><a href="#em">Emphasis</a></li>
+<li><a href="#code">Code</a></li>
+<li><a href="#img">Images</a></li>
+</ul>
+</li>
+<li><a href="#misc">Miscellaneous</a><ul>
+<li><a href="#backslash">Backslash Escapes</a></li>
+<li><a href="#autolink">Automatic Links</a></li>
+</ul>
+</li>
+</ul>
+<p><strong>Note:</strong> This document is itself written using Markdown; you
can <a href="/projects/markdown/syntax.text">see the source for it by adding '.text' to the URL</a>.</p>
<hr />
<h2 id="overview">Overview</h2>
@@ -522,12 +483,12 @@ on a line by itself:</p>
</code></pre>
<p>That is:</p>
<ul>
- <li>Square brackets containing the link identifier (optionally
+<li>Square brackets containing the link identifier (optionally
indented from the left margin using up to three spaces);</li>
- <li>followed by a colon;</li>
- <li>followed by one or more spaces (or tabs);</li>
- <li>followed by the URL for the link;</li>
- <li>optionally followed by a title attribute for the link, enclosed
+<li>followed by a colon;</li>
+<li>followed by one or more spaces (or tabs);</li>
+<li>followed by the URL for the link;</li>
+<li>optionally followed by a title attribute for the link, enclosed
in double or single quotes.</li>
</ul>
<p>The link URL may, optionally, be surrounded by angle brackets:</p>
@@ -697,10 +658,10 @@ for links, allowing for two styles: <em>inline</em> and <em>reference</em>.</p>
</code></pre>
<p>That is:</p>
<ul>
- <li>An exclamation mark: <code>!</code>;</li>
- <li>followed by a set of square brackets, containing the <code>alt</code>
+<li>An exclamation mark: <code>!</code>;</li>
+<li>followed by a set of square brackets, containing the <code>alt</code>
attribute text for the image;</li>
- <li>followed by a set of parentheses, containing the URL or path to
+<li>followed by a set of parentheses, containing the URL or path to
the image, and an optional <code>title</code> attribute enclosed in double
or single quotes.</li>
</ul>
diff --git a/tests/markdown-test/ordered-and-unordered-list.html b/tests/markdown-test/ordered-and-unordered-list.html
index e96cdba..090c43c 100644
--- a/tests/markdown-test/ordered-and-unordered-list.html
+++ b/tests/markdown-test/ordered-and-unordered-list.html
@@ -143,4 +143,4 @@ back.</p>
<li>
<p>Third</p>
</li>
-</ol>
+</ol> \ No newline at end of file
diff --git a/tests/markdown-test/strong-and-em-together.html b/tests/markdown-test/strong-and-em-together.html
index 04c1850..7bf5163 100644
--- a/tests/markdown-test/strong-and-em-together.html
+++ b/tests/markdown-test/strong-and-em-together.html
@@ -1,16 +1,4 @@
-<p>
-<strong>
-<em>This is strong and em.</em>
-</strong>
-</p>
-<p>So is <strong>
-<em>this</em>
-</strong> word.</p>
-<p>
-<strong>
-<em>This is strong and em.</em>
-</strong>
-</p>
-<p>So is <strong>
-<em>this</em>
-</strong> word.</p>
+<p><strong><em>This is strong and em.</em></strong></p>
+<p>So is <strong><em>this</em></strong> word.</p>
+<p><strong><em>This is strong and em.</em></strong></p>
+<p>So is <strong><em>this</em></strong> word.</p> \ No newline at end of file
diff --git a/tests/markdown-test/tabs.html b/tests/markdown-test/tabs.html
index f302d5f..b26391b 100644
--- a/tests/markdown-test/tabs.html
+++ b/tests/markdown-test/tabs.html
@@ -1,12 +1,12 @@
<ul>
- <li>
- <p>this is a list item
+<li>
+<p>this is a list item
indented with tabs</p>
- </li>
- <li>
- <p>this is a list item
+</li>
+<li>
+<p>this is a list item
indented with spaces</p>
- </li>
+</li>
</ul>
<p>Code:</p>
<pre><code>this code block is indented by one tab