5 files changed, 27 insertions(+), 3 deletions(-)

M wiki/plugins/images/markdown_extensions.py
M wiki/plugins/links/mdx/djangowikilinks.py
M wiki/plugins/links/mdx/urlize.py
M wiki/plugins/macros/markdown_extensions.py
M wiki/plugins/macros/settings.py

@@ 1,3 1,4 @@
+# -*- coding: utf-8 -*-
 import markdown
 import re
 

@@ 1,4 1,5 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
 '''
 Wikipath Extension for Python-Markdown

@@ 1,3 1,4 @@
+# -*- coding: utf-8 -*-
 """
 Code modified from:
 https://github.com/r0wb0t/markdown-urlize

@@ 1,3 1,4 @@
+# -*- coding: utf-8 -*-
 import markdown
 import re
 


@@ 5,8 6,11 @@ from django.utils.translation import ugettext as _
 from django.template.loader import render_to_string
 from django.template import Context
 
+# See: http://stackoverflow.com/questions/430759/regex-for-managing-escaped-characters-for-items-like-string-literals
+re_sq_short = r"'([^'\\]*(?:\\.[^'\\]*)*)'"
+
 MACRO_RE = re.compile(r'.*(\[(?P<macro>\w+)(?P<kwargs>\s\w+\:.+)*\]).*', re.IGNORECASE)
-KWARG_RE = re.compile(r'([^ |:]+):([^ |$]+)', 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
 


@@ 25,6 29,9 @@ class MacroPreprocessor(markdown.preprocessors.Preprocessor):
     allowed_methods = settings.METHODS
     
     def run(self, lines):
+        # Look at all those indentations.
+        # That's insane, let's get a helper library
+        # Please note that this pattern is also in plugins.images
         new_text = []
         for line in lines:
             m = MACRO_RE.match(line)


@@ 33,8 40,21 @@ class MacroPreprocessor(markdown.preprocessors.Preprocessor):
                 if macro in MacroPreprocessor.allowed_methods:
                     kwargs = m.group('kwargs')
                     if kwargs:
-                        kwargs = eval('{' + KWARG_RE.sub(r'"\1":"\2",', kwargs) + '}')
-                        line = getattr(self, macro)(**kwargs)
+                        kwargs_dict = {}
+                        for kwarg in KWARG_RE.finditer(kwargs):
+                            arg = kwarg.group('arg')
+                            value = kwarg.group('value')
+                            if value is None:
+                                value = True
+                            if isinstance(value, basestring):
+                                # If value is enclosed with ': Remove and remove escape sequences
+                                if value.startswith(u"'") and len(value) > 2:
+                                    value = value[1:-1]
+                                    value = value.replace(u"\\\\", u"¤KEEPME¤")
+                                    value = value.replace(u"\\", u"")
+                                    value = value.replace(u"¤KEEPME¤", u"\\")
+                            kwargs_dict[arg] = value
+                        line = getattr(self, macro)(**kwargs_dict)
                     else:
                         line = getattr(self, macro)()
             if not line is None:

@@ 1,3 1,4 @@
+# -*- coding: utf-8 -*-
 from django.conf import settings as django_settings
 
 SLUG = 'macros'