IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Closes #852: Fix HtmlHelp index entry links again.

Browse Source
This commit is contained in:
Georg Brandl 2012-01-29 11:24:25 +01:00
parent b15eb0c086
commit af51c6c633
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -29,6 +29,8 @@ Release 1.1.3 (in development)
* #853: Restore compatibility with docutils trunk. * #853: Restore compatibility with docutils trunk.
* #852: Fix HtmlHelp index entry links again.
Release 1.1.2 (Nov 1, 2011) -- 1.1.1 is a silly version number anyway! Release 1.1.2 (Nov 1, 2011) -- 1.1.1 is a silly version number anyway!
====================================================================== ======================================================================

8
sphinx/builders/htmlhelp.py
View File

@ -259,7 +259,7 @@ class HTMLHelpBuilder(StandaloneHTMLBuilder):
def write_index(title, refs, subitems): def write_index(title, refs, subitems):
def write_param(name, value): def write_param(name, value):
item = ' <param name="%s" value="%s">\n' % \ item = ' <param name="%s" value="%s">\n' % \
(name, value[1]) (name, value)
f.write(item) f.write(item)
title = cgi.escape(title) title = cgi.escape(title)
f.write('<LI> <OBJECT type="text/sitemap">\n') f.write('<LI> <OBJECT type="text/sitemap">\n')
@ -267,12 +267,12 @@ class HTMLHelpBuilder(StandaloneHTMLBuilder):
if len(refs) == 0: if len(refs) == 0:
write_param('See Also', title) write_param('See Also', title)
elif len(refs) == 1: elif len(refs) == 1:
write_param('Local', refs[0]) write_param('Local', refs[0][1])
else: else:
for i, ref in enumerate(refs): for i, ref in enumerate(refs):
# XXX: better title? # XXX: better title?
write_param('Name', '[%d] %s' % (i, ref)) write_param('Name', '[%d] %s' % (i, ref[1]))
write_param('Local', ref) write_param('Local', ref[1])
f.write('</OBJECT>\n') f.write('</OBJECT>\n')
if subitems: if subitems:
f.write('<UL> ') f.write('<UL> ')