Rev 5715: Further tests with sphinx >= 1.0 reveals that a new kind of node have been introduced for toctrees :-/ in file:///home/vila/src/bzr/bugs/219334-texinfo2/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/219334-texinfo2/

------------------------------------------------------------
revno: 5715
revision-id: v.ladeuil+lp at free.fr-20110311122410-ury8y8n19zr1m4ru
parent: v.ladeuil+lp at free.fr-20110311113333-o55cclvfzdkrzlov
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 219334-texinfo2
timestamp: Fri 2011-03-11 13:24:10 +0100
message:
  Further tests with sphinx >= 1.0 reveals that a new kind of node have been introduced for toctrees :-/
-------------- next part --------------
=== modified file 'bzrlib/doc_generate/writers/texinfo.py'
--- a/bzrlib/doc_generate/writers/texinfo.py	2011-03-11 11:33:33 +0000
+++ b/bzrlib/doc_generate/writers/texinfo.py	2011-03-11 12:24:10 +0000
@@ -123,6 +123,17 @@
     def depart_topic(self, node):
         pass
 
+    def visit_compound(self, node):
+        # compound is new in sphinx >= 1.0 and just add a optional layer so we
+        # relay the text to the parent when it occurs. This may requires a
+        # cleaner approach once we settle on which sphinx versions we want to
+        # support.
+        set_item_list_collector(node, 'text')
+
+    def depart_compound(self, node):
+        text = ''.join(node['text'])
+        node.parent.collect_text(text)
+
     def visit_paragraph(self, node):
         set_item_list_collector(node, 'text')