From: Fred Drake <fdrake@acm.org>
Date: Fri, 27 Jun 2003 18:26:01 +0000 (+0000)
Subject: Don't assume the name of the table of contents will be contents.html;
X-Git-Tag: v2.3c1~307
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=095f8173300cad988eea0a6ea16f4673b2cc8e95;p=python

Don't assume the name of the table of contents will be contents.html;
that won't be right when mkhowto is called with --numeric (as it is
for the Python Tutorial).  Save the actual name we use when we build
the table of contents, then use that in the page head metadata.  The
node2label.pl script will munge this properly when --numeric isn't
given, so this works in both cases.
Closes SF bug #761830.
---

diff --git a/Doc/perl/l2hinit.perl b/Doc/perl/l2hinit.perl
index 0ecb693d80..2164ace27d 100644
--- a/Doc/perl/l2hinit.perl
+++ b/Doc/perl/l2hinit.perl
@@ -401,12 +401,14 @@ sub add_idx_hook {
 
 # In addition to the standard stuff, add label to allow named node files and
 # support suppression of the page complete (for HTML Help use).
+$MY_CONTENTS_PAGE = '';
 sub do_cmd_tableofcontents {
     local($_) = @_;
     $TITLE = $toc_title;
     $tocfile = $CURRENT_FILE;
     my($closures, $reopens) = preserve_open_tags();
     anchor_label('contents', $CURRENT_FILE, $_);	# this is added
+    $MY_CONTENTS_PAGE = "$CURRENT_FILE";
     join('', "<BR>\n\\tableofchildlinks[off]", $closures
 	 , make_section_heading($toc_title, 'H2'), $toc_mark
 	 , $reopens, $_);
@@ -652,7 +654,8 @@ sub make_head_and_body($$) {
             ($t_title ? " title='$t_title'" : ''),
             '>',
             ($HAVE_TABLE_OF_CONTENTS
-             ? "\n<link rel='contents' href='contents.html' title='Contents'>"
+             ? ("\n<link rel='contents' href='$MY_CONTENTS_PAGE'"
+                . ' title="Contents">')
              : ''),
             ($HAVE_GENERAL_INDEX
              ? "\n<link rel='index' href='genindex.html' title='Index'>"