[Docstring-checkins] CVS: dps/dps/writers html.py,1.10,1.11

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

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

Modified Files:
	html.py 
Log Message:
Fixed tables & docinfo.
Added problematic <-> system_message cross-references.

Index: html.py
===================================================================
RCS file: /cvsroot/docstring/dps/dps/writers/html.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** html.py	8 Mar 2002 04:32:05 -0000	1.10
--- html.py	11 Mar 2002 03:35:07 -0000	1.11
***************
*** 242,249 ****
  
      def visit_docinfo_item(self, node, name):
!         self.head.append(self.starttag(node, 'meta', name=name,
!                                        content=node.astext()))
!         self.body.append('<TR><TD>\n'
!                          '<P>%s:</P>\n'
                           '</TD><TD>\n'
                           '<P>' % self.language.labels[name])
--- 242,250 ----
  
      def visit_docinfo_item(self, node, name):
!         self.head.append('<META NAME="%s" CONTENT="%s">\n'
!                          % (name, self.encode(node.astext())))
!         self.body.append(self.starttag(node, 'tr', ''))
!         self.body.append('<TD>\n'
!                          '<P CLASS="docinfo-name">%s:</P>\n'
                           '</TD><TD>\n'
                           '<P>' % self.language.labels[name])
***************
*** 523,530 ****
--- 524,537 ----
  
      def visit_problematic(self, node):
+         if node.hasattr('refid'):
+             self.body.append('<A HREF="#%s">' % node['refid'])
+             self.context.append('</A>')
+         else:
+             self.context.append('')
          self.body.append(self.starttag(node, 'span', '', CLASS='problematic'))
  
      def depart_problematic(self, node):
          self.body.append('</SPAN>')
+         self.body.append(self.context.pop())
  
      def visit_raw(self, node):
***************
*** 598,607 ****
  
      def visit_system_message(self, node):
!         if node['level'] < self.doctree.reporter.getcategory('output')[1]:
!             # @@@ need another threshold? gotta fix that
              raise nodes.SkipNode
          self.body.append(self.starttag(node, 'div', CLASS='system-message'))
!         self.body.append('<H3>%s (level %s system message)</H3>\n'
!                          % (node['type'], node['level']))
  
      def depart_system_message(self, node):
--- 605,619 ----
  
      def visit_system_message(self, node):
!         if node['level'] < self.doctree.reporter['output'].warninglevel:
!             # @@@ need another threshold for writer? gotta fix that
              raise nodes.SkipNode
          self.body.append(self.starttag(node, 'div', CLASS='system-message'))
!         if node.hasattr('refid'):
!             self.body.append('<H3><A HREF="#%s">%s (level %s system message)'
!                              '</A></H3>\n' % (node['refid'], node['type'],
!                                               node['level']))
!         else:
!             self.body.append('<H3>%s (level %s system message)</H3>\n'
!                              % (node['type'], node['level']))
  
      def depart_system_message(self, node):
***************
*** 609,613 ****
  
      def visit_table(self, node):
!         self.body.append(self.starttag(node, 'table', frame='box', rules='all'))
  
      def depart_table(self, node):
--- 621,626 ----
  
      def visit_table(self, node):
!         self.body.append(
!               self.starttag(node, 'table', frame='border', rules='all'))
  
      def depart_table(self, node):