--- MoinMoin/formatter/base.py.orig	2005-11-18 14:16:35.000000000 -0500
+++ MoinMoin/formatter/base.py	2006-01-12 14:32:21.000000000 -0500
@@ -135,23 +135,18 @@
     def line_anchordef(self, lineno):
         return ""
 
-    def anchorlink(self, on, name='', id=None):
+    def anchorlink(self, on, name='', **kw):
         return ""
 
     def line_anchorlink(self, on, lineno=0):
         return ""
 
-    def image(self, **kw):
+    def image(self, src=None, **kw):
         """ Take HTML <IMG> tag attributes in `attr`.
 
         Attribute names have to be lowercase!
         """
-        attrstr = u''
-        for attr, value in kw.items():
-            if attr=='html_class':
-                attr='class'
-            attrstr = attrstr + u' %s="%s"' % (attr, wikiutil.escape(value))
-        return u'<img%s>' % attrstr
+        return '[Image:%s]' % attrstr
 
     def smiley(self, text):
         return text
@@ -161,7 +156,7 @@
 
     # Text and Text Attributes ########################################### 
     
-    def text(self, text):
+    def text(self, text, **kw):
         if not self._highlight_re:
             return self._text(text)
             
@@ -185,37 +180,37 @@
     def _text(self, text):
         raise NotImplementedError
 
-    def strong(self, on):
+    def strong(self, on, **kw):
         raise NotImplementedError
 
-    def emphasis(self, on):
+    def emphasis(self, on, **kw):
         raise NotImplementedError
 
-    def underline(self, on):
+    def underline(self, on, **kw):
         raise NotImplementedError
 
-    def highlight(self, on):
+    def highlight(self, on, **kw):
         raise NotImplementedError
 
-    def sup(self, on):
+    def sup(self, on, **kw):
         raise NotImplementedError
 
-    def sub(self, on):
+    def sub(self, on, **kw):
         raise NotImplementedError
 
-    def strike(self, on):
+    def strike(self, on, **kw):
         raise NotImplementedError
 
     def code(self, on, **kw):
         raise NotImplementedError
 
-    def preformatted(self, on):
+    def preformatted(self, on, **kw):
         self.in_pre = on != 0
 
-    def small(self, on):
+    def small(self, on, **kw):
         raise NotImplementedError
 
-    def big(self, on):
+    def big(self, on, **kw):
         raise NotImplementedError
 
     # special markup for syntax highlighting #############################
@@ -234,10 +229,10 @@
     def linebreak(self, preformatted=1):
         raise NotImplementedError
 
-    def paragraph(self, on):
+    def paragraph(self, on, **kw):
         self.in_p = (on != 0)
 
-    def rule(self, size=0):
+    def rule(self, size=0, **kw):
         raise NotImplementedError
 
     def icon(self, type):
@@ -245,22 +240,22 @@
 
     # Lists ##############################################################
 
-    def number_list(self, on, type=None, start=None):
+    def number_list(self, on, type=None, start=None, **kw):
         raise NotImplementedError
 
-    def bullet_list(self, on):
+    def bullet_list(self, on, **kw):
         raise NotImplementedError
 
     def listitem(self, on, **kw):
         raise NotImplementedError
 
-    def definition_list(self, on):
+    def definition_list(self, on, **kw):
         raise NotImplementedError
 
-    def definition_term(self, on, compact=0):
+    def definition_term(self, on, compact=0, **kw):
         raise NotImplementedError
 
-    def definition_desc(self, on):
+    def definition_desc(self, on, **kw):
         raise NotImplementedError
 
     def heading(self, on, depth, **kw):
@@ -268,13 +263,13 @@
 
     # Tables #############################################################
     
-    def table(self, on, attrs={}):
+    def table(self, on, attrs={}, **kw):
         raise NotImplementedError
 
-    def table_row(self, on, attrs={}):
+    def table_row(self, on, attrs={}, **kw):
         raise NotImplementedError
 
-    def table_cell(self, on, attrs={}):
+    def table_cell(self, on, attrs={}, **kw):
         raise NotImplementedError
 
     # Dynamic stuff / Plugins ############################################
@@ -342,7 +337,7 @@
 
         return self.text(f.getvalue())
 
-    def escapedText(self, on):
+    def escapedText(self, on, **kw):
         """ This allows emitting text as-is, anything special will
             be escaped (at least in HTML, some text output format
             would possibly do nothing here)