From dd3d6a03c0c763cd83b969f564577db74e802681 Mon Sep 17 00:00:00 2001 From: Fred Drake Date: Wed, 30 Oct 2002 17:00:58 +0000 Subject: Add support for using a "favicon". make_head_and_body(): Re-arranged to do (slightly) less work for each page. --- Doc/perl/l2hinit.perl | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/Doc/perl/l2hinit.perl b/Doc/perl/l2hinit.perl index d222a51..edb6caa 100644 --- a/Doc/perl/l2hinit.perl +++ b/Doc/perl/l2hinit.perl @@ -137,8 +137,8 @@ sub get_my_icon($) { $name = 'blank'; } my $iconserver = ($ICONSERVER eq '.') ? '' : "$ICONSERVER/"; - return "\"$text\""; + return "$text"; } sub use_my_icon($) { @@ -613,37 +613,41 @@ sub make_head_and_body($$) { if ($MY_PARTIAL_HEADER eq '') { $STYLESHEET = $FILE.".css" unless $STYLESHEET; $MY_PARTIAL_HEADER = join('', - ($CHARSET && $HTML_VERSION ge "2.1" - ? ('\n") - : ''), + ($DOCTYPE ? $DTDcomment : ''), + "\n\n", ($BASE ? "\n" : ''), "\n", "\n", + ($FAVORITES_ICON + ? ('\n") + : ''), ($HAVE_TABLE_OF_CONTENTS ? ('' - . "\n") + . ($HAVE_GENERAL_INDEX ? "\n" : '')) : ''), ($HAVE_GENERAL_INDEX - ? '' + ? '' . "\n" : ''), # disable for now -- Mozilla doesn't do well with multiple indexes # ($HAVE_MODULE_INDEX # ? '' # . "\n" # : ''), - $more_links_mark); + $more_links_mark, + ($CHARSET && $HTML_VERSION ge "2.1" + ? ('\n") + : ''), + ($AESOP_META_TYPE + ? "\n" : '')); } if (!$charset && $CHARSET) { $charset = $CHARSET; $charset =~ s/_/\-/go; } - join('', ($DOCTYPE ? $DTDcomment : '' ) - , "\n\n", $title, "\n" - , &meta_information($title) - , $MY_PARTIAL_HEADER - , ($AESOP_META_TYPE eq '' ? '' - : "\n") - , "\n\n"); + join('', + $MY_PARTIAL_HEADER, + &meta_information($title), + "", $title, "\n\n"); } 1; # This must be the last line -- cgit v0.12