From 2fc88a62d46bbd1ae3fcb2cc4606cc955eee336f Mon Sep 17 00:00:00 2001 From: Fred Drake Date: Tue, 5 Aug 2003 03:45:37 +0000 Subject: make the portions of the generated HTML produced by these styles better conform to XHTML rules. --- Doc/perl/python.perl | 90 +++++++++++++++++++++++++++------------------------- 1 file changed, 46 insertions(+), 44 deletions(-) (limited to 'Doc/perl/python.perl') diff --git a/Doc/perl/python.perl b/Doc/perl/python.perl index 7d50e491ef4..1f380cbcb66 100644 --- a/Doc/perl/python.perl +++ b/Doc/perl/python.perl @@ -51,7 +51,7 @@ sub get_link_icon($){ ? " width=\"$OFF_SITE_LINK_ICON_WIDTH\"" : '') . " alt=\"[off-site link]\"\n" - . " >"); + . " />"); } return ''; } @@ -345,8 +345,8 @@ sub do_cmd_pep{ # Save the reference my $nstr = gen_index_id("Python Enhancement Proposals!PEP $rfcnumber", ''); $index{$nstr} .= make_half_href("$CURRENT_FILE#$id"); - return ("PEP $rfcnumber" - . "$icon" . $_); + return ("PEP $rfcnumber$icon" . $_); } sub do_cmd_rfc{ @@ -358,8 +358,8 @@ sub do_cmd_rfc{ # Save the reference my $nstr = gen_index_id("RFC!RFC $rfcnumber", ''); $index{$nstr} .= make_half_href("$CURRENT_FILE#$id"); - return ("RFC $rfcnumber" - . "$icon" . $_); + return ("" + . "RFC $rfcnumber$icon" . $_); } sub do_cmd_ulink{ @@ -394,7 +394,7 @@ sub do_cmd_deprecated{ my $reason = next_argument(); return ('
' . "Deprecated since release $release." - . "\n$reason

" + . "\n$reason

" . $_); } @@ -512,7 +512,7 @@ sub add_index_entry($$){ sub new_link_info(){ my $name = "l2h-" . ++$globals{'max_id'}; - my $aname = ""; + my $aname = ""; my $ahref = gen_link($CURRENT_FILE, $name); return ($name, $aname, $ahref); } @@ -810,7 +810,8 @@ sub do_cmd_production{ } $TokenToTargetMapping{"$CURRENT_GRAMMAR:$token"} = $target; return ("\n" - . " $token\n" + . " " + . "$token\n" . "  ::= \n" . " " . translate_commands($defn) @@ -962,10 +963,10 @@ sub do_env_cfuncdesc{ . "\n $rcinfo." . "\n"); } - return "
$siginfo\n
" + return "
$siginfo
\n
" . $rcinfo . $_ - . '
'; + . '
'; } sub do_cmd_cmemberline{ @@ -976,7 +977,7 @@ sub do_cmd_cmemberline{ my $idx = make_str_index_entry("$name" . " ($container member)"); $idx =~ s/ \(.*\)//; - return "
$type $idx\n
" + return "
$type $idx
\n
" . $_; } sub do_env_cmemberdesc{ @@ -987,7 +988,7 @@ sub do_env_cmemberdesc{ my $idx = make_str_index_entry("$name" . " ($container member)"); $idx =~ s/ \(.*\)//; - return "
$type $idx\n
" + return "
$type $idx
\n
" . $_ . '
'; } @@ -996,7 +997,7 @@ sub do_env_csimplemacrodesc{ local($_) = @_; my $name = next_argument(); my $idx = make_str_index_entry("$name"); - return "
$idx\n
" + return "
$idx
\n
" . $_ . '
' } @@ -1009,7 +1010,8 @@ sub do_env_ctypedesc{ unless $index_name; my($name, $aname, $ahref) = new_link_info(); add_index_entry("$index_name (C type)", $ahref); - return "
$aname$type_name\n
" + return "
$aname$type_name
" + . "\n
" . $_ . '
' } @@ -1021,10 +1023,10 @@ sub do_env_cvardesc{ my $idx = make_str_index_entry("$var_name" . get_indexsubitem()); $idx =~ s/ \(.*\)//; - return "
$var_type $idx\n" + return "
$var_type $idx
\n" . '
' . $_ - . '
'; + . '
'; } sub convert_args($){ @@ -1038,7 +1040,7 @@ sub funcline_helper($$$){ return (($first ? '
' : '') . '
' . "\n " - . "\n
$idxitem($arglist)
\n
"); + . "\n $arglist)\n
"); } sub do_env_funcdesc{ @@ -1104,7 +1106,7 @@ sub do_env_opcodedesc{ if ($arg_list) { $stuff .= "    $arg_list"; } - return $stuff . "\n
" . $_ . '
'; + return $stuff . "\n
" . $_ . '
'; } sub do_env_datadesc{ @@ -1112,9 +1114,9 @@ sub do_env_datadesc{ my $dataname = next_argument(); my $idx = make_str_index_entry("$dataname" . get_indexsubitem()); $idx =~ s/ \(.*\)//; - return "
$idx\n
" + return "
$idx
\n
" . $_ - . '
'; + . '
'; } sub do_env_datadescni{ @@ -1123,7 +1125,7 @@ sub do_env_datadescni{ if (! $STRING_INDEX_TT) { $idx = "$idx"; } - return "
$idx\n
" . $_ . '
'; + return "
$idx
\n
" . $_ . '
'; } sub do_cmd_dataline{ @@ -1131,23 +1133,23 @@ sub do_cmd_dataline{ my $data_name = next_argument(); my $idx = make_str_index_entry("$data_name" . get_indexsubitem()); $idx =~ s/ \(.*\)//; - return "
$idx
" . $_; + return "
$idx
" . $_; } sub do_cmd_datalineni{ local($_) = @_; my $data_name = next_argument(); - return "
$data_name
" . $_; + return "
$data_name
" . $_; } sub do_env_excdesc{ local($_) = @_; my $excname = next_argument(); my $idx = make_str_index_entry("$excname"); - return ("
${TLSTART}exception$TLEND$idx" + return ("
${TLSTART}exception$TLEND$idx
" . "\n
" . $_ - . '
'); + . '
'); } sub do_env_fulllineitems{ return do_env_itemize(@_); } @@ -1251,7 +1253,7 @@ sub do_env_memberdesc{ my $idx = make_str_index_entry("$member$extra"); $idx =~ s/ \(.*\)//; $idx =~ s/\(\)//; - return "
$idx\n
" . $_ . '
'; + return "
$idx
\n
" . $_ . '
'; } @@ -1267,7 +1269,7 @@ sub do_cmd_memberline{ my $idx = make_str_index_entry("$member$extra"); $idx =~ s/ \(.*\)//; $idx =~ s/\(\)//; - return "
$idx
" . $_; + return "
$idx
" . $_; } @@ -1275,9 +1277,9 @@ sub do_env_memberdescni{ local($_) = @_; next_optional_argument(); my $member = next_argument(); - return "
$member\n
" + return "
$member
\n
" . $_ - . '
'; + . '
'; } @@ -1285,7 +1287,7 @@ sub do_cmd_memberlineni{ local($_) = @_; next_optional_argument(); my $member = next_argument(); - return "
$member
" . $_; + return "
$member
\n
" . $_; } @@ -1635,7 +1637,7 @@ sub make_my_titlepage(){ $the_title .= "\n

