Commit cd1c23e1 by Carlos Andrés Rocha

Fixed WikiPath regexp. It was incorrectly matching [Title](Link) on the same line.

parent 7e42bce4
...@@ -49,7 +49,7 @@ class WikiPathExtension(markdown.Extension): ...@@ -49,7 +49,7 @@ class WikiPathExtension(markdown.Extension):
self.md = md self.md = md
# append to end of inline patterns # append to end of inline patterns
WIKI_RE = r'\[(?P<linkTitle>.+?)\]\(wiki:(?P<wikiTitle>[a-zA-Z\d\./_-]*)\)' WIKI_RE = r'\[(?P<linkTitle>[^\]]+?)\]\(wiki:(?P<wikiTitle>[a-zA-Z\d\./_-]*)\)'
wikiPathPattern = WikiPath(WIKI_RE, self.config, markdown_instance=md) wikiPathPattern = WikiPath(WIKI_RE, self.config, markdown_instance=md)
wikiPathPattern.md = md wikiPathPattern.md = md
md.inlinePatterns.add('djangowikipath', wikiPathPattern, "<reference") md.inlinePatterns.add('djangowikipath', wikiPathPattern, "<reference")
...@@ -135,4 +135,4 @@ def makeExtension(configs=None) : ...@@ -135,4 +135,4 @@ def makeExtension(configs=None) :
if __name__ == "__main__": if __name__ == "__main__":
import doctest import doctest
doctest.testmod() doctest.testmod()
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment