Fixed Ticket 11. Disabled ``indenteTree`` for `pre` and `code` tags. Now

whitespace is preserved in codeblocks.

As a side-benefit, this also solved the issue with the safe-mode tests failing.

All tests incorectly altered at ElementTree conversion have been corrected for
this bug. Any remaining tests that fail are unrelated to this.

1 files changed, 54 insertions, 108 deletions

diff --git a/tests/markdown-test/markdown-documentation-basics.html b/tests/markdown-test/markdown-documentation-basics.html
index bc654d2..e0edcdc 100644
--- a/tests/markdown-test/markdown-documentation-basics.html
+++ b/tests/markdown-test/markdown-documentation-basics.html
@@ -33,8 +33,7 @@ beginning of the line -- the number of hashes equals the resulting
 HTML header level.</p>
 <p>Blockquotes are indicated using email-style '<code>&gt;</code>' angle brackets.</p>
 <p>Markdown:</p>
-<pre>
-  <code>A First Level Header
+<pre><code>A First Level Header
 ====================
 
 A Second Level Header
@@ -54,11 +53,9 @@ dog's back.
 &gt; This is the second paragraph in the blockquote.
 &gt;
 &gt; ## This is an H2 in a blockquote
-</code>
-</pre>
+</code></pre>
 <p>Output:</p>
-<pre>
-  <code>&lt;h1&gt;A First Level Header&lt;/h1&gt;
+<pre><code>&lt;h1&gt;A First Level Header&lt;/h1&gt;
 
 &lt;h2&gt;A Second Level Header&lt;/h2&gt;
 
@@ -78,221 +75,170 @@ dog's back.&lt;/p&gt;
 
     &lt;h2&gt;This is an H2 in a blockquote&lt;/h2&gt;
 &lt;/blockquote&gt;
-</code>
-</pre>
+</code></pre>
 <h3>Phrase Emphasis</h3>
 <p>Markdown uses asterisks and underscores to indicate spans of emphasis.</p>
 <p>Markdown:</p>
-<pre>
-  <code>Some of these words *are emphasized*.
+<pre><code>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__.
-</code>
-</pre>
+</code></pre>
 <p>Output:</p>
-<pre>
-  <code>&lt;p&gt;Some of these words &lt;em&gt;are emphasized&lt;/em&gt;.
+<pre><code>&lt;p&gt;Some of these words &lt;em&gt;are emphasized&lt;/em&gt;.
 Some of these words &lt;em&gt;are emphasized also&lt;/em&gt;.&lt;/p&gt;
 
 &lt;p&gt;Use two asterisks for &lt;strong&gt;strong emphasis&lt;/strong&gt;.
 Or, if you prefer, &lt;strong&gt;use two underscores instead&lt;/strong&gt;.&lt;/p&gt;
-</code>
-</pre>
+</code></pre>
 <h2>Lists</h2>
 <p>Unordered (bulleted) lists use asterisks, pluses, and hyphens (<code>*</code>,
 <code>+</code>, and <code>-</code>) as list markers. These three markers are
 interchangable; this:</p>
-<pre>
-  <code>*   Candy.
+<pre><code>*   Candy.
 *   Gum.
 *   Booze.
-</code>
-</pre>
+</code></pre>
 <p>this:</p>
-<pre>
-  <code>+   Candy.
+<pre><code>+   Candy.
 +   Gum.
 +   Booze.
-</code>
-</pre>
+</code></pre>
 <p>and this:</p>
-<pre>
-  <code>-   Candy.
+<pre><code>-   Candy.
 -   Gum.
 -   Booze.
-</code>
-</pre>
+</code></pre>
 <p>all produce the same output:</p>
-<pre>
-  <code>&lt;ul&gt;
+<pre><code>&lt;ul&gt;
 &lt;li&gt;Candy.&lt;/li&gt;
 &lt;li&gt;Gum.&lt;/li&gt;
 &lt;li&gt;Booze.&lt;/li&gt;
 &lt;/ul&gt;
-</code>
-</pre>
+</code></pre>
 <p>Ordered (numbered) lists use regular numbers, followed by periods, as
 list markers:</p>