"; if ($PACKAGE_VERSION) { $the_title .= ('Release ' - . "$PACKAGE_VERSION$RELEASE_INFO
\n"); + . "$PACKAGE_VERSION$RELEASE_INFO
\n"); } $the_title .= "$t_date

" } @@ -1643,7 +1645,7 @@ sub make_my_titlepage(){ $the_title .= "\n

$t_address

"; } else { - $the_title .= "\n

"; + $the_title .= "\n

"; } if ($t_email) { $the_title .= "\n

$t_email

"; @@ -1661,7 +1663,7 @@ sub make_my_titlegraphic(){ if ($TITLE_PAGE_GRAPHIC_WIDTH); $graphic .= " height=\"$TITLE_PAGE_GRAPHIC_HEIGHT\"" if ($TITLE_PAGE_GRAPHIC_HEIGHT); - $graphic .= "\n src=\"$filename\">\n"; + $graphic .= "\n src=\"$filename\" />\n"; return $graphic; } @@ -1669,14 +1671,14 @@ sub do_cmd_maketitle{ local($_) = @_; my $the_title = "\n"; if ($EXTERNAL_UP_LINK) { - # This generates a element in the wrong place (the + # This generates a element in the wrong place (the # body), but I don't see any other way to get this generated # at all. Browsers like Mozilla, that support navigation # links, can make use of this. $the_title .= ("\n"); + . " />\n"); } $the_title .= '
'; if ($TITLE_PAGE_GRAPHIC) { @@ -1897,14 +1899,14 @@ sub do_cmd_seetitle{ my $icon = get_link_icon($url); return '
' . "\n
$title$icon" - . "\n
$text\n
" + . "\n >$title$icon" + . "\n
$text
\n " . $_; } return '
' . "\n
$title" - . "\n
$text\n
" + . "\n >$title" + . "\n
$text
\n " . $_; } @@ -1915,15 +1917,15 @@ sub do_cmd_seeurl{ my $icon = get_link_icon($url); return '
' . "\n
$url$icon" - . "\n
$text\n
" + . "\n class=\"url\">$url$icon" + . "\n
$text
\n " . $_; } sub do_cmd_seetext{ local($_) = @_; my $content = next_argument(); - return '

' . $content . '

' . $_; + return '

' . $content . '

' . $_; } @@ -1932,7 +1934,7 @@ sub do_cmd_seetext{ # sub do_env_definitions{ - return "
" . $_[0] . "
\n"; + return '
' . $_[0] . "
\n"; } sub do_cmd_term{ @@ -1940,7 +1942,7 @@ sub do_cmd_term{ my $term = next_argument(); my($name, $aname, $ahref) = new_link_info(); # could easily add an index entry here... - return "
$aname" . $term . "\n
" . $_; + return "
$aname" . $term . "
\n
" . $_; } -- cgit v1.2.3