Closes #791: Fix QtHelp and HtmlHelp index entry links.

CHANGES

@@ -1,6 +1,8 @@
 Release 1.1.1 (in development)
 ==============================
 
+* #791: Fix QtHelp and HtmlHelp index entry links.
+
 * #792: Include "sphinx-apidoc" in the source distribution.
 
 * #797: Don't crash on a misformatted glossary.

sphinx/builders/htmlhelp.py

@@ -258,7 +258,8 @@ class HTMLHelpBuilder(StandaloneHTMLBuilder):
             f.write('<UL>\n')
             def write_index(title, refs, subitems):
                 def write_param(name, value):
-                    item = '    <param name="%s" value="%s">\n' % (name, value)
+                    item = '    <param name="%s" value="%s">\n' % \
+                        (name, value[1])
                     f.write(item)
                 title = cgi.escape(title)
                 f.write('<LI> <OBJECT type="text/sitemap">\n')

sphinx/builders/qthelp.py

@@ -256,7 +256,7 @@ class QtHelpBuilder(StandaloneHTMLBuilder):
             groupdict = matchobj.groupdict()
             shortname = groupdict['title']
             id = groupdict.get('id')
-#            descr = groupdict.get('descr')
+            #descr = groupdict.get('descr')
             if shortname.endswith('()'):
                 shortname = shortname[:-2]
             id = '%s.%s' % (id, shortname)
@@ -265,9 +265,9 @@ class QtHelpBuilder(StandaloneHTMLBuilder):
 
         if id:
             item = ' '*12 + '<keyword name="%s" id="%s" ref="%s"/>' % (
-                                                                name, id, ref)
+                name, id, ref[1])
         else:
-            item = ' '*12 + '<keyword name="%s" ref="%s"/>' % (name, ref)
+            item = ' '*12 + '<keyword name="%s" ref="%s"/>' % (name, ref[1])
         item.encode('ascii', 'xmlcharrefreplace')
         return item