[Docstring-checkins] CVS: dps/dps/writers html.py,1.2,1.3

[David G. <go...@us...>]

Update of /cvsroot/docstring/dps/dps/writers
In directory usw-pr-cvs1:/tmp/cvs-serv26888/dps/dps/writers

Modified Files:
	html.py 
Log Message:
progress

Index: html.py
===================================================================
RCS file: /cvsroot/docstring/dps/dps/writers/html.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** html.py	21 Feb 2002 03:41:31 -0000	1.2
--- html.py	22 Feb 2002 01:59:22 -0000	1.3
***************
*** 62,74 ****
          return text
  
!     def starttag(self, node, tagname, suffix='\n', **attrs):
!         attlist = attrs.items()
!         for att in ('id', 'class'):
              if node.has_key(att):
!                 attlist.append((att, node[att]))
          attlist.sort()
!         return '<%s>%s' % (' '.join([tagname.upper()] +
!                                     ['%s="%s"' % (n.upper(), self.encode(v))
!                                      for n, v in attlist]),
                             suffix)
  
--- 62,82 ----
          return text
  
!     def starttag(self, node, tagname, suffix='\n', **attributes):
!         attrs = {}
!         for (name, value) in attributes.items():
!             attrs[name.lower()] = value
!         for att in ('class',):          # append to node attribute
              if node.has_key(att):
!                 if attrs.has_key(att):
!                     attrs[att] = node[att] + ' ' + attrs[att]
!         for att in ('id',):             # node attribute overrides
!             if node.has_key(att):
!                 attrs[att] = node[att]
!         attlist = attrs.items()
          attlist.sort()
!         return '<%s>%s' % (' '.join([tagname.upper()]
!                                     + ['%s="%s"' % (name.upper(),
!                                                     self.encode(value))
!                                        for name, value in attlist]),
                             suffix)
  
***************
*** 204,211 ****
      def visit_docinfo(self, node):
          # @@@ as a table?
!         pass
  
      def depart_docinfo(self, node):
!         pass
  
      def visit_doctest_block(self, node):
--- 212,219 ----
      def visit_docinfo(self, node):
          # @@@ as a table?
!         self.body.append(self.starttag(node, 'DIV', CLASS='docinfo'))
  
      def depart_docinfo(self, node):
!         self.body.append('</DIV>\n')
  
      def visit_doctest_block(self, node):
***************
*** 475,482 ****
  
      def visit_system_message(self, node):
!         pass
  
      def depart_system_message(self, node):
!         pass
  
      def visit_table(self, node):
--- 483,491 ----
  
      def visit_system_message(self, node):
!         self.body.append(self.starttag(node, 'DIV', CLASS='system_message'))
!         self.body.append('<H3>%s (%s)</H3>\n' % (node['type'], node['level']))
  
      def depart_system_message(self, node):
!         self.body.append('</DIV>\n')
  
      def visit_table(self, node):