From: Fred Drake Date: Thu, 19 Aug 2004 01:37:48 +0000 (+0000) Subject: fix SF bug #1008690: Incorrect href in Tutorial X-Git-Tag: v2.4a3~199 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c6f3c8b612c8265fcf9c1dc9d8c8ca4c6316a37a;p=python fix SF bug #1008690: Incorrect href in Tutorial The make_head_and_body() function used a hardcoded value for the 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. --- diff --git a/Doc/perl/l2hinit.perl b/Doc/perl/l2hinit.perl index e955e7cff6..8c670a7777 100644 --- a/Doc/perl/l2hinit.perl +++ b/Doc/perl/l2hinit.perl @@ -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 "
\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" + ? ("\n") : ''), # disable for now -- Mozilla doesn't do well with multiple indexes # ($HAVE_MODULE_INDEX - # ? '\n" + # ? ("\n") # : ''), ($INFO # XXX We can do this with the Python tools since the About...