[Python-checkins] python/dist/src/Doc/perl l2hinit.perl,1.58.6.1,1.58.6.2

[fdrake@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Doc/perl
In directory sc8-pr-cvs1:/tmp/cvs-serv30192

Modified Files:
      Tag: release22-maint
	l2hinit.perl 
Log Message:
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.


Index: l2hinit.perl
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/perl/l2hinit.perl,v
retrieving revision 1.58.6.1
retrieving revision 1.58.6.2
diff -C2 -d -r1.58.6.1 -r1.58.6.2
*** l2hinit.perl	22 Mar 2002 17:23:03 -0000	1.58.6.1
--- l2hinit.perl	27 Jun 2003 18:27:21 -0000	1.58.6.2
***************
*** 386,389 ****
--- 386,390 ----
  # 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($_) = @_;
***************
*** 392,395 ****
--- 393,397 ----
      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
***************
*** 620,625 ****
              "<link rel=\"first\" href=\"$FILE.html\">\n",
              ($HAVE_TABLE_OF_CONTENTS
!              ? ('<link rel="contents" href="contents.html" title="Contents">'
!                 . "\n")
               : ''),
              ($HAVE_GENERAL_INDEX
--- 622,627 ----
              "<link rel=\"first\" href=\"$FILE.html\">\n",
              ($HAVE_TABLE_OF_CONTENTS
!              ? ("<link rel='contents' href='$MY_CONTENTS_PAGE'"
!                 . " title='Contents'>\n")
               : ''),
              ($HAVE_GENERAL_INDEX