--- parser/wiki.py~	2004-05-06 10:25:45.000000000 +0100
+++ parser/wiki.py 	2004-05-06 10:25:37.000000000 +0100
@@ -74,6 +74,7 @@
 (?P<table>(?:\|\|)+(?:<[^>]*?>)?(?=.))
 (?P<heading>^\s*(?P<hmarker>=+)\s.*\s(?P=hmarker) $)
 (?P<interwiki>[A-Z][a-zA-Z]+\:[^\s'\"\:\<]([^\s%(punct)s]|([%(punct)s][^\s%(punct)s]))+)
+(?P<hilit_comment>(<[<rgbyom]<|>[>rgbyom]>))
 (?P<word>%(word_rule)s)
 (?P<url_bracket>\[\^?((%(url)s)\:|#|\:)[^\s\]]+(\s[^\]]+)?\])
 (?P<url>%(url_rule)s)
@@ -715,6 +716,30 @@
         return self.macro.execute(macro_name, args)
 
 
+    def _hilit_comment_repl(self, word):
+        if not self.in_comment:
+            self.in_comment = 1
+            if word == '<<<' or word == '<y<':
+                return '<div class="yellow_comment">'
+            elif word == '<r<':
+                return '<div class="red_comment">'
+            elif word == '<g<':
+                return '<div class="green_comment">'
+            elif word == '<b<':
+                return '<div class="blue_comment">'
+            elif word == '<o<':
+                return '<div class="orange_comment">'
+            elif word == '<m<':
+                return '<div class="mauve_comment">'
+
+        elif self.in_comment:
+            self.in_comment = 0
+            return '</div>'
+        else:
+            return ''
+        return ''
+
+
     def _indent_level(self):
         """Return current char-wise indent level."""
         return len(self.list_indents) and self.list_indents[-1]
--- moinmoin.css~	2004-05-06 10:27:25.000000000 +0100
+++ moinmoin.css 	2004-05-06 10:27:01.000000000 +0100
@@ -102,6 +102,27 @@
     padding:5px;
     width:100%;
 }
+div.comment { 
+    background-color: #ffff55;
+}
+div.yellow_comment { 
+    background-color: #ffff55;
+}
+div.red_comment { 
+    background-color: #ff8888;
+}
+div.green_comment { 
+    background-color: #88ff88;
+}
+div.blue_comment { 
+    background-color: #AAAAff;
+}
+div.orange_comment { 
+    background-color: #ffc540;
+}
+div.mauve_comment { 
+    background-color: #e09fe0;
+}
 strong.highlight {
     background-color: #FFBBBB;
 /* as usual, NetScape fucks up with innocent CSS