~netlandish/django-wiki

94e603581bd9a0b3ba28929e6bf7e3e99fc654a7 — benjaoming 11 years ago 7e6da88 + 26c922b
Merge pull request #108 from SacNaturalFoods/master

fixed macro arg regex for args longer than 1 character
1 files changed, 1 insertions(+), 1 deletions(-)

M wiki/plugins/macros/markdown_extensions.py
M wiki/plugins/macros/markdown_extensions.py => wiki/plugins/macros/markdown_extensions.py +1 -1
@@ 10,7 10,7 @@ from django.template import Context
re_sq_short = r"'([^'\\]*(?:\\.[^'\\]*)*)'"

MACRO_RE = re.compile(r'.*(\[(?P<macro>\w+)(?P<kwargs>\s\w+\:.+)*\]).*', re.IGNORECASE)
KWARG_RE = re.compile(r'\s*(?P<arg>\w+)(:(?P<value>([^\']|%s)))?' % re_sq_short, re.IGNORECASE)
KWARG_RE = re.compile(r'\s*(?P<arg>\w+)(:(?P<value>([^\']+|%s)))?' % re_sq_short, re.IGNORECASE)

from wiki.plugins.macros import settings