changeset 2725:388204baf00f

change [[macro]] to <<macro>> in all built-in markup
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sun, 12 Aug 2007 23:42:33 +0200
parents 3ce812c19af7
children 6cb75379c073
files MoinMoin/PageEditor.py MoinMoin/PageGraphicalEditor.py MoinMoin/_tests/_test_template.py MoinMoin/_tests/test_PageEditor.py MoinMoin/action/MyPages.py MoinMoin/action/SyncPages.py MoinMoin/action/backup.py MoinMoin/action/fckdialog.py MoinMoin/action/fullsearch.py MoinMoin/action/recoverpass.py MoinMoin/config/multiconfig.py MoinMoin/converter/text_html_text_moin_wiki.py MoinMoin/formatter/text_gedit.py MoinMoin/i18n/tools/check_i18n.py MoinMoin/macro/AdvancedSearch.py MoinMoin/macro/AttachInfo.py MoinMoin/macro/AttachList.py MoinMoin/macro/EmbedObject.py MoinMoin/macro/FullSearch.py MoinMoin/macro/Hits.py MoinMoin/macro/ImageLink.py MoinMoin/macro/MonthCalendar.py MoinMoin/macro/NewPage.py MoinMoin/macro/RandomQuote.py MoinMoin/macro/ShowSmileys.py MoinMoin/macro/__init__.py MoinMoin/macro/_tests/test_ImageLink.py MoinMoin/mail/mailimport.py MoinMoin/parser/_tests/test_text_moin_wiki.py MoinMoin/parser/text_moin_wiki.py MoinMoin/theme/__init__.py MoinMoin/userprefs/notification.py
diffstat 32 files changed, 117 insertions(+), 117 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/PageEditor.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/PageEditor.py	Sun Aug 12 23:42:33 2007 +0200
@@ -300,7 +300,7 @@
                     loadable_draft = True
                     page_rev = rev
                     draft_timestamp_str = request.user.getFormattedDateTime(draft_timestamp)
-                    draft_message = _(u"'''[[BR]]Your draft based on revision %(draft_rev)d (saved %(draft_timestamp_str)s) can be loaded instead of the current revision %(page_rev)d by using the load draft button - in case you lost your last edit somehow without saving it.''' A draft gets saved for you when you do a preview, cancel an edit or unsuccessfully save.") % locals()
+                    draft_message = _(u"'''<<BR>>Your draft based on revision %(draft_rev)d (saved %(draft_timestamp_str)s) can be loaded instead of the current revision %(page_rev)d by using the load draft button - in case you lost your last edit somehow without saving it.''' A draft gets saved for you when you do a preview, cancel an edit or unsuccessfully save.") % locals()
 
         # Setup status message
         status = [kw.get('msg', ''), conflict_msg, edit_lock_message, draft_message]
@@ -713,17 +713,17 @@
         signature = u.signature()
         variables = {
             'PAGE': self.page_name,
-            'TIME': "[[DateTime(%s)]]" % now,
-            'DATE': "[[Date(%s)]]" % now,
+            'TIME': "<<DateTime(%s)>>" % now,
+            'DATE': "<<Date(%s)>>" % now,
             'ME': u.name,
             'USERNAME': signature,
             'USER': "-- %s" % signature,
-            'SIG': "-- %s [[DateTime(%s)]]" % (signature, now),
+            'SIG': "-- %s <<DateTime(%s)>>" % (signature, now),
         }
 
         if u.valid and u.name:
             if u.email:
-                variables['MAILTO'] = "[[MailTo(%s)]]" % u.email
+                variables['MAILTO'] = "<<MailTo(%s)>>" % u.email
             # Users can define their own variables via
             # UserHomepage/MyDict, which override the default variables.
             userDictPage = u.name + "/MyDict"