-<pre>
-  <code>1.  Red
+<pre><code>1.  Red
 2.  Green
 3.  Blue
-</code>
-</pre>
+</code></pre>
 <p>Output:</p>
-<pre>
-  <code>&lt;ol&gt;
+<pre><code>&lt;ol&gt;
 &lt;li&gt;Red&lt;/li&gt;
 &lt;li&gt;Green&lt;/li&gt;
 &lt;li&gt;Blue&lt;/li&gt;
 &lt;/ol&gt;
-</code>
-</pre>
+</code></pre>
 <p>If you put blank lines between items, you'll get <code>&lt;p&gt;</code> tags for the
 list item text. You can create multi-paragraph list items by indenting
 the paragraphs by 4 spaces or 1 tab:</p>
-<pre>
-  <code>*   A list item.
+<pre><code>*   A list item.
 
     With multiple paragraphs.
 
 *   Another item in the list.
-</code>
-</pre>
+</code></pre>
 <p>Output:</p>
-<pre>
-  <code>&lt;ul&gt;
+<pre><code>&lt;ul&gt;
 &lt;li&gt;&lt;p&gt;A list item.&lt;/p&gt;
 &lt;p&gt;With multiple paragraphs.&lt;/p&gt;&lt;/li&gt;
 &lt;li&gt;&lt;p&gt;Another item in the list.&lt;/p&gt;&lt;/li&gt;
 &lt;/ul&gt;
-</code>
-</pre>
+</code></pre>
 <h3>Links</h3>
 <p>Markdown supports two styles for creating links: <em>inline</em> and
 <em>reference</em>. With both styles, you use square brackets to delimit the
 text you want to turn into a link.</p>
 <p>Inline-style links use parentheses immediately after the link text.
 For example:</p>
