changeset 5423:7d0598a55c09

merged main
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Mon, 11 Jan 2010 08:59:27 +0100
parents ddfd18e00523 (current diff) eaef92e05011 (diff)
children f619c99ab12f bd55be7c3886
files
diffstat 4 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/parser/text_creole.py	Mon Jan 11 08:58:33 2010 +0100
+++ b/MoinMoin/parser/text_creole.py	Mon Jan 11 08:59:27 2010 +0100
@@ -37,6 +37,7 @@
     MoinMoin current API.
     """
 
+    extensions = ['.creole']
     # Enable caching
     caching = 1
     Dependencies = Dependencies
--- a/MoinMoin/parser/text_moin_wiki.py	Mon Jan 11 08:58:33 2010 +0100
+++ b/MoinMoin/parser/text_moin_wiki.py	Mon Jan 11 08:59:27 2010 +0100
@@ -32,6 +32,7 @@
         Methods named like _*_repl() are responsible to handle the named regex patterns.
     """
 
+    extensions = ['.moin']
     # allow caching
     caching = 1
     Dependencies = Dependencies
--- a/MoinMoin/wikiutil.py	Mon Jan 11 08:58:33 2010 +0100
+++ b/MoinMoin/wikiutil.py	Mon Jan 11 08:59:27 2010 +0100
@@ -867,6 +867,8 @@
  '.flv': 'video/x-flv',
  '.wmv': 'video/x-ms-wmv',
  '.swf': 'application/x-shockwave-flash',
+ '.moin': 'text/moin-wiki',
+ '.creole': 'text/creole',
 }
 
 # add all mimetype patterns of pygments
--- a/docs/CHANGES	Mon Jan 11 08:58:33 2010 +0100
+++ b/docs/CHANGES	Mon Jan 11 08:59:27 2010 +0100
@@ -48,8 +48,8 @@
   * highlight parser: added missing support for console/bash session
   * Fixed precedence of parsers: more special parsers now have precedence
     before moin falls back to using the HighlightParser (syntax highlighting).
-  * Added extensions to the rst parser (example.rst attachments are rendered
-    now when viewed).
+  * Added extensions to the rst, moin and creole parser (example.rst, example.moin and
+    example.creole attachments are rendered now when viewed).
   * Fixed MoinMoinBugs/TableOfContentsBrokenForIncludedPages.
   * Exception raised on calling add_msg() after send_title(), which leads to 
     Internal Server Error on calling several actions (diff, preview) for