MoinMoin: attachment:text_gedit.py.diff of MoinMoinPatch/FormatterApiConsistencyForHtmlAttributes

   1 --- MoinMoin/formatter/text_gedit.py.orig	2005-12-04 07:37:54.000000000 -0500
   2 +++ MoinMoin/formatter/text_gedit.py	2006-01-12 14:34:46.000000000 -0500
   3 @@ -140,13 +140,13 @@
   4  
   5      # Change nesting: sub lists are no longer within the <li> tags
   6      
   7 -    def number_list(self, on, type=None, start=None):
   8 +    def number_list(self, on, type=None, start=None, **kw):
   9          li = ""
  10          if self._in_li: # close <li>
  11              li = self.listitem(False)
  12          return li + text_html.Formatter.number_list(self, on, type, start)
  13  
  14 -    def bullet_list(self, on):
  15 +    def bullet_list(self, on, **kw):
  16          li = ""
  17          if self._in_li: # close <li>
  18              li = self.listitem(False)
  19 @@ -197,7 +197,7 @@
  20          attrs = text_html.Formatter._checkTableAttr(self, attrs, prefix)
  21          return self._style_to_attributes(attrs)
  22  
  23 -    def table(self, on, attrs=None):
  24 +    def table(self, on, attrs=None, **kw):
  25          """ Create table
  26  
  27          @param on: start table
  28 @@ -221,29 +221,31 @@
  29  
  30          return ''.join(result)    
  31  
  32 -    def comment(self, text):
  33 +    def comment(self, text, **kw):
  34          text = text.rstrip() # workaround for growing amount of blanks at EOL
  35          return self.preformatted(1, attr={'class': 'comment'}) + text + self.preformatted(0)
  36  
  37 -    def underline(self, on):
  38 +    def underline(self, on, **kw):
  39          tag = 'u'
  40          if on:
  41              return self.open(tag)
  42          return self.close(tag)
  43                      
  44 -    def strong(self, on):
  45 +    def strong(self, on, **kw):
  46          tag = 'b'
  47          if on:
  48              return self.open(tag)
  49          return self.close(tag)
  50  
  51 -    def emphasis(self, on):
  52 +    def emphasis(self, on, **kw):
  53          tag = 'i'
  54          if on:
  55              return self.open(tag)
  56          return self.close(tag)
  57  
  58 -    def code(self, on, css=None):
  59 +    def code(self, on, css=None, **kw):
  60 +        if not css and kw.has_key('css_class'):
  61 +            css=kw['css_class']
  62          tag = 'tt'
  63          # Maybe we don't need this, because we have tt will be in inlineStack.
  64          self._in_code = on