diff options
| author | JensDiemer <git@jensdiemer.de> | 2013-08-07 14:54:54 +0200 |
|---|---|---|
| committer | JensDiemer <git@jensdiemer.de> | 2013-08-07 14:54:54 +0200 |
| commit | 702edc1b362ec17c145ceffedcb7f9be13087136 (patch) | |
| tree | 492847d11d6ac157ef7b1de93147a7e159313ea5 | |
| parent | 1161682afd445dda6d2df43d56369067be4a1f27 (diff) | |
| download | creole-702edc1b362ec17c145ceffedcb7f9be13087136.tar.gz | |
'inline_macro' -> 'macro_inline'
see: https://github.com/jedie/python-creole/issues/13
| -rw-r--r-- | creole/creole2html/rules.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/creole/creole2html/rules.py b/creole/creole2html/rules.py index 3a685d5..473bbf7 100644 --- a/creole/creole2html/rules.py +++ b/creole/creole2html/rules.py @@ -61,8 +61,8 @@ class InlineRules(object): #-------------------------------------------------------------------------- # a macro like: <<macro>>text<</macro>> - inline_macro = r''' - (?P<inline_macro> + macro_inline = r''' + (?P<macro_inline> << \s* (?P<macro_inline_start>\w+) \s* (?P<macro_inline_args>.*?) \s* >> (?P<macro_inline_text>(.|\n)*?) <</ \s* (?P=macro_inline_start) \s* >> @@ -196,7 +196,7 @@ class SpecialRules(object): ) \s* ''' % '|'.join([ InlineRules.link, - InlineRules.inline_macro, InlineRules.macro_tag, + InlineRules.macro_inline, InlineRules.macro_tag, InlineRules.image, InlineRules.pre_inline ]) @@ -208,7 +208,7 @@ class SpecialRules(object): INLINE_FLAGS = re.VERBOSE | re.UNICODE INLINE_RULES = ( InlineRules.link, InlineRules.url, - InlineRules.inline_macro, InlineRules.macro_tag, + InlineRules.macro_inline, InlineRules.macro_tag, InlineRules.pre_inline, InlineRules.image, InlineRules.strong, InlineRules.emphasis, |