[Python-checkins] r66355 - in doctools/branches/0.4.x: CHANGES sphinx/htmlwriter.py

Wed Sep 10 00:06:52 CEST 2008

Author: georg.brandl
Date: Wed Sep 10 00:06:51 2008
New Revision: 66355
Log:
#3746: fix duplicate id generation with docutils 0.5.
Modified:
 doctools/branches/0.4.x/CHANGES
 doctools/branches/0.4.x/sphinx/htmlwriter.py
Modified: doctools/branches/0.4.x/CHANGES
==============================================================================

--- doctools/branches/0.4.x/CHANGES	(original)
+++ doctools/branches/0.4.x/CHANGES	Wed Sep 10 00:06:51 2008
@@ -1,6 +1,9 @@
 Release 0.4.3 (in development)
 ==============================
 
+* Fix a bug in the HTML writer that created duplicate ``id``
+ attributes for section titles with docutils 0.5.
+
 * Properly call ``super()`` in overridden blocks in templates.
 
 * Add a fix when using XeTeX.
Modified: doctools/branches/0.4.x/sphinx/htmlwriter.py
==============================================================================
--- doctools/branches/0.4.x/sphinx/htmlwriter.py	(original)
+++ doctools/branches/0.4.x/sphinx/htmlwriter.py	Wed Sep 10 00:06:51 2008
@@ -168,20 +168,16 @@
 def depart_seealso(self, node):
 self.depart_admonition(node)
 
- # overwritten (args/kwds due to docutils 0.4/0.5 incompatibility)
- def visit_title(self, node, *args, **kwds):
- # if we have a section we do our own processing in order
- # to have ids in the hN-tags and not in additional a-tags
- if isinstance(node.parent, nodes.section):
- h_level = self.section_level + self.initial_header_level - 1
- if node.parent.get('ids'):
- attrs = {'ids': node.parent['ids']}
- else:
- attrs = {}
- self.body.append(self.starttag(node, 'h%d' % h_level, '', **attrs))
- self.context.append('</h%d>\n' % h_level)
- else:
- BaseTranslator.visit_title(self, node, *args, **kwds)
+ # overwritten for docutils 0.4
+ if hasattr(BaseTranslator, 'start_tag_with_title'):
+ def visit_section(self, node):
+ # the 0.5 version, to get the id attribute in the <div> tag
+ self.section_level += 1
+ self.body.append(self.starttag(node, 'div', CLASS='section'))
+
+ def visit_title(self, node):
+ # don't move the id attribute inside the <h> tag
+ BaseTranslator.visit_title(self, node, move_ids=0)
 
 # overwritten
 def visit_literal_block(self, node):
