1.1 --- a/moinformat/parsers/common.py Tue Aug 07 22:54:13 2018 +0200
1.2 +++ b/moinformat/parsers/common.py Tue Aug 07 22:54:54 2018 +0200
1.3 @@ -27,6 +27,7 @@
1.4
1.5 ws_excl_nl = r"[ \f\r\t\v]"
1.6 quotes = "['" '"]' # ['"]
1.7 +dotall = r"(.|\n)"
1.8
1.9 def choice(l):
1.10
1.11 @@ -89,6 +90,7 @@
1.12 for name, value in syntax.items():
1.13 value = value.replace(r"\N", ws_excl_nl)
1.14 value = value.replace(r"\Q", quotes)
1.15 + value = value.replace(r"\E", dotall)
1.16 patterns[name] = get_pattern(value)
1.17 return patterns
1.18
2.1 --- a/moinformat/parsers/moin.py Tue Aug 07 22:54:13 2018 +0200
2.2 +++ b/moinformat/parsers/moin.py Tue Aug 07 22:54:54 2018 +0200
2.3 @@ -696,7 +696,8 @@
2.4
2.5 "link" : join((r"\[\[", # [[
2.6 group("target", ".*?"), # target
2.7 - optional(join((r"\|", group("text", ".*?")))), # | text (optional)
2.8 + optional(join((r"\|", # |
2.9 + group("text", r"\E*?")))), # text-incl-nl (optional)
2.10 "]]")), # ]]
2.11
2.12 "macro" : join(("<<", # <<