Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

fix SF bug #1008690: Incorrect <link rel="index"> href in Tutorial 

The make_head_and_body() function used a hardcoded value for the
<link> element for the index; this patch causes the proper output
filename to be captured during the transformation phase so it can be
used during the page assembly phase.
This commit is contained in:
Fred Drake 2004-08-19 01:37:48 +00:00
parent cf02e31683
commit c6f3c8b612
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Doc/perl/l2hinit.perl
View File

@ -485,11 +485,15 @@ sub do_cmd_textohtmlinfopage {
$_;
}
$GENERAL_INDEX_FILE = '';
$MODULE_INDEX_FILE = '';
# $idx_mark will be replaced with the real index at the end
sub do_cmd_textohtmlindex {
local($_) = @_;
$TITLE = $idx_title;
$idxfile = $CURRENT_FILE;
$GENERAL_INDEX_FILE = "$CURRENT_FILE";
if (%index_labels) { make_index_labels(); }
if (($SHORT_INDEX) && (%index_segment)) { make_preindex(); }
else { $preindex = ''; }
@ -499,8 +503,6 @@ sub do_cmd_textohtmlindex {
return "<br />\n" . $pre . $_;
}
$MODULE_INDEX_FILE = '';
# $idx_module_mark will be replaced with the real index at the end
sub do_cmd_textohtmlmoduleindex {
local($_) = @_;
@ -682,12 +684,13 @@ sub make_head_and_body($$) {
. ' title="Contents" />')
: ''),
($HAVE_GENERAL_INDEX
? "\n<link rel='index' href='genindex.html' title='Index' />"
? ("\n<link rel='index' href='$GENERAL_INDEX_FILE'"
. " title='Index' />")
: ''),
# disable for now -- Mozilla doesn't do well with multiple indexes
# ($HAVE_MODULE_INDEX
# ? '<link rel="index" href="modindex.html" title="Module Index"'
# . " />\n"
# ? ("<link rel="index" href='$MODULE_INDEX_FILE'"
# . " title='Module Index' />\n")
# : ''),
($INFO
# XXX We can do this with the Python tools since the About...