[Docstring-checkins] CVS: dps/dps/writers html.py,1.1,1.2
Status: Pre-Alpha
Brought to you by:
goodger
From: David G. <go...@us...> - 2002-02-21 03:41:34
|
Update of /cvsroot/docstring/dps/dps/writers In directory usw-pr-cvs1:/tmp/cvs-serv28682/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.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** html.py 20 Feb 2002 04:49:32 -0000 1.1 --- html.py 21 Feb 2002 03:41:31 -0000 1.2 *************** *** 2,6 **** """ ! :Authors: David Goodger :Contact: go...@us... :Revision: $Revision$ --- 2,6 ---- """ ! :Author: David Goodger :Contact: go...@us... :Revision: $Revision$ *************** *** 8,12 **** :Copyright: This module has been placed in the public domain. ! Hypertext Markup Language document tree Writer. """ --- 8,16 ---- :Copyright: This module has been placed in the public domain. ! Simple HyperText Markup Language document tree Writer. ! ! The output uses the HTML 4.01 strict.dtd and contains a minimum of formatting ! information. A cascading style sheet "default.css" is required for proper ! viewing with a browser. """ *************** *** 58,62 **** return text ! def starttag(self, node, tagname, **attrs): attlist = attrs.items() for att in ('id', 'class'): --- 62,66 ---- return text ! def starttag(self, node, tagname, suffix='\n', **attrs): attlist = attrs.items() for att in ('id', 'class'): *************** *** 64,70 **** attlist.append((att, node[att])) attlist.sort() ! return '<%s>' % ' '.join([tagname.upper()] + ! ['%s="%s"' % (n.upper(), self.encode(v)) ! for n, v in attlist]) def visit_Text(self, node): --- 68,75 ---- 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) def visit_Text(self, node): *************** *** 75,85 **** def visit_abstract(self, node): ! self.body.append(self.starttag(node, 'div', CLASS='abstract') ! + '\n<BLOCKQUOTE>\n') ! self.body.append('<H3>' + self.language.bibliographic_labels['abstract'] + '</H3>\n') def depart_abstract(self, node): ! self.body.append('</BLOCKQUOTE>\n</DIV>\n') def visit_attention(self, node): --- 80,90 ---- 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): *************** *** 91,95 **** def visit_author(self, node): self.head.append(self.starttag(node, 'meta', name='author', ! content=node.astext()) + '\n') def depart_author(self, node): --- 96,100 ---- def visit_author(self, node): self.head.append(self.starttag(node, 'meta', name='author', ! content=node.astext())) def depart_author(self, node): *************** *** 110,114 **** def visit_bullet_list(self, node): self.body.append(self.starttag(node, 'ul', ! CLASS='bullet'+node['bullet']) + '\n') def depart_bullet_list(self, node): --- 115,119 ---- def visit_bullet_list(self, node): self.body.append(self.starttag(node, 'ul', ! CLASS='bullet'+node['bullet'])) def depart_bullet_list(self, node): *************** *** 128,135 **** def visit_classifier(self, node): ! pass def depart_classifier(self, node): ! pass def visit_colspec(self, node): --- 133,141 ---- def visit_classifier(self, node): ! self.body.append(' <SPAN CLASS="classifier_delimiter">:</SPAN> ') ! self.body.append(self.starttag(node, 'span', '', CLASS='classifier')) def depart_classifier(self, node): ! self.body.append('</SPAN>') def visit_colspec(self, node): *************** *** 153,157 **** def visit_copyright(self, node): self.head.append(self.starttag(node, 'meta', name='copyright', ! content=node.astext()) + '\n') def depart_copyright(self, node): --- 159,163 ---- def visit_copyright(self, node): self.head.append(self.starttag(node, 'meta', name='copyright', ! content=node.astext())) def depart_copyright(self, node): *************** *** 166,170 **** def visit_date(self, node): self.head.append(self.starttag(node, 'meta', name='date', ! content=node.astext()) + '\n') def depart_date(self, node): --- 172,176 ---- def visit_date(self, node): self.head.append(self.starttag(node, 'meta', name='date', ! content=node.astext())) def depart_date(self, node): *************** *** 172,185 **** def visit_definition(self, node): ! pass def depart_definition(self, node): ! pass def visit_definition_list(self, node): ! pass def depart_definition_list(self, node): ! pass def visit_definition_list_item(self, node): --- 178,192 ---- def visit_definition(self, node): ! self.body.append('</TERM>\n') ! self.body.append(self.starttag(node, 'dd')) def depart_definition(self, node): ! self.body.append('</DD>\n') def visit_definition_list(self, node): ! self.body.append(self.starttag(node, 'dl')) def depart_definition_list(self, node): ! self.body.append('</DL>\n') def visit_definition_list_item(self, node): *************** *** 209,213 **** def visit_document(self, node): ! self.body.append(self.starttag(node, 'div', CLASS='document') + '\n') def depart_document(self, node): --- 216,220 ---- def visit_document(self, node): ! self.body.append(self.starttag(node, 'div', CLASS='document')) def depart_document(self, node): *************** *** 293,297 **** def visit_image(self, node): ! pass def depart_image(self, node): --- 300,309 ---- def visit_image(self, node): ! attrs = node.attributes.copy() ! attrs['src'] = attrs['uri'] ! del attrs['uri'] ! if not attrs.has_key('alt'): ! attrs['alt'] = attrs['src'] ! self.body.append(self.starttag(node, 'img', '', **attrs)) def depart_image(self, node): *************** *** 323,327 **** def visit_list_item(self, node): ! self.body.append(self.starttag(node, 'li') + '\n') def depart_list_item(self, node): --- 335,339 ---- def visit_list_item(self, node): ! self.body.append(self.starttag(node, 'li')) def depart_list_item(self, node): *************** *** 347,351 **** def visit_meta(self, node): ! self.head.append(self.starttag(node, 'meta', **node.attributes) + '\n') def depart_meta(self, node): --- 359,363 ---- def visit_meta(self, node): ! self.head.append(self.starttag(node, 'meta', **node.attributes)) def depart_meta(self, node): *************** *** 389,393 **** def visit_paragraph(self, node): ! self.body.append(self.starttag(node, 'p')) def depart_paragraph(self, node): --- 401,405 ---- def visit_paragraph(self, node): ! self.body.append(self.starttag(node, 'p', '')) def depart_paragraph(self, node): *************** *** 395,399 **** def visit_problematic(self, node): ! self.body.append('<SPAN class="problematic">') def depart_problematic(self, node): --- 407,411 ---- def visit_problematic(self, node): ! self.body.append(self.starttag(node, 'span', '', CLASS='problematic')) def depart_problematic(self, node): *************** *** 420,424 **** def visit_section(self, node): self.sectionlevel += 1 ! self.body.append(self.starttag(node, 'div', CLASS='section') + '\n') def depart_section(self, node): --- 432,436 ---- def visit_section(self, node): self.sectionlevel += 1 ! self.body.append(self.starttag(node, 'div', CLASS='section')) def depart_section(self, node): *************** *** 445,449 **** def visit_substitution_definition(self, node): ! pass def depart_substitution_definition(self, node): --- 457,461 ---- def visit_substitution_definition(self, node): ! raise nodes.SkipChildren def depart_substitution_definition(self, node): *************** *** 457,461 **** def visit_subtitle(self, node): ! self.body.append(self.starttag(node, 'H2', CLASS='subtitle')) def depart_subtitle(self, node): --- 469,473 ---- def visit_subtitle(self, node): ! self.body.append(self.starttag(node, 'H2', '', CLASS='subtitle')) def depart_subtitle(self, node): *************** *** 487,493 **** def visit_term(self, node): ! pass def depart_term(self, node): pass --- 499,506 ---- def visit_term(self, node): ! self.body.append(self.starttag(node, 'dt', '')) def depart_term(self, node): + # leave the end tag to visit_definition, in case there's a classifier pass *************** *** 513,519 **** if self.sectionlevel == 0: self.head.append('<TITLE>%s</TITLE>\n' % self.encode(node.astext())) ! self.body.append(self.starttag(node, 'H1', CLASS='title')) else: ! self.body.append(self.starttag(node, 'H%s' % self.sectionlevel)) # @@@ >H6? --- 526,532 ---- if self.sectionlevel == 0: self.head.append('<TITLE>%s</TITLE>\n' % self.encode(node.astext())) ! self.body.append(self.starttag(node, 'H1', '', CLASS='title')) else: ! self.body.append(self.starttag(node, 'H%s' % self.sectionlevel, '')) # @@@ >H6? |