1.1 --- a/moinformat/parsers/moin.py Fri Feb 08 22:35:13 2019 +0100
1.2 +++ b/moinformat/parsers/moin.py Fri Feb 08 22:35:46 2019 +0100
1.3 @@ -3,7 +3,7 @@
1.4 """
1.5 Moin wiki format parser.
1.6
1.7 -Copyright (C) 2017, 2018 Paul Boddie <paul@boddie.org.uk>
1.8 +Copyright (C) 2017, 2018, 2019 Paul Boddie <paul@boddie.org.uk>
1.9
1.10 This program is free software; you can redistribute it and/or modify it under
1.11 the terms of the GNU General Public License as published by the Free Software
1.12 @@ -756,7 +756,7 @@
1.13 # Links and transclusions may start inline spans.
1.14
1.15 "link" : join((r"\[\[", # [[
1.16 - group("target", ".*?"), # ...
1.17 + group("target", r"\E*?"), # ...
1.18 choice((r"\|", # |
1.19 group("end", r"]]"))))), # ]]
1.20
3.1 --- a/tests/test_links.txt Fri Feb 08 22:35:13 2019 +0100
3.2 +++ b/tests/test_links.txt Fri Feb 08 22:35:46 2019 +0100
3.3 @@ -6,3 +6,9 @@
3.4 A [[SomePage|''fancy'' link]] and [[SomePage|another|with|arguments]].
3.5
3.6 An {{attachment:picture.jpg|image|width=200}}.
3.7 +
3.8 +A paragraph with a [[wrapped
3.9 +link]], a [[wrapped
3.10 +link|wrapped link with label]], a [[link|link with
3.11 +wrapped label]], and a [[#wrapped
3.12 +intra-page link]].