Georg Brandl avatar Georg Brandl committed cfee81f

Closes #1028: Fix line block output in the text builder.

Comments (0)

Files changed (2)

 
 * #1015: Stop overriding jQuery contains() in the JavaScript.
 
+* #1028: Fix line block output in the text builder.
+
 
 Release 1.1.3 (Mar 10, 2012)
 ============================

sphinx/writers/text.py

         self.stateindent = [0]
         self.list_counter = []
         self.sectionlevel = 0
+        self.lineblocklevel = 0
         self.table = None
 
     def add_text(self, text):
         self.end_state(wrap=False)
 
     def visit_line_block(self, node):
-        self.new_state(0)
+        self.new_state()
+        self.lineblocklevel += 1
     def depart_line_block(self, node):
-        self.end_state(wrap=False)
+        self.lineblocklevel -= 1
+        self.end_state(wrap=False, end=None)
+        if not self.lineblocklevel:
+            self.add_text('\n')
 
     def visit_line(self, node):
         pass
     def depart_line(self, node):
-        pass
+        self.add_text('\n')
 
     def visit_block_quote(self, node):
         self.new_state()
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.