Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 13:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

make the portions of the generated HTML produced by these styles better

Browse source 
conform to XHTML rules.
This commit is contained in:
Fred Drake 2003-08-05 03:45:37 +00:00
parent 4ee2ff36d0
commit 2fc88a62d4
2 changed files with 87 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

70
Doc/perl/l2hinit.perl
View file

@ -26,7 +26,7 @@ $BOTTOM_NAVIGATION = 1;
$AUTO_NAVIGATION = 0; $AUTO_NAVIGATION = 0;
$BODYTEXT = ''; $BODYTEXT = '';
$CHILDLINE = "\n<p><hr>\n"; $CHILDLINE = "\n<p></p><hr />\n";
$VERBOSITY = 0; $VERBOSITY = 0;
# default # of columns for the indexes # default # of columns for the indexes
@ -104,6 +104,7 @@ sub make_nav_sectref($$$) {
if ($title) { if ($title) {
if ($title =~ /\<[aA] /) { if ($title =~ /\<[aA] /) {
$title =~ s/\<[aA] /<a class="sectref" rel="$linktype" /; $title =~ s/\<[aA] /<a class="sectref" rel="$linktype" /;
$title =~ s/ HREF=/ href=/;
} }
else { else {
$title = "<span class=\"sectref\">$title</span>"; $title = "<span class=\"sectref\">$title</span>";
@ -138,7 +139,7 @@ sub get_my_icon($) {
} }
my $iconserver = ($ICONSERVER eq '.') ? '' : "$ICONSERVER/"; my $iconserver = ($ICONSERVER eq '.') ? '' : "$ICONSERVER/";
return "<img src='$iconserver$name.$IMAGE_TYPE'\n border='0'" return "<img src='$iconserver$name.$IMAGE_TYPE'\n border='0'"
. " height='32' alt='$text' width='32'>"; . " height='32' alt='$text' width='32' />";
} }
sub unlinkify($) { sub unlinkify($) {
@ -157,6 +158,7 @@ sub use_icon($$$) {
$s =~ s/\<tex2html_[a-z_]+_visible_mark\>/$r/; $s =~ s/\<tex2html_[a-z_]+_visible_mark\>/$r/;
} }
$s =~ s/<[aA] /<a rel="$rel" title="$title" \n /; $s =~ s/<[aA] /<a rel="$rel" title="$title" \n /;
$s =~ s/ HREF=/ href=/;
return $s; return $s;
} }
else { else {
@ -202,7 +204,7 @@ sub add_child_links {
my $toc = add_real_child_links(@_); my $toc = add_real_child_links(@_);
$toc =~ s|\s*</[aA]>|</a>|g; $toc =~ s|\s*</[aA]>|</a>|g;
$toc =~ s/ NAME=\"tex2html\d+\"\s*href=/ href=/gi; $toc =~ s/ NAME=\"tex2html\d+\"\s*href=/ href=/gi;
$toc =~ s|</UL>(\s*<BR>)?|</ul>|gi; $toc =~ s|</UL>(\s*<BR( /)?>)?|</ul>|gi;
return $toc; return $toc;
} }
@ -227,13 +229,13 @@ sub get_version_text() {
sub top_navigation_panel() { sub top_navigation_panel() {
return "\n" return "\n"
. make_nav_panel() . make_nav_panel()
. "<br><hr>\n"; . "<br /><hr />\n";
} }
sub bot_navigation_panel() { sub bot_navigation_panel() {
return "\n<p><hr>\n" return "\n<p></p><hr />\n"
. make_nav_panel() . make_nav_panel()
. "<hr>\n" . "<hr />\n"
. get_version_text() . get_version_text()
. "\n"; . "\n";
} }
@ -409,8 +411,8 @@ sub do_cmd_tableofcontents {
my($closures, $reopens) = preserve_open_tags(); my($closures, $reopens) = preserve_open_tags();
anchor_label('contents', $CURRENT_FILE, $_); # this is added anchor_label('contents', $CURRENT_FILE, $_); # this is added
$MY_CONTENTS_PAGE = "$CURRENT_FILE"; $MY_CONTENTS_PAGE = "$CURRENT_FILE";
join('', "<BR>\n\\tableofchildlinks[off]", $closures join('', "<br />\n\\tableofchildlinks[off]", $closures
, make_section_heading($toc_title, 'H2'), $toc_mark , make_section_heading($toc_title, 'h2'), $toc_mark
, $reopens, $_); , $reopens, $_);
} }
# In addition to the standard stuff, add label to allow named node files. # In addition to the standard stuff, add label to allow named node files.
@ -420,8 +422,8 @@ sub do_cmd_listoffigures {
$loffile = $CURRENT_FILE; $loffile = $CURRENT_FILE;
my($closures, $reopens) = preserve_open_tags(); my($closures, $reopens) = preserve_open_tags();
anchor_label('lof', $CURRENT_FILE, $_); # this is added anchor_label('lof', $CURRENT_FILE, $_); # this is added
join('', "<BR>\n", $closures join('', "<br />\n", $closures
, make_section_heading($lof_title, 'H2'), $lof_mark , make_section_heading($lof_title, 'h2'), $lof_mark
, $reopens, $_); , $reopens, $_);
} }
# In addition to the standard stuff, add label to allow named node files. # In addition to the standard stuff, add label to allow named node files.
@ -431,8 +433,8 @@ sub do_cmd_listoftables {
$lotfile = $CURRENT_FILE; $lotfile = $CURRENT_FILE;
my($closures, $reopens) = preserve_open_tags(); my($closures, $reopens) = preserve_open_tags();
anchor_label('lot', $CURRENT_FILE, $_); # this is added anchor_label('lot', $CURRENT_FILE, $_); # this is added
join('', "<BR>\n", $closures join('', "<br />\n", $closures
, make_section_heading($lot_title, 'H2'), $lot_mark , make_section_heading($lot_title, 'h2'), $lot_mark
, $reopens, $_); , $reopens, $_);
} }
# In addition to the standard stuff, add label to allow named node files. # In addition to the standard stuff, add label to allow named node files.
@ -473,7 +475,7 @@ sub do_cmd_textohtmlindex {
my $heading = make_section_heading($idx_title, 'h2') . $idx_mark; my $heading = make_section_heading($idx_title, 'h2') . $idx_mark;
my($pre, $post) = minimize_open_tags($heading); my($pre, $post) = minimize_open_tags($heading);
anchor_label('genindex',$CURRENT_FILE,$_); # this is added anchor_label('genindex',$CURRENT_FILE,$_); # this is added
return "<br>\n" . $pre . $_; return "<br />\n" . $pre . $_;
} }
$MODULE_INDEX_FILE = ''; $MODULE_INDEX_FILE = '';
@ -484,7 +486,7 @@ sub do_cmd_textohtmlmoduleindex {
$TITLE = $idx_module_title; $TITLE = $idx_module_title;
anchor_label('modindex', $CURRENT_FILE, $_); anchor_label('modindex', $CURRENT_FILE, $_);
$MODULE_INDEX_FILE = "$CURRENT_FILE"; $MODULE_INDEX_FILE = "$CURRENT_FILE";
$_ = ('<p>' . make_section_heading($idx_module_title, 'h2') $_ = ('<p></p>' . make_section_heading($idx_module_title, 'h2')
. $idx_module_mark . $_); . $idx_module_mark . $_);
return $_; return $_;
} }
@ -624,7 +626,7 @@ sub make_head_and_body($$) {
$title = &purify($title,1); $title = &purify($title,1);
eval("\$title = ". $default_title ) unless ($title); eval("\$title = ". $default_title ) unless ($title);
# allow user-modification of the <TITLE> tag; thanks Dan Young # allow user-modification of the <title> tag; thanks Dan Young
if (defined &custom_TITLE_hook) { if (defined &custom_TITLE_hook) {
$title = &custom_TITLE_hook($title, $toc_sec_title); $title = &custom_TITLE_hook($title, $toc_sec_title);
} }
@ -640,30 +642,31 @@ sub make_head_and_body($$) {
$MY_PARTIAL_HEADER = join('', $MY_PARTIAL_HEADER = join('',
($DOCTYPE ? $DTDcomment : ''), ($DOCTYPE ? $DTDcomment : ''),
"<html>\n<head>", "<html>\n<head>",
($BASE ? "\n<base href=\"$BASE\">" : ''), ($BASE ? "\n<base href=\"$BASE\" />" : ''),
"\n<link rel=\"STYLESHEET\" href=\"$STYLESHEET\" type='text/css'>", "\n<link rel=\"STYLESHEET\" href=\"$STYLESHEET\" type='text/css'",
" />",
($FAVORITES_ICON ($FAVORITES_ICON
? ("\n<link rel=\"SHORTCUT ICON\" href=\"" . "$FAVORITES_ICON\">") ? ("\n<link rel=\"SHORTCUT ICON\" href=\"$FAVORITES_ICON\" />")
: ''), : ''),
($EXTERNAL_UP_LINK ($EXTERNAL_UP_LINK
? ("\n<link rel='start' href='" . $EXTERNAL_UP_LINK ? ("\n<link rel='start' href='" . $EXTERNAL_UP_LINK
. ($EXTERNAL_UP_TITLE ? . ($EXTERNAL_UP_TITLE ?
"' title='$EXTERNAL_UP_TITLE'>" : "'>")) "' title='$EXTERNAL_UP_TITLE' />" : "' />"))
: ''), : ''),
"\n<link rel=\"first\" href=\"$FILE.html\"", "\n<link rel=\"first\" href=\"$FILE.html\"",
($t_title ? " title='$t_title'" : ''), ($t_title ? " title='$t_title'" : ''),
'>', ' />',
($HAVE_TABLE_OF_CONTENTS ($HAVE_TABLE_OF_CONTENTS
? ("\n<link rel='contents' href='$MY_CONTENTS_PAGE'" ? ("\n<link rel='contents' href='$MY_CONTENTS_PAGE'"
. ' title="Contents">') . ' title="Contents" />')
: ''), : ''),
($HAVE_GENERAL_INDEX ($HAVE_GENERAL_INDEX
? "\n<link rel='index' href='genindex.html' title='Index'>" ? "\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
# ? '<link rel="index" href="modindex.html" title="Module Index">' # ? '<link rel="index" href="modindex.html" title="Module Index"'
# . "\n" # . " />\n"
# : ''), # : ''),
($INFO ($INFO
# XXX We can do this with the Python tools since the About... # XXX We can do this with the Python tools since the About...
@ -671,18 +674,18 @@ sub make_head_and_body($$) {
# 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.
? ("\n<link rel='last' href='about.html'" ? ("\n<link rel='last' href='about.html'"
. " title='About this document...'>" . " title='About this document...' />"
. "\n<link rel='help' href='about.html'" . "\n<link rel='help' href='about.html'"
. " title='About this document...'>") . " title='About this document...' />")
: ''), : ''),
$more_links_mark, $more_links_mark,
"\n", "\n",
($CHARSET && $HTML_VERSION ge "2.1" ($CHARSET && $HTML_VERSION ge "2.1"
? ('<meta http-equiv="Content-Type" content="text/html; ' ? ('<meta http-equiv="Content-Type" content="text/html; '
. "charset=$CHARSET\">\n") . "charset=$CHARSET\" />\n")
: ''), : ''),
($AESOP_META_TYPE ($AESOP_META_TYPE
? "<meta name='aesop' content='$AESOP_META_TYPE'>\n" : '')); ? "<meta name='aesop' content='$AESOP_META_TYPE' />\n" : ''));
} }
if (!$charset && $CHARSET) { if (!$charset && $CHARSET) {
$charset = $CHARSET; $charset = $CHARSET;
@ -692,11 +695,20 @@ sub make_head_and_body($$) {
# <meta name='description' ...> element in the document head. # <meta name='description' ...> element in the document head.
my $metatitle = "$title"; my $metatitle = "$title";
$metatitle =~ s/^\d+(\.\d+)*\s*//; $metatitle =~ s/^\d+(\.\d+)*\s*//;
$metatitle = meta_information($metatitle);
$metatitle =~ s/ NAME=/ name=/g;
$metatitle =~ s/ CONTENT=/ content=/g;
join('', join('',
$MY_PARTIAL_HEADER, $MY_PARTIAL_HEADER,
&meta_information($metatitle), $metatitle,
"<title>", $title, "</title>\n</head>\n<body$body>"); "<title>", $title, "</title>\n</head>\n<body$body>");
} }
sub replace_morelinks {
$more_links =~ s/ REL=/ rel=/g;
$more_links =~ s/ HREF=/ href=/g;
$_ =~ s/$more_links_mark/$more_links/e;
}
1; # This must be the last line 1; # This must be the last line

90
Doc/perl/python.perl
View file

@ -51,7 +51,7 @@ sub get_link_icon($){
? " width=\"$OFF_SITE_LINK_ICON_WIDTH\"" ? " width=\"$OFF_SITE_LINK_ICON_WIDTH\""
: '') : '')
. " alt=\"[off-site link]\"\n" . " alt=\"[off-site link]\"\n"
. " >"); . " />");
} }
return ''; return '';
} }
@ -345,8 +345,8 @@ sub do_cmd_pep{
# Save the reference # Save the reference
my $nstr = gen_index_id("Python Enhancement Proposals!PEP $rfcnumber", ''); my $nstr = gen_index_id("Python Enhancement Proposals!PEP $rfcnumber", '');
$index{$nstr} .= make_half_href("$CURRENT_FILE#$id"); $index{$nstr} .= make_half_href("$CURRENT_FILE#$id");
return ("<a class=\"rfc\" name=\"$id\"\nhref=\"$href\">PEP $rfcnumber" return ("<a class=\"rfc\" name=\"$id\" id='$id'\n"
. "$icon</a>" . $_); . "href=\"$href\">PEP $rfcnumber$icon</a>" . $_);
} }
sub do_cmd_rfc{ sub do_cmd_rfc{
@ -358,8 +358,8 @@ sub do_cmd_rfc{
# Save the reference # Save the reference
my $nstr = gen_index_id("RFC!RFC $rfcnumber", ''); my $nstr = gen_index_id("RFC!RFC $rfcnumber", '');
$index{$nstr} .= make_half_href("$CURRENT_FILE#$id"); $index{$nstr} .= make_half_href("$CURRENT_FILE#$id");
return ("<a class=\"rfc\" name=\"$id\"\nhref=\"$href\">RFC $rfcnumber" return ("<a class=\"rfc\" name=\"$id\" id='$id'\nhref=\"$href\">"
. "$icon</a>" . $_); . "RFC $rfcnumber$icon</a>" . $_);
} }
sub do_cmd_ulink{ sub do_cmd_ulink{
@ -394,7 +394,7 @@ sub do_cmd_deprecated{
my $reason = next_argument(); my $reason = next_argument();
return ('<div class="versionnote">' return ('<div class="versionnote">'
. "<b>Deprecated since release $release.</b>" . "<b>Deprecated since release $release.</b>"
. "\n$reason</div><p>" . "\n$reason</div><p></p>"
. $_); . $_);
} }
@ -512,7 +512,7 @@ sub add_index_entry($$){
sub new_link_info(){ sub new_link_info(){
my $name = "l2h-" . ++$globals{'max_id'}; my $name = "l2h-" . ++$globals{'max_id'};
my $aname = "<a name=\"$name\">"; my $aname = "<a name=\"$name\" id='$name'>";
my $ahref = gen_link($CURRENT_FILE, $name); my $ahref = gen_link($CURRENT_FILE, $name);
return ($name, $aname, $ahref); return ($name, $aname, $ahref);
} }
@ -810,7 +810,8 @@ sub do_cmd_production{
} }
$TokenToTargetMapping{"$CURRENT_GRAMMAR:$token"} = $target; $TokenToTargetMapping{"$CURRENT_GRAMMAR:$token"} = $target;
return ("<tr valign=\"baseline\">\n" return ("<tr valign=\"baseline\">\n"
. " <td><code><a name=\"tok-$token\">$token</a></code></td>\n" . " <td><code><a name=\"tok-$token\" id='tok-$token'>"
. "$token</a></code></td>\n"
. " <td>&nbsp;::=&nbsp;</td>\n" . " <td>&nbsp;::=&nbsp;</td>\n"
. " <td><code>" . " <td><code>"
. translate_commands($defn) . translate_commands($defn)
@ -962,10 +963,10 @@ sub do_env_cfuncdesc{
. "\n <span class=\"value\">$rcinfo.</span>" . "\n <span class=\"value\">$rcinfo.</span>"
. "\n</div>"); . "\n</div>");
} }
return "<dl><dt>$siginfo\n<dd>" return "<dl><dt>$siginfo</dt>\n<dd>"
. $rcinfo . $rcinfo
. $_ . $_
. '</dl>'; . '</dd></dl>';
} }
sub do_cmd_cmemberline{ sub do_cmd_cmemberline{
@ -976,7 +977,7 @@ sub do_cmd_cmemberline{
my $idx = make_str_index_entry("<tt class=\"cmember\">$name</tt>" my $idx = make_str_index_entry("<tt class=\"cmember\">$name</tt>"
. " ($container member)"); . " ($container member)");
$idx =~ s/ \(.*\)//; $idx =~ s/ \(.*\)//;
return "<dt>$type <b>$idx</b>\n<dd>" return "<dt>$type <b>$idx</b></dt>\n<dd>"
. $_; . $_;
} }
sub do_env_cmemberdesc{ sub do_env_cmemberdesc{
@ -987,7 +988,7 @@ sub do_env_cmemberdesc{
my $idx = make_str_index_entry("<tt class=\"cmember\">$name</tt>" my $idx = make_str_index_entry("<tt class=\"cmember\">$name</tt>"
. " ($container member)"); . " ($container member)");
$idx =~ s/ \(.*\)//; $idx =~ s/ \(.*\)//;
return "<dl><dt>$type <b>$idx</b>\n<dd>" return "<dl><dt>$type <b>$idx</b></dt>\n<dd>"
. $_ . $_
. '</dl>'; . '</dl>';
} }
@ -996,7 +997,7 @@ sub do_env_csimplemacrodesc{
local($_) = @_; local($_) = @_;
my $name = next_argument(); my $name = next_argument();
my $idx = make_str_index_entry("<tt class=\"macro\">$name</tt>"); my $idx = make_str_index_entry("<tt class=\"macro\">$name</tt>");
return "<dl><dt><b>$idx</b>\n<dd>" return "<dl><dt><b>$idx</b></dt>\n<dd>"
. $_ . $_
. '</dl>' . '</dl>'
} }
@ -1009,7 +1010,8 @@ sub do_env_ctypedesc{
unless $index_name; unless $index_name;
my($name, $aname, $ahref) = new_link_info(); my($name, $aname, $ahref) = new_link_info();
add_index_entry("<tt class=\"ctype\">$index_name</tt> (C type)", $ahref); add_index_entry("<tt class=\"ctype\">$index_name</tt> (C type)", $ahref);
return "<dl><dt><b><tt class=\"ctype\">$aname$type_name</a></tt></b>\n<dd>" return "<dl><dt><b><tt class=\"ctype\">$aname$type_name</a></tt></b></dt>"
. "\n<dd>"
. $_ . $_
. '</dl>' . '</dl>'
} }
@ -1021,10 +1023,10 @@ sub do_env_cvardesc{
my $idx = make_str_index_entry("<tt class=\"cdata\">$var_name</tt>" my $idx = make_str_index_entry("<tt class=\"cdata\">$var_name</tt>"
. get_indexsubitem()); . get_indexsubitem());
$idx =~ s/ \(.*\)//; $idx =~ s/ \(.*\)//;
return "<dl><dt>$var_type <b>$idx</b>\n" return "<dl><dt>$var_type <b>$idx</b></dt>\n"
. '<dd>' . '<dd>'
. $_ . $_
. '</dl>'; . '</dd></dl>';
} }
sub convert_args($){ sub convert_args($){
@ -1038,7 +1040,7 @@ sub funcline_helper($$$){
return (($first ? '<dl>' : '') return (($first ? '<dl>' : '')
. '<dt><table cellpadding="0" cellspacing="0"><tr valign="baseline">' . '<dt><table cellpadding="0" cellspacing="0"><tr valign="baseline">'
. "\n <td><nobr><b>$idxitem</b>(</nobr></td>" . "\n <td><nobr><b>$idxitem</b>(</nobr></td>"
. "\n <td><var>$arglist</var>)</td></tr></table>\n<dd>"); . "\n <td><var>$arglist</var>)</td></tr></table></dt>\n<dd>");
} }
sub do_env_funcdesc{ sub do_env_funcdesc{
@ -1104,7 +1106,7 @@ sub do_env_opcodedesc{
if ($arg_list) { if ($arg_list) {
$stuff .= "&nbsp;&nbsp;&nbsp;&nbsp;<var>$arg_list</var>"; $stuff .= "&nbsp;&nbsp;&nbsp;&nbsp;<var>$arg_list</var>";
} }
return $stuff . "\n<dd>" . $_ . '</dl>'; return $stuff . "</dt>\n<dd>" . $_ . '</dt></dl>';
} }
sub do_env_datadesc{ sub do_env_datadesc{
@ -1112,9 +1114,9 @@ sub do_env_datadesc{
my $dataname = next_argument(); my $dataname = next_argument();
my $idx = make_str_index_entry("<tt>$dataname</tt>" . get_indexsubitem()); my $idx = make_str_index_entry("<tt>$dataname</tt>" . get_indexsubitem());
$idx =~ s/ \(.*\)//; $idx =~ s/ \(.*\)//;
return "<dl><dt><b>$idx</b>\n<dd>" return "<dl><dt><b>$idx</b></dt>\n<dd>"
. $_ . $_
. '</dl>'; . '</dd></dl>';
} }
sub do_env_datadescni{ sub do_env_datadescni{
@ -1123,7 +1125,7 @@ sub do_env_datadescni{
if (! $STRING_INDEX_TT) { if (! $STRING_INDEX_TT) {
$idx = "<tt>$idx</tt>"; $idx = "<tt>$idx</tt>";
} }
return "<dl><dt><b>$idx</b>\n<dd>" . $_ . '</dl>'; return "<dl><dt><b>$idx</b></dt>\n<dd>" . $_ . '</dd></dl>';
} }
sub do_cmd_dataline{ sub do_cmd_dataline{
@ -1131,23 +1133,23 @@ sub do_cmd_dataline{
my $data_name = next_argument(); my $data_name = next_argument();
my $idx = make_str_index_entry("<tt>$data_name</tt>" . get_indexsubitem()); my $idx = make_str_index_entry("<tt>$data_name</tt>" . get_indexsubitem());
$idx =~ s/ \(.*\)//; $idx =~ s/ \(.*\)//;
return "<dt><b>$idx</b><dd>" . $_; return "<dt><b>$idx</b></dt><dd>" . $_;
} }
sub do_cmd_datalineni{ sub do_cmd_datalineni{
local($_) = @_; local($_) = @_;
my $data_name = next_argument(); my $data_name = next_argument();
return "<dt><b><tt>$data_name</tt></b><dd>" . $_; return "<dt><b><tt>$data_name</tt></b></dt><dd>" . $_;
} }
sub do_env_excdesc{ sub do_env_excdesc{
local($_) = @_; local($_) = @_;
my $excname = next_argument(); my $excname = next_argument();
my $idx = make_str_index_entry("<tt class=\"exception\">$excname</tt>"); my $idx = make_str_index_entry("<tt class=\"exception\">$excname</tt>");
return ("<dl><dt><b>${TLSTART}exception$TLEND$idx</b>" return ("<dl><dt><b>${TLSTART}exception$TLEND$idx</b></dt>"
. "\n<dd>" . "\n<dd>"
. $_ . $_
. '</dl>'); . '</dd></dl>');
} }
sub do_env_fulllineitems{ return do_env_itemize(@_); } sub do_env_fulllineitems{ return do_env_itemize(@_); }
@ -1251,7 +1253,7 @@ sub do_env_memberdesc{
my $idx = make_str_index_entry("<tt class=\"member\">$member</tt>$extra"); my $idx = make_str_index_entry("<tt class=\"member\">$member</tt>$extra");
$idx =~ s/ \(.*\)//; $idx =~ s/ \(.*\)//;
$idx =~ s/\(\)//; $idx =~ s/\(\)//;
return "<dl><dt><b>$idx</b>\n<dd>" . $_ . '</dl>'; return "<dl><dt><b>$idx</b></dt>\n<dd>" . $_ . '</dl>';
} }
@ -1267,7 +1269,7 @@ sub do_cmd_memberline{
my $idx = make_str_index_entry("<tt class=\"member\">$member</tt>$extra"); my $idx = make_str_index_entry("<tt class=\"member\">$member</tt>$extra");
$idx =~ s/ \(.*\)//; $idx =~ s/ \(.*\)//;
$idx =~ s/\(\)//; $idx =~ s/\(\)//;
return "<dt><b>$idx</b><dd>" . $_; return "<dt><b>$idx</b></dt><dd>" . $_;
} }
@ -1275,9 +1277,9 @@ sub do_env_memberdescni{
local($_) = @_; local($_) = @_;
next_optional_argument(); next_optional_argument();
my $member = next_argument(); my $member = next_argument();
return "<dl><dt><b><tt class=\"member\">$member</tt></b>\n<dd>" return "<dl><dt><b><tt class=\"member\">$member</tt></b></dt>\n<dd>"
. $_ . $_
. '</dl>'; . '</dd></dl>';
} }
@ -1285,7 +1287,7 @@ sub do_cmd_memberlineni{
local($_) = @_; local($_) = @_;
next_optional_argument(); next_optional_argument();
my $member = next_argument(); my $member = next_argument();
return "<dt><b><tt class=\"member\">$member</tt></b><dd>" . $_; return "<dt><b><tt class=\"member\">$member</tt></b></dt>\n<dd>" . $_;
} }
@ -1635,7 +1637,7 @@ sub make_my_titlepage(){
$the_title .= "\n<p>"; $the_title .= "\n<p>";
if ($PACKAGE_VERSION) { if ($PACKAGE_VERSION) {
$the_title .= ('<strong>Release ' $the_title .= ('<strong>Release '
. "$PACKAGE_VERSION$RELEASE_INFO</strong><br>\n"); . "$PACKAGE_VERSION$RELEASE_INFO</strong><br />\n");
} }
$the_title .= "<strong>$t_date</strong></p>" $the_title .= "<strong>$t_date</strong></p>"
} }
@ -1643,7 +1645,7 @@ sub make_my_titlepage(){
$the_title .= "\n<p>$t_address</p>"; $the_title .= "\n<p>$t_address</p>";
} }
else { else {
$the_title .= "\n<p>"; $the_title .= "\n<p></p>";
} }
if ($t_email) { if ($t_email) {
$the_title .= "\n<p>$t_email</p>"; $the_title .= "\n<p>$t_email</p>";
@ -1661,7 +1663,7 @@ sub make_my_titlegraphic(){
if ($TITLE_PAGE_GRAPHIC_WIDTH); if ($TITLE_PAGE_GRAPHIC_WIDTH);
$graphic .= " height=\"$TITLE_PAGE_GRAPHIC_HEIGHT\"" $graphic .= " height=\"$TITLE_PAGE_GRAPHIC_HEIGHT\""
if ($TITLE_PAGE_GRAPHIC_HEIGHT); if ($TITLE_PAGE_GRAPHIC_HEIGHT);
$graphic .= "\n src=\"$filename\"></td>\n"; $graphic .= "\n src=\"$filename\" /></td>\n";
return $graphic; return $graphic;
} }
@ -1669,14 +1671,14 @@ sub do_cmd_maketitle{
local($_) = @_; local($_) = @_;
my $the_title = "\n"; my $the_title = "\n";
if ($EXTERNAL_UP_LINK) { if ($EXTERNAL_UP_LINK) {
# This generates a <LINK> element in the wrong place (the # This generates a <link> element in the wrong place (the
# body), but I don't see any other way to get this generated # body), but I don't see any other way to get this generated
# at all. Browsers like Mozilla, that support navigation # at all. Browsers like Mozilla, that support navigation
# links, can make use of this. # links, can make use of this.
$the_title .= ("<link rel='up' href='$EXTERNAL_UP_LINK'" $the_title .= ("<link rel='up' href='$EXTERNAL_UP_LINK'"
. ($EXTERNAL_UP_TITLE . ($EXTERNAL_UP_TITLE
? " title='$EXTERNAL_UP_TITLE'" : '') ? " title='$EXTERNAL_UP_TITLE'" : '')
. ">\n"); . " />\n");
} }
$the_title .= '<div class="titlepage">'; $the_title .= '<div class="titlepage">';
if ($TITLE_PAGE_GRAPHIC) { if ($TITLE_PAGE_GRAPHIC) {
@ -1897,14 +1899,14 @@ sub do_cmd_seetitle{
my $icon = get_link_icon($url); my $icon = get_link_icon($url);
return '<dl compact class="seetitle">' return '<dl compact class="seetitle">'
. "\n <dt><em class=\"citetitle\"><a href=\"$url\"" . "\n <dt><em class=\"citetitle\"><a href=\"$url\""
. "\n >$title$icon</a></em>" . "\n >$title$icon</a></em></dt>"
. "\n <dd>$text\n </dl>" . "\n <dd>$text</dd>\n </dl>"
. $_; . $_;
} }
return '<dl compact class="seetitle">' return '<dl compact class="seetitle">'
. "\n <dt><em class=\"citetitle\"" . "\n <dt><em class=\"citetitle\""
. "\n >$title</em>" . "\n >$title</em></dt>"
. "\n <dd>$text\n </dl>" . "\n <dd>$text</dd>\n </dl>"
. $_; . $_;
} }
@ -1915,15 +1917,15 @@ sub do_cmd_seeurl{
my $icon = get_link_icon($url); my $icon = get_link_icon($url);
return '<dl compact class="seeurl">' return '<dl compact class="seeurl">'
. "\n <dt><a href=\"$url\"" . "\n <dt><a href=\"$url\""
. "\n class=\"url\">$url$icon</a>" . "\n class=\"url\">$url$icon</a></dt>"
. "\n <dd>$text\n </dl>" . "\n <dd>$text</dd>\n </dl>"
. $_; . $_;
} }
sub do_cmd_seetext{ sub do_cmd_seetext{
local($_) = @_; local($_) = @_;
my $content = next_argument(); my $content = next_argument();
return '<div class="seetext"><p>' . $content . '</div>' . $_; return '<div class="seetext"><p>' . $content . '</p></div>' . $_;
} }
@ -1932,7 +1934,7 @@ sub do_cmd_seetext{
# #
sub do_env_definitions{ sub do_env_definitions{
return "<dl class=\"definitions\">" . $_[0] . "</dl>\n"; return '<dl class="definitions">' . $_[0] . "</dl>\n";
} }
sub do_cmd_term{ sub do_cmd_term{
@ -1940,7 +1942,7 @@ sub do_cmd_term{
my $term = next_argument(); my $term = next_argument();
my($name, $aname, $ahref) = new_link_info(); my($name, $aname, $ahref) = new_link_info();
# could easily add an index entry here... # could easily add an index entry here...
return "<dt><b>$aname" . $term . "</a></b>\n<dd>" . $_; return "<dt><b>$aname" . $term . "</a></b></dt>\n<dd>" . $_;
} }