From a78b9ec92721987b55b2c694503e17fe7fae0606 Mon Sep 17 00:00:00 2001
From: Jonathan Waltman <jonathan.waltman@gmail.com>
Date: Wed, 29 Jun 2011 17:33:27 -0500
Subject: [PATCH] Prevent indexing commands from causing a paragraph break in
 Texinfo.

---
 sphinx/writers/texinfo.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sphinx/writers/texinfo.py b/sphinx/writers/texinfo.py
index 6eb3cd3bf..c110117d1 100644
--- a/sphinx/writers/texinfo.py
+++ b/sphinx/writers/texinfo.py
@@ -1193,10 +1193,15 @@ class TexinfoTranslator(nodes.NodeVisitor):
         self.body.append('}')
 
     def visit_index(self, node):
+        # terminate the line but don't prevent paragraph breaks
+        if isinstance(node.parent, nodes.paragraph):
+            self.ensure_eol()
+        else:
+            self.body.append('\n')
         for entry in node['entries']:
             typ, text, tid, text2 = entry
             text = self.escape_menu(text)
-            self.body.append('\n@geindex %s\n' % text)
+            self.body.append('@geindex %s\n' % text)
 
     def visit_refcount(self, node):
         self.body.append('\n')