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

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/docstring/dps/dps/writers
In directory usw-pr-cvs1:/tmp/cvs-serv8636/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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** html.py	22 Feb 2002 01:59:22 -0000	1.3
--- html.py	23 Feb 2002 16:51:31 -0000	1.4
***************
*** 42,46 ****
          nodes.NodeVisitor.__init__(self, doctree)
          self.language = languages.getlanguage(doctree.languagecode)
!         self.head = ['<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"'
                       ' "http://www.w3.org/TR/html4/strict.dtd">\n',
                       '<HTML LANG="%s">\n<HEAD>\n' % doctree.languagecode,
--- 42,46 ----
          nodes.NodeVisitor.__init__(self, doctree)
          self.language = languages.getlanguage(doctree.languagecode)
!         self.head = ['<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"\n'
                       ' "http://www.w3.org/TR/html4/strict.dtd">\n',
                       '<HTML LANG="%s">\n<HEAD>\n' % doctree.languagecode,
***************
*** 88,111 ****
  
      def visit_abstract(self, node):
!         self.body.append(self.starttag(node, 'div', CLASS='abstract'))
!         self.body.append('<H3>'
!                          + self.language.bibliographic_labels['abstract']
!                          + '</H3>\n')
  
      def depart_abstract(self, node):
          self.body.append('</DIV>\n')
  
      def visit_attention(self, node):
!         pass
  
      def depart_attention(self, node):
!         pass
  
      def visit_author(self, node):
!         self.head.append(self.starttag(node, 'meta', name='author',
!                                        content=node.astext()))
  
      def depart_author(self, node):
!         pass
  
      def visit_authors(self, node):
--- 88,114 ----
  
      def visit_abstract(self, node):
!         self.visit_admonition(node, 'abstract')
  
      def depart_abstract(self, node):
+         self.depart_admonition()
+ 
+     def visit_admonition(self, node, name):
+         self.body.append(self.starttag(node, 'div', CLASS=name))
+         self.body.append('<H3>' + self.language.labels[name] + '</H3>\n')
+ 
+     def depart_admonition(self):
          self.body.append('</DIV>\n')
  
      def visit_attention(self, node):
!         self.visit_admonition(node, 'attention')
  
      def depart_attention(self, node):
!         self.depart_admonition()
  
      def visit_author(self, node):
!         self.visit_docinfo_item(node, 'author')
  
      def depart_author(self, node):
!         self.depart_docinfo_item()
  
      def visit_authors(self, node):
***************
*** 160,174 ****
  
      def visit_contact(self, node):
!         pass
  
      def depart_contact(self, node):
!         pass
  
      def visit_copyright(self, node):
!         self.head.append(self.starttag(node, 'meta', name='copyright',
!                                        content=node.astext()))
  
      def depart_copyright(self, node):
!         pass
  
      def visit_danger(self, node):
--- 163,176 ----
  
      def visit_contact(self, node):
!         self.visit_docinfo_item(node, 'contact')
  
      def depart_contact(self, node):
!         self.depart_docinfo_item()
  
      def visit_copyright(self, node):
!         self.visit_docinfo_item(node, 'copyright')
  
      def depart_copyright(self, node):
!         self.depart_docinfo_item()
  
      def visit_danger(self, node):
***************
*** 179,187 ****
  
      def visit_date(self, node):
!         self.head.append(self.starttag(node, 'meta', name='date',
!                                        content=node.astext()))
  
      def depart_date(self, node):
!         pass
  
      def visit_definition(self, node):
--- 181,188 ----
  
      def visit_date(self, node):
!         self.visit_docinfo_item(node, 'date')
  
      def depart_date(self, node):
!         self.depart_docinfo_item()
  
      def visit_definition(self, node):
***************
*** 211,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):
--- 212,234 ----
  
      def visit_docinfo(self, node):
          self.body.append(self.starttag(node, 'DIV', CLASS='docinfo'))
+         self.body.append('<TABLE FRAME="void" RULES="none">\n'
+                          '<COL CLASS="docinfo_name">\n'
+                          '<COL CLASS="docinfo_content">\n'
+                          '<TBODY VALIGN="top">\n')
  
      def depart_docinfo(self, node):
!         self.body.append('</TABLE>\n</TBODY>\n</DIV>\n')
! 
!     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])
! 
!     def depart_docinfo_item(self):
!         self.body.append('</P></TD>\n</TR>\n')
  
      def visit_doctest_block(self, node):
***************
*** 403,410 ****
  
      def visit_organization(self, node):
!         pass
  
      def depart_organization(self, node):
!         pass
  
      def visit_paragraph(self, node):
--- 418,425 ----
  
      def visit_organization(self, node):
!         self.visit_docinfo_item(node, 'organization')
  
      def depart_organization(self, node):
!         self.depart_docinfo_item()
  
      def visit_paragraph(self, node):
***************
*** 427,434 ****
  
      def visit_revision(self, node):
!         pass
  
      def depart_revision(self, node):
!         pass
  
      def visit_row(self, node):
--- 442,449 ----
  
      def visit_revision(self, node):
!         self.visit_docinfo_item(node, 'revision')
  
      def depart_revision(self, node):
!         self.depart_docinfo_item()
  
      def visit_row(self, node):
***************
*** 453,460 ****
  
      def visit_status(self, node):
!         pass
  
      def depart_status(self, node):
!         pass
  
      def visit_strong(self, node):
--- 468,475 ----
  
      def visit_status(self, node):
!         self.visit_docinfo_item(node, 'status')
  
      def depart_status(self, node):
!         self.depart_docinfo_item()
  
      def visit_strong(self, node):
***************
*** 484,488 ****
      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):
--- 499,504 ----
      def visit_system_message(self, node):
          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):
***************
*** 553,560 ****
  
      def visit_version(self, node):
!         pass
  
      def depart_version(self, node):
!         pass
  
      def visit_vms_option(self, node):
--- 569,576 ----
  
      def visit_version(self, node):
!         self.visit_docinfo_item(node, 'version')
  
      def depart_version(self, node):
!         self.depart_docinfo_item()
  
      def visit_vms_option(self, node):

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

docstring-checkins