diff options
| author | Waylan Limberg <waylan.limberg@icloud.com> | 2014-11-17 22:43:23 -0500 |
|---|---|---|
| committer | Waylan Limberg <waylan.limberg@icloud.com> | 2014-11-17 22:43:23 -0500 |
| commit | ed0ff55087235db8a3f02e10d6a1ed603ef4c476 (patch) | |
| tree | 88a494362cdc19ed1687c67b6b5f7c9dacbcbf51 /tests | |
| parent | f0357b28ef1723929146eabe6571d7c436c90c34 (diff) | |
| parent | 69fd8b4871f3c027b78072af88bb8a62202bc7e7 (diff) | |
| download | markdown-ed0ff55087235db8a3f02e10d6a1ed603ef4c476.tar.gz markdown-ed0ff55087235db8a3f02e10d6a1ed603ef4c476.tar.bz2 markdown-ed0ff55087235db8a3f02e10d6a1ed603ef4c476.zip | |
Merge pull request #367 from facelessuser/master
Fix issue #365 and #366
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/misc/nested-patterns.html | 4 | ||||
| -rw-r--r-- | tests/misc/nested-patterns.txt | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/tests/misc/nested-patterns.html b/tests/misc/nested-patterns.html index 8c46a58..1c7bb43 100644 --- a/tests/misc/nested-patterns.html +++ b/tests/misc/nested-patterns.html @@ -5,4 +5,6 @@ <strong><a href="http://example.com"><em>link</em></a></strong> <strong><a href="http://example.com"><em>link</em></a></strong> <a href="http://example.com"><strong><em>link</em></strong></a></p> -<p><strong><em>I am <strong><em>italic</em> and</strong> bold</em> I am <code>just</code> bold</strong></p>
\ No newline at end of file +<p><strong><em>I am <strong><em>italic</em> and</strong> bold</em> I am <code>just</code> bold</strong></p> +<p>Example <strong><em>bold italic</em></strong> on the same line <strong><em>bold italic</em></strong>.</p> +<p>Example <strong><em>bold italic</em></strong> on the same line <strong><em>bold italic</em></strong>.</p>
\ No newline at end of file diff --git a/tests/misc/nested-patterns.txt b/tests/misc/nested-patterns.txt index e347ccf..9032cf1 100644 --- a/tests/misc/nested-patterns.txt +++ b/tests/misc/nested-patterns.txt @@ -7,3 +7,7 @@ __[*link*](http://example.com)__ [***link***](http://example.com) ***I am ___italic_ and__ bold* I am `just` bold** + +Example __*bold italic*__ on the same line __*bold italic*__. + +Example **_bold italic_** on the same line **_bold italic_**. |