diff options
author | Waylan Limberg <waylan@gmail.com> | 2012-01-18 21:29:19 -0500 |
---|---|---|
committer | Waylan Limberg <waylan@gmail.com> | 2012-01-18 21:29:19 -0500 |
commit | c33dbafc2663e2d495c53ab0bf26f5f6c4087863 (patch) | |
tree | a00f8f59e2774438cf66125b362016a19ad1393e /tests/html4_safe | |
parent | 77c587e1d16934608fc91aa34894836ef0d03a8b (diff) | |
parent | 69b365d07c7fabb206d9094398de2162cbcf6ba3 (diff) | |
download | markdown-c33dbafc2663e2d495c53ab0bf26f5f6c4087863.tar.gz markdown-c33dbafc2663e2d495c53ab0bf26f5f6c4087863.tar.bz2 markdown-c33dbafc2663e2d495c53ab0bf26f5f6c4087863.zip |
Merge branch 'master' of git://github.com/fiesta/Python-Markdown into fiesta
Conflicts:
markdown/inlinepatterns.py
Diffstat (limited to 'tests/html4_safe')
-rw-r--r-- | tests/html4_safe/html_then_blockquote.html | 6 | ||||
-rw-r--r-- | tests/html4_safe/html_then_blockquote.txt | 6 | ||||
-rw-r--r-- | tests/html4_safe/link.html | 1 | ||||
-rw-r--r-- | tests/html4_safe/link.txt | 1 | ||||
-rw-r--r-- | tests/html4_safe/test.cfg | 3 |
5 files changed, 17 insertions, 0 deletions
diff --git a/tests/html4_safe/html_then_blockquote.html b/tests/html4_safe/html_then_blockquote.html new file mode 100644 index 0000000..5833cd4 --- /dev/null +++ b/tests/html4_safe/html_then_blockquote.html @@ -0,0 +1,6 @@ +<p>to:</p> +<p><td /><td style="text-align: center; white-space: nowrap;"><br /></p> +<blockquote> +<p>3) You don't need to alter all localization files. + Adding the new labels to the en_US files will do it.</p> +</blockquote>
\ No newline at end of file diff --git a/tests/html4_safe/html_then_blockquote.txt b/tests/html4_safe/html_then_blockquote.txt new file mode 100644 index 0000000..544df67 --- /dev/null +++ b/tests/html4_safe/html_then_blockquote.txt @@ -0,0 +1,6 @@ +to: + +<td /><td style="text-align: center; white-space: nowrap;"><br /> + +> 3) You don't need to alter all localization files. +> Adding the new labels to the en_US files will do it. diff --git a/tests/html4_safe/link.html b/tests/html4_safe/link.html new file mode 100644 index 0000000..642f4be --- /dev/null +++ b/tests/html4_safe/link.html @@ -0,0 +1 @@ +<p><here <a href="http://gmail.com">gmail.com</a> is a link></p>
\ No newline at end of file diff --git a/tests/html4_safe/link.txt b/tests/html4_safe/link.txt new file mode 100644 index 0000000..28331a7 --- /dev/null +++ b/tests/html4_safe/link.txt @@ -0,0 +1 @@ +<here [gmail.com](http://gmail.com) is a link> diff --git a/tests/html4_safe/test.cfg b/tests/html4_safe/test.cfg new file mode 100644 index 0000000..66f7bf0 --- /dev/null +++ b/tests/html4_safe/test.cfg @@ -0,0 +1,3 @@ +[DEFAULT] +output_format=html4 +safe_mode=escape |