@@ -1170,9 +1170,9 @@
                 # warn user about existing lock
 
                 result = 1, _(
-"""This page was opened for editing or last previewed at %(timestamp)s by %(owner)s.[[BR]]
+"""This page was opened for editing or last previewed at %(timestamp)s by %(owner)s.<<BR>>
 '''You should ''refrain from editing'' this page for at least another %(mins_valid)d minute(s),
-to avoid editing conflicts.'''[[BR]]
+to avoid editing conflicts.'''<<BR>>
 To leave the editor, press the Cancel button.""") % {
                     'timestamp': timestamp, 'owner': owner, 'mins_valid': mins_valid}
 
--- a/MoinMoin/PageGraphicalEditor.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/PageGraphicalEditor.py	Sun Aug 12 23:42:33 2007 +0200
@@ -193,7 +193,7 @@
                     loadable_draft = True
                     page_rev = rev
                     draft_timestamp_str = request.user.getFormattedDateTime(draft_timestamp)
-                    draft_message = _(u"'''[[BR]]Your draft based on revision %(draft_rev)d (saved %(draft_timestamp_str)s) can be loaded instead of the current revision %(page_rev)d by using the load draft button - in case you lost your last edit somehow without saving it.''' A draft gets saved for you when you do a preview, cancel an edit or unsuccessfully save.") % locals()
+                    draft_message = _(u"'''<<BR>>Your draft based on revision %(draft_rev)d (saved %(draft_timestamp_str)s) can be loaded instead of the current revision %(page_rev)d by using the load draft button - in case you lost your last edit somehow without saving it.''' A draft gets saved for you when you do a preview, cancel an edit or unsuccessfully save.") % locals()
 
         # Setup status message
         status = [kw.get('msg', ''), conflict_msg, edit_lock_message, draft_message]
--- a/MoinMoin/_tests/_test_template.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/_tests/_test_template.py	Sun Aug 12 23:42:33 2007 +0200
@@ -42,7 +42,7 @@
     """
     _tests = (
         # description,  test,            expected
-        ('Line break',  '[[BR]]',        '<br>'),
+        ('Line break',  '<<BR>>',        '<br>'),
     )
 
     def setup_class(cls):
--- a/MoinMoin/_tests/test_PageEditor.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/_tests/test_PageEditor.py	Sun Aug 12 23:42:33 2007 +0200
@@ -100,7 +100,7 @@
 
     def testMailto(self):
         """ PageEditor: expand @MAILTO@ """
-        self.assertEqual(self.expand(), u'[[MailTo(%s)]]' % self.email)
+        self.assertEqual(self.expand(), u'<<MailTo(%s)>>' % self.email)
 
 
 class TestExpandPrivateVariables(TestExpandUserName):
--- a/MoinMoin/action/MyPages.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/action/MyPages.py	Sun Aug 12 23:42:33 2007 +0200
@@ -47,9 +47,9 @@
 the group pages.
 
 ||'''Add a new personal page:'''||'''Related access control list group:'''||
-||[[NewPage(HomepageReadWritePageTemplate,read-write page,%(username)s)]]||["%(username)s/ReadWriteGroup"]||
-||[[NewPage(HomepageReadPageTemplate,read-only page,%(username)s)]]||["%(username)s/ReadGroup"]||
-||[[NewPage(HomepagePrivatePageTemplate,private page,%(username)s)]]||%(username)s only||
+||<<NewPage(HomepageReadWritePageTemplate,read-write page,%(username)s)>>||["%(username)s/ReadWriteGroup"]||
+||<<NewPage(HomepageReadPageTemplate,read-only page,%(username)s)>>||["%(username)s/ReadGroup"]||
+||<<NewPage(HomepagePrivatePageTemplate,private page,%(username)s)>>||%(username)s only||
 
 """, formatted=False)
     pagecontent = pagecontent % locals()
--- a/MoinMoin/action/SyncPages.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/action/SyncPages.py	Sun Aug 12 23:42:33 2007 +0200
@@ -77,14 +77,14 @@
             if line[1]:
                 if line[2]:
                     macro_args = [line[1]] + list(line[2])
-                    message = u"[[GetText2(|%s)]]" % (packLine(macro_args), )
+                    message = u"<<GetText2(|%s)>>" % (packLine(macro_args), )
                 else:
-                    message = u"[[GetText(%s)]]" % (line[1], )
+                    message = u"<<GetText(%s)>>" % (line[1], )
             else:
                 message = u""
             table.append(table_line % {"smiley": line[0][1],
                                        "message": message,
-                                       "raw_suffix": line[3].replace("\n", "[[BR]]")})
+                                       "raw_suffix": line[3].replace("\n", "<<BR>>")})
 
         return "\n".join(table)
 
@@ -137,7 +137,7 @@
 
     def show_password_form(self):
         _ = self.request.getText
-        d = {"message": _(r"Please enter your password of your account at the remote wiki below. [[BR]] /!\ You should trust both wikis because the password could be read by the particular administrators."),
+        d = {"message": _(r"Please enter your password of your account at the remote wiki below. <<BR>> /!\ You should trust both wikis because the password could be read by the particular administrators."),
              "passwordlabel": _("Password"),
              "submit": _("Login"),
              "cancel": _("Cancel"),
@@ -256,7 +256,7 @@
         local_full_iwid = packLine([local.get_iwid(), local.get_interwiki_name()])
         remote_full_iwid = packLine([remote.get_iwid(), remote.get_interwiki_name()])
 
-        self.log_status(self.INFO, _("Synchronisation started -"), raw_suffix=" [[DateTime(%s)]]" % self.page._get_local_timestamp())
+        self.log_status(self.INFO, _("Synchronisation started -"), raw_suffix=" <<DateTime(%s)>>" % self.page._get_local_timestamp())
 
         l_pages = local.get_pages()
         r_pages = remote.get_pages(exclude_non_writable=direction != DOWN)
@@ -294,7 +294,7 @@
                 matching_tags = tags.fetch(iwid_full=remote.iwid_full, direction=match_direction)
                 matching_tags.sort()
                 if debug:
-                    self.log_status(ActionClass.INFO, raw_suffix="Tags: %r [[BR]] All: %r" % (matching_tags, tags.tags))
+                    self.log_status(ActionClass.INFO, raw_suffix="Tags: %r <<BR>> All: %r" % (matching_tags, tags.tags))
 
                 # some default values for non matching tags
                 normalised_name = None
--- a/MoinMoin/action/backup.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/action/backup.py	Sun Aug 12 23:42:33 2007 +0200
@@ -82,9 +82,9 @@
   * Restoring a backup will overwrite existing data, so be careful.
   * Rename it to <siteid>.tar.<compression> (remove the --date--time--UTC stuff).
   * Put the backup file into the backup_storage_dir (use scp, ftp, ...).
-  * Hit the [[GetText(Restore)]] button below.
+  * Hit the <<GetText(Restore)>> button below.
 
- * To make a backup, just hit the [[GetText(Backup)]] button and save the file
+ * To make a backup, just hit the <<GetText(Backup)>> button and save the file
    you get to a secure place.
 
 Please make sure your wiki configuration backup_* values are correct and complete.
--- a/MoinMoin/action/fckdialog.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/action/fckdialog.py	Sun Aug 12 23:42:33 2007 +0200
@@ -119,7 +119,7 @@
             helptext = ""
         helptexts.append(
             '''<div id="%s" style="DISPLAY: none">
-               <b>[[%s]]</b>
+               <b><<%s>></b>
                <br/>
                <textarea style="color:#000000" cols="37" rows="10" disabled="disabled">%s</textarea>
                </div>'''
--- a/MoinMoin/action/fullsearch.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/action/fullsearch.py	Sun Aug 12 23:42:33 2007 +0200
@@ -242,7 +242,7 @@
 
         hints.append(''.join([
             _("(!) You're performing a title search that might not include"
-                ' all related results of your search query in this wiki. [[BR]]'),
+                ' all related results of your search query in this wiki. <<BR>>'),
             ' ',
             f.url(1, href=request.page.url(request, querydict, escape=0,
                 relative=False)),
--- a/MoinMoin/action/recoverpass.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/action/recoverpass.py	Sun Aug 12 23:42:33 2007 +0200
@@ -81,9 +81,9 @@
 
             request.write(_("""
 == Recovering a lost password ==
-[[BR]]
+<<BR>>
 If you have forgotten your password, provide your email address and click on '''Mail me my account data'''.
-[[BR]]
+<<BR>>
 The email you get contains the encrypted password (so even if someone intercepts the mail, he won't know your REAL password). Just copy and paste it into the login mask into the password field and log in.
 After logging in you should change your password."""))
 
--- a/MoinMoin/config/multiconfig.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/config/multiconfig.py	Sun Aug 12 23:42:33 2007 +0200
@@ -273,10 +273,10 @@
     editor_force = False
     editor_quickhelp = {# editor markup hints quickhelp
         'wiki': _("""\
- Emphasis:: [[Verbatim('')]]''italics''[[Verbatim('')]]; [[Verbatim(''')]]'''bold'''[[Verbatim(''')]]; [[Verbatim(''''')]]'''''bold italics'''''[[Verbatim(''''')]]; [[Verbatim('')]]''mixed ''[[Verbatim(''')]]'''''bold'''[[Verbatim(''')]] and italics''[[Verbatim('')]]; [[Verbatim(----)]] horizontal rule.
- Headings:: [[Verbatim(=)]] Title 1 [[Verbatim(=)]]; [[Verbatim(==)]] Title 2 [[Verbatim(==)]]; [[Verbatim(===)]] Title 3 [[Verbatim(===)]];   [[Verbatim(====)]] Title 4 [[Verbatim(====)]]; [[Verbatim(=====)]] Title 5 [[Verbatim(=====)]].
+ Emphasis:: <<Verbatim('')>>''italics''<<Verbatim('')>>; <<Verbatim(''')>>'''bold'''<<Verbatim(''')>>; <<Verbatim(''''')>>'''''bold italics'''''<<Verbatim(''''')>>; <<Verbatim('')>>''mixed ''<<Verbatim(''')>>'''''bold'''<<Verbatim(''')>> and italics''<<Verbatim('')>>; <<Verbatim(----)>> horizontal rule.
+ Headings:: <<Verbatim(=)>> Title 1 <<Verbatim(=)>>; <<Verbatim(==)>> Title 2 <<Verbatim(==)>>; <<Verbatim(===)>> Title 3 <<Verbatim(===)>>;   <<Verbatim(====)>> Title 4 <<Verbatim(====)>>; <<Verbatim(=====)>> Title 5 <<Verbatim(=====)>>.
  Lists:: space and one of: * bullets; 1., a., A., i., I. numbered items; 1.#n start numbering at n; space alone indents.
- Links:: [[Verbatim(JoinCapitalizedWords)]]; [[Verbatim(["brackets and double quotes"])]]; url; [url]; [url label].
+ Links:: <<Verbatim(JoinCapitalizedWords)>>; <<Verbatim([[target|linktext]])>>.
  Tables:: || cell text |||| cell text spanning 2 columns ||;    no trailing white space allowed after tables or titles.
 
 (!) For more help, see HelpOnEditing or SyntaxReference.
--- a/MoinMoin/converter/text_html_text_moin_wiki.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/converter/text_html_text_moin_wiki.py	Sun Aug 12 23:42:33 2007 +0200
@@ -1217,7 +1217,7 @@
                     il_parms += ",height=%s" % height
                 if alt:
                     il_parms += ",alt=%s" % alt
-                self.text.extend([self.white_space, "[[ImageLink(%s)]]" % il_parms, self.white_space])
+                self.text.extend([self.white_space, "<<ImageLink(%s)>>" % il_parms, self.white_space])
 
         # Drawing image
         elif title and title.startswith("drawing:"):
--- a/MoinMoin/formatter/text_gedit.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/formatter/text_gedit.py	Sun Aug 12 23:42:33 2007 +0200
@@ -127,9 +127,9 @@
             return self.image(**kw)
 
         elif args is not None:
-            result = "[[%s(%s)]]" % (name, args)
+            result = "<<%s(%s)>>" % (name, args)
         else:
-            result = "[[%s]]" % name
+            result = "<<%s>>" % name
         return '<span style="background-color:#ffff11">%s</span>' % result
 
     def parser(self, parser_name, lines):
--- a/MoinMoin/i18n/tools/check_i18n.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/i18n/tools/check_i18n.py	Sun Aug 12 23:42:33 2007 +0200
@@ -293,7 +293,7 @@
     print
     print '----'
     print
-    print '[[TableOfContents(2)]]'
+    print '<<TableOfContents(2)>>'
     print
     print
     print "= Translation Report ="
@@ -341,7 +341,7 @@
         print
         print "== %(name)s ==" % dict
         print
-        print "Maintainer: [[MailTo(%(maintainer)s)]]" % dict
+        print "Maintainer: <<MailTo(%(maintainer)s)>>" % dict
 
         # Print missing texts, if any
         if report[lang].missing():
--- a/MoinMoin/macro/AdvancedSearch.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/macro/AdvancedSearch.py	Sun Aug 12 23:42:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - AdvancedSearch Macro
 
-    [[AdvancedSearch]]
+    <<AdvancedSearch>>
         displays advanced search dialog.
 
     @license: GNU GPL, see COPYING for details.
--- a/MoinMoin/macro/AttachInfo.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/macro/AttachInfo.py	Sun Aug 12 23:42:33 2007 +0200
@@ -3,7 +3,7 @@
 
     A macro to produce information about attached pages
 
-    Usage: [[AttachInfo]]
+    Usage: <<AttachInfo>>
 
     @copyright: 2004 Jacob Cohen, Nigel Metheringham
     @license: GNU GPL, see COPYING for details
--- a/MoinMoin/macro/AttachList.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/macro/AttachList.py	Sun Aug 12 23:42:33 2007 +0200
@@ -3,7 +3,7 @@
 
     A macro to produce a list of attached files
 
-    Usage: [[AttachList([pagename,mime_type])]]
+    Usage: <<AttachList([pagename,mime_type])>>
 
     If pagename isn't set, the current pagename is used.
     If mime_type isn't given, all files are listed.
--- a/MoinMoin/macro/EmbedObject.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/macro/EmbedObject.py	Sun Aug 12 23:42:33 2007 +0200
@@ -8,7 +8,7 @@
         the kind of application.
 
     CALLING SEQUENCE:
-        [[EmbedObject(attachment[,width=width][,height=height][,alt=Embedded mimetpye/xy])]]
+        <<EmbedObject(attachment[,width=width][,height=height][,alt=Embedded mimetpye/xy])>>
 
     SUPPORTED MIMETYPES:
          application/x-shockwave-flash
@@ -74,19 +74,19 @@
         as PDF file"
 
     EXAMPLE:
-        [[EmbedObject]]
-        [[EmbedObject(example.swf,alt=A flash movie showing the rotating moin logo)]]
-        [[EmbedObject(example.mid,alt=Background sound of wikipage: oceanwaves)]]
-        [[EmbedObject(example.pdf)]]
-        [[EmbedObject(example.svg)]]
-        [[EmbedObject(example.mp3)]]
-        [[EmbedObject(example.vss)]]
+        <<EmbedObject>>
+        <<EmbedObject(example.swf,alt=A flash movie showing the rotating moin logo)>>
+        <<EmbedObject(example.mid,alt=Background sound of wikipage: oceanwaves)>>
+        <<EmbedObject(example.pdf)>>
+        <<EmbedObject(example.svg)>>
+        <<EmbedObject(example.mp3)>>
+        <<EmbedObject(example.vss)>>
 
-        [[EmbedObject(example.swf,width=637,height=392)]]
-        [[EmbedObject(SlideShow/example.swf,width=637,height=392)]]
-        [[EmbedObject(SlideShow/example.swf,width=637,height=392)]]
-        [[EmbedObject(SlideShow/example.swf,width=637,height=392,play=true,loop=false)]]
-        [[EmbedObject(SlideShow/example.swf,width=637,height=392,quality=low)]]
+        <<EmbedObject(example.swf,width=637,height=392)>>
+        <<EmbedObject(SlideShow/example.swf,width=637,height=392)>>
+        <<EmbedObject(SlideShow/example.swf,width=637,height=392)>>
+        <<EmbedObject(SlideShow/example.swf,width=637,height=392,play=true,loop=false)>>
+        <<EmbedObject(SlideShow/example.swf,width=637,height=392,quality=low)>>
 
 
     PROCEDURE:
@@ -266,7 +266,7 @@
         _ = self._
 
         if not self.target:
-            msg = _('Not enough arguments to EmbedObject macro! Try [[EmbedObject(attachment [,width=width] [,height=height] [,alt=Embedded mimetpye/xy])]]', formatted=False)
+            msg = _('Not enough arguments to EmbedObject macro! Try <<EmbedObject(attachment [,width=width] [,height=height] [,alt=Embedded mimetpye/xy])>>', formatted=False)
             return "%s%s%s" % (self.formatter.sysmsg(1), self.formatter.text(msg), self.formatter.sysmsg(0))
 
         pagename, fname = AttachFile.absoluteName(self.target, self.formatter.page.page_name)
--- a/MoinMoin/macro/FullSearch.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/macro/FullSearch.py	Sun Aug 12 23:42:33 2007 +0200
@@ -2,15 +2,15 @@
 """
     MoinMoin - FullSearch Macro
 
-    [[FullSearch]]
+    <<FullSearch>>
         displays a search dialog, as it always did.
 
-    [[FullSearch()]]
+    <<FullSearch()>>
         does the same as clicking on the page title, only that
         the result is embedded into the page. note the '()' after
         the macro name, which is an empty argument list.
 
-    [[FullSearch(Help)]]
+    <<FullSearch(Help)>>
         embeds a search result into a page, as if you entered
         'Help' into the search box.
 
--- a/MoinMoin/macro/Hits.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/macro/Hits.py	Sun Aug 12 23:42:33 2007 +0200
@@ -5,7 +5,7 @@
     This macro is used to show the cumulative hits of the wikipage where the Macro is called from.
     Optionally you could count how much this page or all pages were changed or viewed.
 
-    [[Hits([all=(0,1)],[filter=(VIEWPAGE,SAVEPAGE)]]
+    <<Hits([all=(0,1)],[filter=(VIEWPAGE,SAVEPAGE)>>
 
         all: if set to 1/True/yes then cumulative hits over all wiki pages is returned.
              Default is 0/False/no.
--- a/MoinMoin/macro/ImageLink.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/macro/ImageLink.py	Sun Aug 12 23:42:33 2007 +0200
@@ -8,7 +8,7 @@
     If no target is given the link will point to the image itself.
 
     Syntax:
-        [[ImageLink(image, [target,] [width=width, [height=height]])]]
+        <<ImageLink(image, [target,] [width=width, [height=height>>)>>
 
     Parameters:
         image: image attachment file name or the URL of an image
@@ -20,17 +20,17 @@
         alt: text for img tag "alt" attribute
 
     Examples:
-        [[ImageLink(München.png,München,height=100)]]
-        [[ImageLink(Images/München.png,München,height=100)]]
-        [[ImageLink(http://webcam.portalmuc.de/images/webcam/webcam_marienplatz.jpg,München Marienplatz)]]
-        [[ImageLink(plot.png,width=200)]]
-        [[ImageLink(plot.png,height=200)]]
-        [[ImageLink(plot.png)]]
-        [[ImageLink(http://webcam.portalmuc.de/images/webcam/webcam_marienplatz.jpg,http://www.muenchen.de,width=150)]]
-        [[ImageLink(münchen.png,http://www.muenchen.de,width=50)]]
-        [[ImageLink(http://webcam.portalmuc.de/images/webcam/webcam_marienplatz.jpg)]]
-        [[ImageLink(example.png,alt=whateveryouwant(üöä))]]
-        [[ImageLink(http://moinmoin.wikiwikiweb.de/OliverSiemoneit?action=AttachFile&do=get&target=screenshot.png,width=647,height=517,alt=OliverSiemoneit?action=AttachFile&do=get&target=screenshot,FrontPage)]]
+        <<ImageLink(München.png,München,height=100)>>
+        <<ImageLink(Images/München.png,München,height=100)>>
+        <<ImageLink(http://webcam.portalmuc.de/images/webcam/webcam_marienplatz.jpg,München Marienplatz)>>
+        <<ImageLink(plot.png,width=200)>>
+        <<ImageLink(plot.png,height=200)>>
+        <<ImageLink(plot.png)>>
+        <<ImageLink(http://webcam.portalmuc.de/images/webcam/webcam_marienplatz.jpg,http://www.muenchen.de,width=150)>>
+        <<ImageLink(münchen.png,http://www.muenchen.de,width=50)>>
+        <<ImageLink(http://webcam.portalmuc.de/images/webcam/webcam_marienplatz.jpg)>>
+        <<ImageLink(example.png,alt=whateveryouwant(üöä))>>
+        <<ImageLink(http://moinmoin.wikiwikiweb.de/OliverSiemoneit?action=AttachFile&do=get&target=screenshot.png,width=647,height=517,alt=OliverSiemoneit?action=AttachFile&do=get&target=screenshot,FrontPage)>>
 
     History:
         Jeff Kunce:
@@ -57,7 +57,7 @@
                    width and height and probably other keywords must be given as keywords (e.g. height=20)
             2004-12-31 Version 1.3.1-3 code clean up
             2005-01-16 Bug fixed in the errorhandler - found and patched by Malte Helmert
-            2005-03-05 Version 1.3.3-5 Bug fixed found by cypress ("If I put [[ImageLink(moinmoin.png)]] it bombs")
+            2005-03-05 Version 1.3.3-5 Bug fixed found by cypress ("If I put <<ImageLink(moinmoin.png)>> it bombs")
             2005-03-28 Version 1.3.3-6 feature request added by CDPark:
                        "Can we use an external image? And an external target?"
             2005-04-16 Version 1.3.3-7 no default alt tag definition as requested by CDPark and AlexanderSchremmer
@@ -145,7 +145,7 @@
     pp, pp_count, kw, kw_count = explore_args(args, kwAllowed)
 
     if not pp_count or pp_count and not pp[0]:
-        msg = 'Not enough arguments to ImageLink macro! e.g. [[ImageLink(example.png, WikiName, width=200)]].'
+        msg = 'Not enough arguments to ImageLink macro! e.g. <<ImageLink(example.png, WikiName, width=200)>>.'
         return "%s%s%s" % (formatter.sysmsg(1), formatter.text(msg), formatter.sysmsg(0))
 
     image = pp[0]
--- a/MoinMoin/macro/MonthCalendar.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/macro/MonthCalendar.py	Sun Aug 12 23:42:33 2007 +0200
@@ -91,52 +91,52 @@
         * adapted to moin 1.7 new macro parameter parsing
 
     Usage:
-        [[MonthCalendar(BasePage,year,month,monthoffset,monthoffset2,height6)]]
+        <<MonthCalendar(BasePage,year,month,monthoffset,monthoffset2,height6)>>
 
         each parameter can be empty and then defaults to currentpage or currentdate or monthoffset=0
 
     Samples (paste that to one of your pages for a first try):
 
 Calendar of current month for current page:
-[[MonthCalendar]]
+<<MonthCalendar>>
 
 Calendar of last month:
-[[MonthCalendar(,,,-1)]]
+<<MonthCalendar(,,,-1)>>
 
 Calendar of next month:
-[[MonthCalendar(,,,+1)]]
+<<MonthCalendar(,,,+1)>>
 
 Calendar of Page SampleUser, this years december:
-[[MonthCalendar(SampleUser,,12)]]
+<<MonthCalendar(SampleUser,,12)>>
 
 Calendar of current Page, this years december:
-[[MonthCalendar(,,12)]]
+<<MonthCalendar(,,12)>>
 
 Calendar of December, 2001:
-[[MonthCalendar(,2001,12)]]
+<<MonthCalendar(,2001,12)>>
 
 Calendar of the month two months after December, 2001
 (maybe doesn't make much sense, but is possible)
-[[MonthCalendar(,2001,12,+2)]]
+<<MonthCalendar(,2001,12,+2)>>
 
 Calendar of year 2002 (every month padded to height of 6):
 ||||||Year 2002||
-||[[MonthCalendar(,2002,1,,,1)]]||[[MonthCalendar(,2002,2,,,1)]]||[[MonthCalendar(,2002,3,,,1)]]||
-||[[MonthCalendar(,2002,4,,,1)]]||[[MonthCalendar(,2002,5,,,1)]]||[[MonthCalendar(,2002,6,,,1)]]||
-||[[MonthCalendar(,2002,7,,,1)]]||[[MonthCalendar(,2002,8,,,1)]]||[[MonthCalendar(,2002,9,,,1)]]||
-||[[MonthCalendar(,2002,10,,,1)]]||[[MonthCalendar(,2002,11,,,1)]]||[[MonthCalendar(,2002,12,,,1)]]||
+||<<MonthCalendar(,2002,1,,,1)>>||<<MonthCalendar(,2002,2,,,1)>>||<<MonthCalendar(,2002,3,,,1)>>||
+||<<MonthCalendar(,2002,4,,,1)>>||<<MonthCalendar(,2002,5,,,1)>>||<<MonthCalendar(,2002,6,,,1)>>||
+||<<MonthCalendar(,2002,7,,,1)>>||<<MonthCalendar(,2002,8,,,1)>>||<<MonthCalendar(,2002,9,,,1)>>||
+||<<MonthCalendar(,2002,10,,,1)>>||<<MonthCalendar(,2002,11,,,1)>>||<<MonthCalendar(,2002,12,,,1)>>||
 
 Current calendar of me, also showing entries of A and B:
-[[MonthCalendar(MyPage*TestUserA*TestUserB)]]
+<<MonthCalendar(MyPage*TestUserA*TestUserB)>>
 
 SubPage calendars:
-[[MonthCalendar(MyName/CalPrivate)]]
-[[MonthCalendar(MyName/CalBusiness)]]
-[[MonthCalendar(MyName/CalBusiness*MyName/CalPrivate)]]
+<<MonthCalendar(MyName/CalPrivate)>>
+<<MonthCalendar(MyName/CalBusiness)>>
+<<MonthCalendar(MyName/CalBusiness*MyName/CalPrivate)>>
 
 
 Anniversary Calendars: (no year data)
-[[MonthCalendar(Yearly,,,+1,,6,1)]]
+<<MonthCalendar(Yearly,,,+1,,6,1)>>
 
 This creates calendars of the format Yearly/MM-DD
 By leaving out the year, you can set birthdays, and anniversaries in this
@@ -144,7 +144,7 @@
 
 This creates a calendar which uses MonthCalendarTemplate for directly editing
 nonexisting day pages:
-[[MonthCalendar(,,,,,,MonthCalendarTemplate)]]
+<<MonthCalendar(,,,,,,MonthCalendarTemplate)>>
 """
 
 Dependencies = ['namespace', 'time', ]
--- a/MoinMoin/macro/NewPage.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/macro/NewPage.py	Sun Aug 12 23:42:33 2007 +0200
@@ -25,16 +25,16 @@
 
     Usage:
 
-        [[NewPage(template, buttonLabel, parentPage)]]
+        <<NewPage(template, buttonLabel, parentPage)>>
 
     Examples:
 
-        [[NewPage]]
+        <<NewPage>>
 
             Create an input field with 'Create New Page' button. The new
             page will not use a template.
 
-        [[NewPage(BugTemplate, Create New Bug, MoinMoinBugs)]]
+        <<NewPage(BugTemplate, Create New Bug, MoinMoinBugs)>>
 
             Create an input field with button labeled 'Create New
             Bug'.  The new page will use the BugTemplate template,
@@ -52,7 +52,7 @@
     def getArgs(self, argstr):
         """ Temporary function until Oliver Graf args parser is finished
 
-        @param argstr: string from the wiki markup [[NewPage(string)]]
+        @param argstr: string from the wiki markup <<NewPage(string)>>
         @rtype: dict
         @return: dictionary with macro options
         """
--- a/MoinMoin/macro/RandomQuote.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/macro/RandomQuote.py	Sun Aug 12 23:42:33 2007 +0200
@@ -5,8 +5,8 @@
     Selects a random quote from FortuneCookies or a given page.
 
     Usage:
-        [[RandomQuote()]]
-        [[RandomQuote(WikiTips)]]
+        <<RandomQuote()>>
+        <<RandomQuote(WikiTips)>>
 
     Comments:
         It will look for list delimiters on the page in question.
--- a/MoinMoin/macro/ShowSmileys.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/macro/ShowSmileys.py	Sun Aug 12 23:42:33 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - List all defined smileys
 
-    [[ShowSmileys]] will display a table of all the available smileys.
+    <<ShowSmileys>> will display a table of all the available smileys.
 
     Based on code by Nick Trout <trout@users.sf.net>
 
--- a/MoinMoin/macro/__init__.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/macro/__init__.py	Sun Aug 12 23:42:33 2007 +0200
@@ -45,7 +45,7 @@
 
 
 #############################################################################
-### Macros - Handlers for [[macroname]] markup
+### Macros - Handlers for <<macroname>> markup
 #############################################################################
 
 class Macro:
@@ -101,7 +101,7 @@
 
     def format_error(self, err):
         """ format an error object for output instead of normal macro output """
-        return self.formatter.text(u'[[%s: %s]]' % (self.name, err.args[0]))
+        return self.formatter.text(u'<<%s: %s>>' % (self.name, err.args[0]))
 
     def execute(self, macro_name, args):
         """ Get and execute a macro
--- a/MoinMoin/macro/_tests/test_ImageLink.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/macro/_tests/test_ImageLink.py	Sun Aug 12 23:42:33 2007 +0200
@@ -58,11 +58,11 @@
         """ macro ImageLink test: 'no args for ImageLink (ImageLink is executed on FrontPage) """
         #self._createTestPage('This is an example to test a macro')
         result = self._test_macro('ImageLink', '')
-        expected = '<div class="message">Not enough arguments to ImageLink macro! e.g. [[ImageLink(example.png, WikiName, width=200)]].</div>'
+        expected = '<div class="message">Not enough arguments to ImageLink macro! e.g. <<ImageLink(example.png, WikiName, width=200)>>.</div>'
         assert result == expected
 
     def testImageLinkTwoParamsNoKeyword(self):
-        """ macro ImageLink test: [[ImageLink(http://static.wikiwikiweb.de/logos/moindude.png, FrontPage)]] """
+        """ macro ImageLink test: <<ImageLink(http://static.wikiwikiweb.de/logos/moindude.png, FrontPage)>> """
         self.shouldDeleteTestPage = False
 
         result = self._test_macro('ImageLink', 'http://static.wikiwikiweb.de/logos/moindude.png, FrontPage')
@@ -70,7 +70,7 @@
         assert result == expected
 
     def testImageLinkTwoParamsOneKeyword(self):
-        """ macro ImageLink test: [[ImageLink(http://static.wikiwikiweb.de/logos/moindude.png, alt=The old dude, FrontPage)]]
+        """ macro ImageLink test: <<ImageLink(http://static.wikiwikiweb.de/logos/moindude.png, alt=The old dude, FrontPage)>>
         order of keywords to parameter list is independent
         """
         self.shouldDeleteTestPage = True
--- a/MoinMoin/mail/mailimport.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/mail/mailimport.py	Sun Aug 12 23:42:33 2007 +0200
@@ -264,7 +264,7 @@
 
     #if not (generate_summary and "/" in pagename):
     #generate header in any case:
-    new_content += u"'''Mail: %s (%s, [[DateTime(%s)]])'''\n\n" % (msg['subject'], email_to_markup(request, msg['from_addr']), msg['date'])
+    new_content += u"'''Mail: %s (%s, <<DateTime(%s)>>)'''\n\n" % (msg['subject'], email_to_markup(request, msg['from_addr']), msg['date'])
 
     new_content += d['content']
     new_content += "\n" + u"\n * ".join(attachment_links)
@@ -288,12 +288,12 @@
             elif table_ends is not None and not line.startswith("||"):
                 break
 
-        # in order to let the gettext system recognise the [[GetText]] calls used below,
+        # in order to let the gettext system recognise the <<GetText>> calls used below,
         # we must repeat them here:
         [_("Date"), _("From"), _("To"), _("Content"), _("Attachments")]
 
         table_header = (u"\n\n## mail_overview (don't delete this line)\n" +
-                        u"|| '''[[GetText(Date)]] ''' || '''[[GetText(From)]] ''' || '''[[GetText(To)]] ''' || '''[[GetText(Content)]] ''' || '''[[GetText(Attachments)]] ''' ||\n"
+                        u"|| '''<<GetText(Date)>> ''' || '''<<GetText(From)>> ''' || '''<<GetText(To)>> ''' || '''<<GetText(Content)>> ''' || '''<<GetText(Attachments)>> ''' ||\n"
                        )
 
         from_col = email_to_markup(request, msg['from_addr'])
@@ -302,7 +302,7 @@
         subj_col = '[%s %s]' % (wikiutil.quoteName(pagename), msg['subject'])
         date_col = msg['date']
         attach_col = " ".join(attachment_links)
-        new_line = u'|| [[DateTime(%s)]] || %s || %s || %s || %s ||' % (date_col, from_col, to_col, subj_col, attach_col)
+        new_line = u'|| <<DateTime(%s)>> || %s || %s || %s || %s ||' % (date_col, from_col, to_col, subj_col, attach_col)
         if found_table is not None:
             content = "\n".join(old_content[:table_ends] + [new_line] + old_content[table_ends:])
         else:
--- a/MoinMoin/parser/_tests/test_text_moin_wiki.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/parser/_tests/test_text_moin_wiki.py	Sun Aug 12 23:42:33 2007 +0200
@@ -72,7 +72,7 @@
             '=== heading 3 ===\n',
             '==== heading 4 ====\n',
             '===== heading 5 =====\n',
-            # '[[en]]\n', XXX crashes
+            # '<<en>>\n', XXX crashes
             )
         for item in markup:
             text = item + 'Paragraph'
@@ -130,12 +130,12 @@
         around heading text does not matter.
         """
         standard = """
-[[TableOfContents]]
+<<TableOfContents>>
 = heading =
 Text
 """
         withWhitespace = """
-[[TableOfContents]]
+<<TableOfContents>>
 =   heading   =
 Text
 """
@@ -166,11 +166,11 @@
     needle = re.compile(text % r'(.+)')
     _tests = (
         # test                                   expected
-        (u'[[DateTime(259200)]]',                '1970-01-04 00:00:00'),
-        (u'[[DateTime(2003-03-03T03:03:03)]]',   '2003-03-03 03:03:03'),
-        (u'[[DateTime(2000-01-01T00:00:00Z)]]',  '2000-01-01 00:00:00'), # works for Europe/Vilnius
-        (u'[[Date(2002-02-02T01:02:03Z)]]',      '2002-02-02'),
-        (u'[[DateTime(1970-01-06T00:00:00)]]',   '1970-01-06 00:00:00'), # fails e.g. for Europe/Vilnius
+        (u'<<DateTime(259200)>>',                '1970-01-04 00:00:00'),
+        (u'<<DateTime(2003-03-03T03:03:03)>>',   '2003-03-03 03:03:03'),
+        (u'<<DateTime(2000-01-01T00:00:00Z)>>',  '2000-01-01 00:00:00'), # works for Europe/Vilnius
+        (u'<<Date(2002-02-02T01:02:03Z)>>',      '2002-02-02'),
+        (u'<<DateTime(1970-01-06T00:00:00)>>',   '1970-01-06 00:00:00'), # fails e.g. for Europe/Vilnius
         )
 
     def class_setup(self):
@@ -292,7 +292,7 @@
 
     def testEscapeInGetTextMacro(self):
         """ parser.wiki: escape html markup in GetText macro """
-        test = "text [[GetText(<escape-me>)]] text"
+        test = "text <<GetText(<escape-me>)>> text"
         self._test(test)
 
     def testEscapeInGetTextFormatted(self):
--- a/MoinMoin/parser/text_moin_wiki.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/parser/text_moin_wiki.py	Sun Aug 12 23:42:33 2007 +0200
@@ -627,12 +627,12 @@
 
             elif m.group('page_name'): # TODO
                 page_name = m.group('page_name')
-                return u"Error: [[Include(%s,%s)]] emulation missing..." % (page_name, args)
+                return u"Error: <<Include(%s,%s)>> emulation missing..." % (page_name, args)
 
             elif m.group('inter_wiki'): # TODO
                 wiki_name = m.group('inter_wiki')
                 page_name = m.group('inter_page')
-                return u"Error: [[RemoteInclude(%s:%s,%s)]] still missing." % (wiki_name, page_name, args)
+                return u"Error: <<RemoteInclude(%s:%s,%s)>> still missing." % (wiki_name, page_name, args)
 
             else:
                 if not desc:
@@ -1076,7 +1076,7 @@
         return ''
 
     def _macro_repl(self, word, groups):
-        """Handle macros ([[macroname]])."""
+        """Handle macros (<<macroname>>)."""
         macro_name = groups.get('macro_name')
         macro_args = groups.get('macro_args')
         self.inhibit_p = 0 # 1 fixes UserPreferences, 0 fixes paragraph formatting for macros
@@ -1197,7 +1197,7 @@
 
         # Main loop
         for line in self.lines:
-            if ']][[' in line.replace(' ', ''):
+            if '>><<' in line.replace(' ', ''):
                 self.no_862 = True
 
             self.line_anchor_printed = 0
--- a/MoinMoin/theme/__init__.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/theme/__init__.py	Sun Aug 12 23:42:33 2007 +0200
@@ -478,7 +478,7 @@
     def get_icon(self, icon):
         """ Return icon data from self.icons
 
-        If called from [[Icon(file)]] we have a filename, not a
+        If called from <<Icon(file)>> we have a filename, not a
         key. Using filenames is deprecated, but for now, we simulate old
         behavior.
 
--- a/MoinMoin/userprefs/notification.py	Sun Aug 12 20:18:28 2007 +0200
+++ b/MoinMoin/userprefs/notification.py	Sun Aug 12 23:42:33 2007 +0200
@@ -156,7 +156,7 @@
         notifylist = self.request.user.getSubscriptionList()
 
         self.make_row(
-            html.Raw(_('Subscribed wiki pages[[BR]](one regex per line)')),
+            html.Raw(_('Subscribed wiki pages<<BR>>(one regex per line)')),
             [html.TEXTAREA(name="subscribed_pages", rows="6", cols="50").append(
                 '\n'.join(notifylist)), ],
             valign="top"