[Python-checkins] python/dist/src/Doc/perl l2hinit.perl,1.81,1.82

[fdrake at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Doc/perl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24600

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



Index: l2hinit.perl
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/perl/l2hinit.perl,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** l2hinit.perl	13 Jan 2004 23:43:58 -0000	1.81
--- l2hinit.perl	19 Aug 2004 01:37:48 -0000	1.82
***************
*** 486,489 ****
--- 486,492 ----
  }
  
+ $GENERAL_INDEX_FILE = '';
+ $MODULE_INDEX_FILE = '';
+ 
  # $idx_mark will be replaced with the real index at the end
  sub do_cmd_textohtmlindex {
***************
*** 491,494 ****
--- 494,498 ----
      $TITLE = $idx_title;
      $idxfile = $CURRENT_FILE;
+     $GENERAL_INDEX_FILE = "$CURRENT_FILE";
      if (%index_labels) { make_index_labels(); }
      if (($SHORT_INDEX) && (%index_segment)) { make_preindex(); }
***************
*** 500,505 ****
  }
  
- $MODULE_INDEX_FILE = '';
- 
  # $idx_module_mark will be replaced with the real index at the end
  sub do_cmd_textohtmlmoduleindex {
--- 504,507 ----
***************
*** 683,692 ****
               : ''),
              ($HAVE_GENERAL_INDEX
!              ? "\n<link rel='index' href='genindex.html' 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"
              #  : ''),
              ($INFO
--- 685,695 ----
               : ''),
              ($HAVE_GENERAL_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='$MODULE_INDEX_FILE'"
!             #     . " title='Module Index' />\n")
              #  : ''),
              ($INFO