-<pre>
-  <code>This is an [example link](http://example.com/).
-</code>
-</pre>
+<pre><code>This is an [example link](http://example.com/).
+</code></pre>
 <p>Output:</p>
-<pre>
-  <code>&lt;p&gt;This is an &lt;a href="http://example.com/"&gt;
+<pre><code>&lt;p&gt;This is an &lt;a href="http://example.com/"&gt;
 example link&lt;/a&gt;.&lt;/p&gt;
-</code>
-</pre>
+</code></pre>
 <p>Optionally, you may include a title attribute in the parentheses:</p>
-<pre>
-  <code>This is an [example link](http://example.com/ "With a Title").
-</code>
-</pre>
+<pre><code>This is an [example link](http://example.com/ "With a Title").
+</code></pre>
 <p>Output:</p>
-<pre>
-  <code>&lt;p&gt;This is an &lt;a href="http://example.com/" title="With a Title"&gt;
+<pre><code>&lt;p&gt;This is an &lt;a href="http://example.com/" title="With a Title"&gt;
 example link&lt;/a&gt;.&lt;/p&gt;
-</code>
-</pre>
+</code></pre>
 <p>Reference-style links allow you to refer to your links by names, which
 you define elsewhere in your document:</p>
-<pre>
-  <code>I get 10 times more traffic from [Google][1] than from
+<pre><code>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"
-</code>
-</pre>
+</code></pre>
 <p>Output:</p>
-<pre>
-  <code>&lt;p&gt;I get 10 times more traffic from &lt;a href="http://google.com/"
+<pre><code>&lt;p&gt;I get 10 times more traffic from &lt;a href="http://google.com/"
 title="Google"&gt;Google&lt;/a&gt; than from &lt;a href="http://search.yahoo.com/"
 title="Yahoo Search"&gt;Yahoo&lt;/a&gt; or &lt;a href="http://search.msn.com/"
 title="MSN Search"&gt;MSN&lt;/a&gt;.&lt;/p&gt;
-</code>
-</pre>
+</code></pre>
 <p>The title attribute is optional. Link names may contain letters,
 numbers and spaces, but are <em>not</em> case sensitive:</p>
-<pre>
-  <code>I start my morning with a cup of coffee and
+<pre><code>I start my morning with a cup of coffee and
 [The New York Times][NY Times].
 
 [ny times]: http://www.nytimes.com/
-</code>
-</pre>
+</code></pre>
 <p>Output:</p>
-<pre>
-  <code>&lt;p&gt;I start my morning with a cup of coffee and
+<pre><code>&lt;p&gt;I start my morning with a cup of coffee and
 &lt;a href="http://www.nytimes.com/"&gt;The New York Times&lt;/a&gt;.&lt;/p&gt;
-</code>
-</pre>
+</code></pre>
 <h3>Images</h3>
 <p>Image syntax is very much like link syntax.</p>
 <p>Inline (titles are optional):</p>
-<pre>
-  <code>![alt text](/path/to/img.jpg "Title")
-</code>
-</pre>
+<pre><code>![alt text](/path/to/img.jpg "Title")
+</code></pre>
 <p>Reference-style:</p>
-<pre>
-  <code>![alt text][id]
+<pre><code>![alt text][id]
 
 [id]: /path/to/img.jpg "Title"
-</code>
-</pre>
+</code></pre>
 <p>Both of the above examples produce the same output:</p>
-<pre>
-  <code>&lt;img src="/path/to/img.jpg" alt="alt text" title="Title" /&gt;
-</code>
-</pre>
+<pre><code>&lt;img src="/path/to/img.jpg" alt="alt text" title="Title" /&gt;
+</code></pre>
 <h3>Code</h3>
 <p>In a regular paragraph, you can create code span by wrapping text in
 backtick quotes. Any ampersands (<code>&amp;</code>) and angle brackets (<code>&lt;</code> or
 <code>&gt;</code>) will automatically be translated into HTML entities. This makes
 it easy to use Markdown to write about HTML example code:</p>
-<pre>
-  <code>I strongly recommend against using any `&lt;blink&gt;` tags.
+<pre><code>I strongly recommend against using any `&lt;blink&gt;` tags.
 
 I wish SmartyPants used named entities like `&amp;mdash;`
 instead of decimal-encoded entites like `&amp;#8212;`.
-</code>
-</pre>
+</code></pre>
 <p>Output:</p>
-<pre>
-  <code>&lt;p&gt;I strongly recommend against using any
+<pre><code>&lt;p&gt;I strongly recommend against using any
 &lt;code&gt;&amp;lt;blink&amp;gt;&lt;/code&gt; tags.&lt;/p&gt;
 
 &lt;p&gt;I wish SmartyPants used named entities like
 &lt;code&gt;&amp;amp;mdash;&lt;/code&gt; instead of decimal-encoded
 entites like &lt;code&gt;&amp;amp;#8212;&lt;/code&gt;.&lt;/p&gt;
-</code>
-</pre>
+</code></pre>
 <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, <code>&amp;</code>, <code>&lt;</code>,
 and <code>&gt;</code> characters will be escaped automatically.</p>
 <p>Markdown:</p>
-<pre>
-  <code>If you want your page to validate under XHTML 1.0 Strict,
+<pre><code>If you want your page to validate under XHTML 1.0 Strict,
 you've got to put paragraph tags in your blockquotes:
 
     &lt;blockquote&gt;
         &lt;p&gt;For example.&lt;/p&gt;
     &lt;/blockquote&gt;
-</code>
-</pre>
+</code></pre>
 <p>Output:</p>
-<pre>
-  <code>&lt;p&gt;If you want your page to validate under XHTML 1.0 Strict,
+<pre><code>&lt;p&gt;If you want your page to validate under XHTML 1.0 Strict,
 you've got to put paragraph tags in your blockquotes:&lt;/p&gt;
 
 &lt;pre&gt;&lt;code&gt;&amp;lt;blockquote&amp;gt;
     &amp;lt;p&amp;gt;For example.&amp;lt;/p&amp;gt;
 &amp;lt;/blockquote&amp;gt;
 &lt;/code&gt;&lt;/pre&gt;
-</code>
-</pre>
\ No newline at end of file
+</code></pre>
\ No newline at end of file