# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1298752104 -3600
# Node ID 173c3623377ba8ef4d21edb4c1a7f331e75cdbc7
# Parent  10dc0763b79b05e1a861e7aa303016f6b7ab2b55
Permit page name quoting and commas in page names.

diff -r 10dc0763b79b -r 173c3623377b MoinMoin/macro/Include.py
--- a/MoinMoin/macro/Include.py	Sat Feb 05 21:45:52 2011 +0100
+++ b/MoinMoin/macro/Include.py	Sat Feb 26 21:28:24 2011 +0100
@@ -4,7 +4,7 @@
 
     This macro includes the formatted content of the given page(s). See
 
-        http://purl.net/wiki/moinmaster/HelpOnMacros/Include
+        http://moinmo.in/HelpOnMacros/Include
 
     for detailed docs.
 
@@ -26,6 +26,7 @@
 _sysmsg = '<p><strong class="%s">%s</strong></p>'
 
 ## keep in sync with TableOfContents macro!
+_arg_page = r'(?P<pquote>[\'"]?)(?P<name>.+?)(?P=pquote)'
 _arg_heading = r'(?P<heading>,)\s*(|(?P<hquote>[\'"])(?P<htext>.+?)(?P=hquote))'
 _arg_level = r',\s*(?P<level>\d*)'
 _arg_from = r'(,\s*from=(?P<fquote>[\'"])(?P<from>.+?)(?P=fquote))?'
@@ -35,8 +36,8 @@
 _arg_skipitems = r'(,\s*skipitems=(?P<skipitems>\d+))?'
 _arg_titlesonly = r'(,\s*(?P<titlesonly>titlesonly))?'
 _arg_editlink = r'(,\s*(?P<editlink>editlink))?'
-_args_re_pattern = r'^(?P<name>[^,]+)(%s(%s)?%s%s%s%s%s%s%s)?$' % (
-    _arg_heading, _arg_level, _arg_from, _arg_to, _arg_sort, _arg_items,
+_args_re_pattern = r'^%s(%s(%s)?%s%s%s%s%s%s%s)?$' % (
+    _arg_page, _arg_heading, _arg_level, _arg_from, _arg_to, _arg_sort, _arg_items,
     _arg_skipitems, _arg_titlesonly, _arg_editlink)
 
 _title_re = r"^(?P<heading>\s*(?P<hmarker>=+)\s.*\s(?P=hmarker))$"