[Python-checkins] CVS: python/dist/src/Doc/perl l2hinit.perl,1.55,1.56

Fred L. Drake fdrake@users.sourceforge.net
Mon, 22 Oct 2001 09:57:51 -0700


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

Modified Files:
	l2hinit.perl 
Log Message:
Add better support for Mozilla's use of <link> elements.

Index: l2hinit.perl
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/perl/l2hinit.perl,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** l2hinit.perl	2001/08/10 20:12:09	1.55
--- l2hinit.perl	2001/10/22 16:57:49	1.56
***************
*** 34,37 ****
--- 34,41 ----
  $MODULE_INDEX_COLUMNS = 4;
  
+ $HAVE_MODULE_INDEX = 0;
+ $HAVE_GENERAL_INDEX = 0;
+ $HAVE_TABLE_OF_CONTENTS = 0;
+ 
  
  # A little painful, but lets us clean up the top level directory a little,
***************
*** 477,480 ****
--- 481,487 ----
      my $id = $global{'max_id'};
  
+     if (/[\\]tableofcontents/) {
+         $HAVE_TABLE_OF_CONTENTS = 1;
+     }
      s/([\\]begin\s*$O\d+$C\s*thebibliography)/$bbl_cnt++; $1/eg;
      s/([\\]begin\s*$O\d+$C\s*thebibliography)/$id++; "\\bibliography$O$id$C$O$id$C $1"/geo;
***************
*** 491,494 ****
--- 498,506 ----
                              . get_my_icon('modules')
                              . '</a>');
+         $HAVE_MODULE_INDEX = 1;
+         $HAVE_GENERAL_INDEX = 1;
+     }
+     elsif (scalar(@parts) == 2) {
+         $HAVE_GENERAL_INDEX = 1;
      }
      else {
***************
*** 555,558 ****
--- 567,571 ----
  # doctype declaration; MSIE5 on NT4 SP4 barfs on it and drops the
  # content of the page.
+ $MY_PARTIAL_HEADER = '';
  sub make_head_and_body {
      my($title, $body) = @_;
***************
*** 580,597 ****
  	    . ($ISO_LANGUAGE ? $ISO_LANGUAGE : $isolanguage) . "\">\n";
      }
  
-     $STYLESHEET = $FILE.".css" unless $STYLESHEET;
      if (!$charset && $CHARSET) { $charset = $CHARSET; $charset =~ s/_/\-/go; }
  
      join('', ($DOCTYPE ? $DTDcomment : '' )
! 	,"<html>\n<head>\n<title>", $title, "</title>\n"
! 	, &meta_information($title)
! 	, ($CHARSET && $HTML_VERSION ge "2.1" ?
!            "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=$charset\">\n"
!            : "" )
! 	, ($BASE ? "<base href=\"$BASE\">\n" : "" )
! 	, "<link rel=\"STYLESHEET\" href=\"$STYLESHEET\">"
! 	, $more_links_mark
! 	, "\n</head>\n<body$body>");
  }
  
--- 593,628 ----
  	    . ($ISO_LANGUAGE ? $ISO_LANGUAGE : $isolanguage) . "\">\n";
      }
+     if ($MY_PARTIAL_HEADER eq '') {
+         $STYLESHEET = $FILE.".css" unless $STYLESHEET;
+         $MY_PARTIAL_HEADER = join('',
+             ($CHARSET && $HTML_VERSION ge "2.1"
+              ? ('<meta http-equiv="Content-Type" content="text/html; '
+                 . "charset=$charset\">\n")
+              : ''),
+             ($BASE ? "<base href=\"$BASE\">\n" : ''),
+             "<link rel=\"STYLESHEET\" href=\"$STYLESHEET\">\n",
+             "<link rel=\"first\" href=\"$FILE.html\">\n",
+             ($HAVE_TABLE_OF_CONTENTS
+              ? ('<link rel="contents" href="contents.html" title="Contents">'
+                 . "\n")
+              : ''),
+             ($HAVE_GENERAL_INDEX
+              ? '<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"
+             #  : ''),
+             $more_links_mark);
+     }
  
      if (!$charset && $CHARSET) { $charset = $CHARSET; $charset =~ s/_/\-/go; }
  
      join('', ($DOCTYPE ? $DTDcomment : '' )
!          , "<html>\n<head>\n<title>", $title, "</title>\n"
!          , &meta_information($title)
!          , $MY_PARTIAL_HEADER
!          , "\n</head>\n<body$body>");
  }