Avoid extraneous blank line generated in the middle of the document

head.
This commit is contained in:
Fred Drake 2003-05-02 18:21:22 +00:00
parent f06b90534b
commit 98b2576424
1 changed files with 15 additions and 16 deletions

View File

@ -614,26 +614,25 @@ sub make_head_and_body($$) {
$STYLESHEET = $FILE.".css" unless $STYLESHEET; $STYLESHEET = $FILE.".css" unless $STYLESHEET;
$MY_PARTIAL_HEADER = join('', $MY_PARTIAL_HEADER = join('',
($DOCTYPE ? $DTDcomment : ''), ($DOCTYPE ? $DTDcomment : ''),
"<html>\n<head>\n", "<html>\n<head>",
($BASE ? "<base href=\"$BASE\">\n" : ''), ($BASE ? "\n<base href=\"$BASE\">" : ''),
"<link rel=\"STYLESHEET\" href=\"$STYLESHEET\" type='text/css'>\n", "\n<link rel=\"STYLESHEET\" href=\"$STYLESHEET\" type='text/css'>",
($FAVORITES_ICON ($FAVORITES_ICON
? ('<link rel="SHORTCUT ICON" href="' . "$FAVORITES_ICON\">\n") ? ("\n<link rel=\"SHORTCUT ICON\" href=\"" . "$FAVORITES_ICON\">")
: ''), : ''),
($EXTERNAL_UP_LINK ($EXTERNAL_UP_LINK
? ('<link rel="start" href="' . "$EXTERNAL_UP_LINK\"" ? ("\n<link rel='start' href='" . $EXTERNAL_UP_LINK
. ($EXTERNAL_UP_TITLE ? " title='$EXTERNAL_UP_TITLE'" : '') . ($EXTERNAL_UP_TITLE ?
. ">\n") "' title='$EXTERNAL_UP_TITLE'>" : "'>"))
: ''), : ''),
"<link rel=\"first\" href=\"$FILE.html\"", "\n<link rel=\"first\" href=\"$FILE.html\"",
($t_title ? " title='$t_title'" : ''), ($t_title ? " title='$t_title'" : ''),
">\n", '>',
($HAVE_TABLE_OF_CONTENTS ($HAVE_TABLE_OF_CONTENTS
? ('<link rel="contents" href="contents.html" title="Contents">' ? "\n<link rel='contents' href='contents.html' title='Contents'>"
. ($HAVE_GENERAL_INDEX ? "\n" : ''))
: ''), : ''),
($HAVE_GENERAL_INDEX ($HAVE_GENERAL_INDEX
? '<link rel="index" href="genindex.html" title="Index">' . "\n" ? "\n<link rel='index' href='genindex.html' title='Index'>"
: ''), : ''),
# disable for now -- Mozilla doesn't do well with multiple indexes # disable for now -- Mozilla doesn't do well with multiple indexes
# ($HAVE_MODULE_INDEX # ($HAVE_MODULE_INDEX
@ -645,10 +644,10 @@ sub make_head_and_body($$) {
# page always gets copied to about.html, even when we use the # page always gets copied to about.html, even when we use the
# generated node###.html page names. Won't work with the # generated node###.html page names. Won't work with the
# rest of the Python doc tools. # rest of the Python doc tools.
? ("<link rel='last' href='about.html'" ? ("\n<link rel='last' href='about.html'"
. " title='About this document...'>\n" . " title='About this document...'>"
. "<link rel='help' href='about.html'" . "\n<link rel='help' href='about.html'"
. " title='About this document...'>\n") . " title='About this document...'>")
: ''), : ''),
$more_links_mark, $more_links_mark,
"\n", "\n",