[Python-checkins] python/dist/src/Doc/perl l2hinit.perl,1.84,1.85

[fdrake at users.sourceforge.net]

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

Modified Files:
	l2hinit.perl 
Log Message:
generate the "type" attribute on the favicon link


Index: l2hinit.perl
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/perl/l2hinit.perl,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- l2hinit.perl	29 Oct 2004 19:47:52 -0000	1.84
+++ l2hinit.perl	5 Nov 2004 05:06:08 -0000	1.85
@@ -661,6 +661,18 @@
             . ($ISO_LANGUAGE ? $ISO_LANGUAGE : $isolanguage) . "\">\n";
     }
     if ($MY_PARTIAL_HEADER eq '') {
+        my $favicon = '';
+        if ($FAVORITES_ICON) {
+            my($myname, $mydir, $myext) = fileparse($FAVORITES_ICON, '\..*');
+            my $favtype = '';
+            if ($myext eq '.gif' || $myext eq '.png') {
+                $myext =~ s/^[.]//;
+                $favtype = " type=\"image/$myext\"";
+            }
+            $favicon = (
+                "\n<link rel=\"SHORTCUT ICON\" href=\"$FAVORITES_ICON\""
+                . "$favtype />");
+        }
         $STYLESHEET = $FILE.".css" unless $STYLESHEET;
         $MY_PARTIAL_HEADER = join('',
             ($DOCTYPE ? $DTDcomment : ''),
@@ -668,9 +680,7 @@
             ($BASE ? "\n<base href=\"$BASE\" />" : ''),
             "\n<link rel=\"STYLESHEET\" href=\"$STYLESHEET\" type='text/css'",
             " />",
-            ($FAVORITES_ICON
-             ? ("\n<link rel=\"SHORTCUT ICON\" href=\"$FAVORITES_ICON\" />")
-             : ''),
+            $favicon,
             ($EXTERNAL_UP_LINK
              ? ("\n<link rel='start' href='" . $EXTERNAL_UP_LINK
                 . ($EXTERNAL_UP_TITLE ?