diff options
| author | Waylan Limberg <waylan@gmail.com> | 2014-01-05 07:25:09 -0800 |
|---|---|---|
| committer | Waylan Limberg <waylan@gmail.com> | 2014-01-05 07:25:09 -0800 |
| commit | 3e03dd14b3f47f1482e91da155834afc25d6458f (patch) | |
| tree | 65a9ceeecacfcc3dc89d278135c1483f931dc18b | |
| parent | b6ed501695ea5f8029a228686f84c163c0cdc50b (diff) | |
| parent | db12a327339d71cfd1b50a1f85bb158095b2fbae (diff) | |
| download | markdown-3e03dd14b3f47f1482e91da155834afc25d6458f.tar.gz markdown-3e03dd14b3f47f1482e91da155834afc25d6458f.tar.bz2 markdown-3e03dd14b3f47f1482e91da155834afc25d6458f.zip | |
Merge pull request #275 from geekman/master
Fixed parsing of brackets within inline image titles
| -rw-r--r-- | markdown/inlinepatterns.py | 2 | ||||
| -rw-r--r-- | tests/misc/brackets-in-img-title.html | 9 | ||||
| -rw-r--r-- | tests/misc/brackets-in-img-title.txt | 12 |
3 files changed, 22 insertions, 1 deletions
diff --git a/markdown/inlinepatterns.py b/markdown/inlinepatterns.py index de957ef..bd3d17b 100644 --- a/markdown/inlinepatterns.py +++ b/markdown/inlinepatterns.py @@ -107,7 +107,7 @@ LINK_RE = NOIMG + BRK + \ r'''\(\s*(<.*?>|((?:(?:\(.*?\))|[^\(\)]))*?)\s*((['"])(.*?)\12\s*)?\)''' # [text](url) or [text](<url>) or [text](url "title") -IMAGE_LINK_RE = r'\!' + BRK + r'\s*\((<.*?>|([^\)]*))\)' +IMAGE_LINK_RE = r'\!' + BRK + r'\s*\((<.*?>|([^")]+"[^"]*"|[^\)]*))\)' #  or  REFERENCE_RE = NOIMG + BRK+ r'\s?\[([^\]]*)\]' # [Google][3] SHORT_REF_RE = NOIMG + r'\[([^\]]+)\]' # [Google] diff --git a/tests/misc/brackets-in-img-title.html b/tests/misc/brackets-in-img-title.html new file mode 100644 index 0000000..3677139 --- /dev/null +++ b/tests/misc/brackets-in-img-title.html @@ -0,0 +1,9 @@ +<p><img alt="alt" src="local-img.jpg" /> +<img alt="alt" src="local-img.jpg" title="" /> +<img alt="alt" src="local-img.jpg" title="normal title" /></p> +<p><img alt="alt" src="local-img.jpg" title="(just title in brackets)" /> +<img alt="alt" src="local-img.jpg" title="title with brackets (I think)" /></p> +<p><img alt="alt" src="local-img.jpg" title="(" /> +<img alt="alt" src="local-img.jpg" title="(open only" /> +<img alt="alt" src="local-img.jpg" title=")" /> +<img alt="alt" src="local-img.jpg" title="close only)" /></p>
\ No newline at end of file diff --git a/tests/misc/brackets-in-img-title.txt b/tests/misc/brackets-in-img-title.txt new file mode 100644 index 0000000..01fcd4e --- /dev/null +++ b/tests/misc/brackets-in-img-title.txt @@ -0,0 +1,12 @@ + + + + + + + + + + + + |