[Python-checkins] python/dist/src/Doc/perl l2hinit.perl, 1.74, 1.75 python.perl, 1.137, 1.138

fdrake at users.sourceforge.net fdrake at users.sourceforge.net
Mon Aug 4 21:45:39 EDT 2003


Update of /cvsroot/python/python/dist/src/Doc/perl
In directory sc8-pr-cvs1:/tmp/cvs-serv17524

Modified Files:
	l2hinit.perl python.perl 
Log Message:
make the portions of the generated HTML produced by these styles better
conform to XHTML rules.


Index: l2hinit.perl
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/perl/l2hinit.perl,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** l2hinit.perl	27 Jun 2003 18:26:01 -0000	1.74
--- l2hinit.perl	5 Aug 2003 03:45:37 -0000	1.75
***************
*** 27,31 ****
  
  $BODYTEXT = '';
! $CHILDLINE = "\n<p><hr>\n";
  $VERBOSITY = 0;
  
--- 27,31 ----
  
  $BODYTEXT = '';
! $CHILDLINE = "\n<p></p><hr />\n";
  $VERBOSITY = 0;
  
***************
*** 105,108 ****
--- 105,109 ----
          if ($title =~ /\<[aA] /) {
              $title =~ s/\<[aA] /<a class="sectref" rel="$linktype" /;
+             $title =~ s/ HREF=/ href=/;
          }
          else {
***************
*** 139,143 ****
      my $iconserver = ($ICONSERVER eq '.') ? '' : "$ICONSERVER/";
      return "<img src='$iconserver$name.$IMAGE_TYPE'\n  border='0'"
!            . " height='32'  alt='$text' width='32'>";
  }
  
--- 140,144 ----
      my $iconserver = ($ICONSERVER eq '.') ? '' : "$ICONSERVER/";
      return "<img src='$iconserver$name.$IMAGE_TYPE'\n  border='0'"
!            . " height='32'  alt='$text' width='32' />";
  }
  
***************
*** 158,161 ****
--- 159,163 ----
          }
          $s =~ s/<[aA] /<a rel="$rel" title="$title" \n  /;
+         $s =~ s/ HREF=/ href=/;
          return $s;
      }
***************
*** 203,207 ****
      $toc =~ s|\s*</[aA]>|</a>|g;
      $toc =~ s/ NAME=\"tex2html\d+\"\s*href=/ href=/gi;
!     $toc =~ s|</UL>(\s*<BR>)?|</ul>|gi;
      return $toc;
  }
--- 205,209 ----
      $toc =~ s|\s*</[aA]>|</a>|g;
      $toc =~ s/ NAME=\"tex2html\d+\"\s*href=/ href=/gi;
!     $toc =~ s|</UL>(\s*<BR( /)?>)?|</ul>|gi;
      return $toc;
  }
***************
*** 228,238 ****
      return "\n"
             . make_nav_panel()
!            . "<br><hr>\n";
  }
  
  sub bot_navigation_panel() {
!     return "\n<p><hr>\n"
             . make_nav_panel()
!            . "<hr>\n"
             . get_version_text()
             . "\n";
--- 230,240 ----
      return "\n"
             . make_nav_panel()
!            . "<br /><hr />\n";
  }
  
  sub bot_navigation_panel() {
!     return "\n<p></p><hr />\n"
             . make_nav_panel()
!            . "<hr />\n"
             . get_version_text()
             . "\n";
***************
*** 410,415 ****
      anchor_label('contents', $CURRENT_FILE, $_);	# this is added
      $MY_CONTENTS_PAGE = "$CURRENT_FILE";
!     join('', "<BR>\n\\tableofchildlinks[off]", $closures
! 	 , make_section_heading($toc_title, 'H2'), $toc_mark
  	 , $reopens, $_);
  }
--- 412,417 ----
      anchor_label('contents', $CURRENT_FILE, $_);	# this is added
      $MY_CONTENTS_PAGE = "$CURRENT_FILE";
!     join('', "<br />\n\\tableofchildlinks[off]", $closures
! 	 , make_section_heading($toc_title, 'h2'), $toc_mark
  	 , $reopens, $_);
  }
***************
*** 421,426 ****
      my($closures, $reopens) = preserve_open_tags();
      anchor_label('lof', $CURRENT_FILE, $_);		# this is added
!     join('', "<BR>\n", $closures
! 	 , make_section_heading($lof_title, 'H2'), $lof_mark
  	 , $reopens, $_);
  }
--- 423,428 ----
      my($closures, $reopens) = preserve_open_tags();
      anchor_label('lof', $CURRENT_FILE, $_);		# this is added
!     join('', "<br />\n", $closures
! 	 , make_section_heading($lof_title, 'h2'), $lof_mark
  	 , $reopens, $_);
  }
***************
*** 432,437 ****
      my($closures, $reopens) = preserve_open_tags();
      anchor_label('lot', $CURRENT_FILE, $_);		# this is added
!     join('', "<BR>\n", $closures
! 	 , make_section_heading($lot_title, 'H2'), $lot_mark
  	 , $reopens, $_);
  }
--- 434,439 ----
      my($closures, $reopens) = preserve_open_tags();
      anchor_label('lot', $CURRENT_FILE, $_);		# this is added
!     join('', "<br />\n", $closures
! 	 , make_section_heading($lot_title, 'h2'), $lot_mark
  	 , $reopens, $_);
  }
***************
*** 474,478 ****
      my($pre, $post) = minimize_open_tags($heading);
      anchor_label('genindex',$CURRENT_FILE,$_);		# this is added
!     return "<br>\n" . $pre . $_;
  }
  
--- 476,480 ----
      my($pre, $post) = minimize_open_tags($heading);
      anchor_label('genindex',$CURRENT_FILE,$_);		# this is added
!     return "<br />\n" . $pre . $_;
  }
  
***************
*** 485,489 ****
      anchor_label('modindex', $CURRENT_FILE, $_);
      $MODULE_INDEX_FILE = "$CURRENT_FILE";
!     $_ = ('<p>' . make_section_heading($idx_module_title, 'h2')
            . $idx_module_mark . $_);
      return $_;
--- 487,491 ----
      anchor_label('modindex', $CURRENT_FILE, $_);
      $MODULE_INDEX_FILE = "$CURRENT_FILE";
!     $_ = ('<p></p>' . make_section_heading($idx_module_title, 'h2')
            . $idx_module_mark . $_);
      return $_;
***************
*** 625,629 ****
      eval("\$title = ". $default_title ) unless ($title);
  
!     # allow user-modification of the <TITLE> tag; thanks Dan Young
      if (defined &custom_TITLE_hook) {
  	$title = &custom_TITLE_hook($title, $toc_sec_title);
--- 627,631 ----
      eval("\$title = ". $default_title ) unless ($title);
  
!     # allow user-modification of the <title> tag; thanks Dan Young
      if (defined &custom_TITLE_hook) {
  	$title = &custom_TITLE_hook($title, $toc_sec_title);
***************
*** 641,668 ****
              ($DOCTYPE ? $DTDcomment : ''),
              "<html>\n<head>",
!             ($BASE ? "\n<base href=\"$BASE\">" : ''),
!             "\n<link rel=\"STYLESHEET\" href=\"$STYLESHEET\" type='text/css'>",
              ($FAVORITES_ICON
!              ? ("\n<link rel=\"SHORTCUT ICON\" href=\"" . "$FAVORITES_ICON\">")
               : ''),
              ($EXTERNAL_UP_LINK
               ? ("\n<link rel='start' href='" . $EXTERNAL_UP_LINK
                  . ($EXTERNAL_UP_TITLE ?
!                    "' title='$EXTERNAL_UP_TITLE'>" : "'>"))
               : ''),
              "\n<link rel=\"first\" href=\"$FILE.html\"",
              ($t_title ? " title='$t_title'" : ''),
!             '>',
              ($HAVE_TABLE_OF_CONTENTS
               ? ("\n<link rel='contents' href='$MY_CONTENTS_PAGE'"
!                 . ' title="Contents">')
               : ''),
              ($HAVE_GENERAL_INDEX
!              ? "\n<link rel='index' href='genindex.html' title='Index'>"
               : ''),
              # disable for now -- Mozilla doesn't do well with multiple indexes
              # ($HAVE_MODULE_INDEX
!             #  ? '<link rel="index" href="modindex.html" title="Module Index">'
!             #    . "\n"
              #  : ''),
              ($INFO
--- 643,671 ----
              ($DOCTYPE ? $DTDcomment : ''),
              "<html>\n<head>",
!             ($BASE ? "\n<base href=\"$BASE\" />" : ''),
!             "\n<link rel=\"STYLESHEET\" href=\"$STYLESHEET\" type='text/css'",
!             " />",
              ($FAVORITES_ICON
!              ? ("\n<link rel=\"SHORTCUT ICON\" href=\"$FAVORITES_ICON\" />")
               : ''),
              ($EXTERNAL_UP_LINK
               ? ("\n<link rel='start' href='" . $EXTERNAL_UP_LINK
                  . ($EXTERNAL_UP_TITLE ?
!                    "' title='$EXTERNAL_UP_TITLE' />" : "' />"))
               : ''),
              "\n<link rel=\"first\" href=\"$FILE.html\"",
              ($t_title ? " title='$t_title'" : ''),
!             ' />',
              ($HAVE_TABLE_OF_CONTENTS
               ? ("\n<link rel='contents' href='$MY_CONTENTS_PAGE'"
!                 . ' title="Contents" />')
               : ''),
              ($HAVE_GENERAL_INDEX
!              ? "\n<link rel='index' href='genindex.html' title='Index' />"
               : ''),
              # disable for now -- Mozilla doesn't do well with multiple indexes
              # ($HAVE_MODULE_INDEX
!             #  ? '<link rel="index" href="modindex.html" title="Module Index"'
!             #    . " />\n"
              #  : ''),
              ($INFO
***************
*** 672,678 ****
               # rest of the Python doc tools.
               ? ("\n<link rel='last' href='about.html'"
!                 . " title='About this document...'>"
                  . "\n<link rel='help' href='about.html'"
!                 . " title='About this document...'>")
               : ''),
              $more_links_mark,
--- 675,681 ----
               # rest of the Python doc tools.
               ? ("\n<link rel='last' href='about.html'"
!                 . " title='About this document...' />"
                  . "\n<link rel='help' href='about.html'"
!                 . " title='About this document...' />")
               : ''),
              $more_links_mark,
***************
*** 680,687 ****
              ($CHARSET && $HTML_VERSION ge "2.1"
               ? ('<meta http-equiv="Content-Type" content="text/html; '
!                 . "charset=$CHARSET\">\n")
               : ''),
              ($AESOP_META_TYPE
!              ? "<meta name='aesop' content='$AESOP_META_TYPE'>\n" : ''));
      }
      if (!$charset && $CHARSET) {
--- 683,690 ----
              ($CHARSET && $HTML_VERSION ge "2.1"
               ? ('<meta http-equiv="Content-Type" content="text/html; '
!                 . "charset=$CHARSET\" />\n")
               : ''),
              ($AESOP_META_TYPE
!              ? "<meta name='aesop' content='$AESOP_META_TYPE' />\n" : ''));
      }
      if (!$charset && $CHARSET) {
***************
*** 693,701 ****
      my $metatitle = "$title";
      $metatitle =~ s/^\d+(\.\d+)*\s*//;
  
      join('',
           $MY_PARTIAL_HEADER,
!          &meta_information($metatitle),
           "<title>", $title, "</title>\n</head>\n<body$body>");
  }
  
--- 696,713 ----
      my $metatitle = "$title";
      $metatitle =~ s/^\d+(\.\d+)*\s*//;
+     $metatitle = meta_information($metatitle);
+     $metatitle =~ s/ NAME=/ name=/g;
+     $metatitle =~ s/ CONTENT=/ content=/g;
  
      join('',
           $MY_PARTIAL_HEADER,
!          $metatitle,
           "<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;
  }
  

Index: python.perl
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/perl/python.perl,v
retrieving revision 1.137
retrieving revision 1.138
diff -C2 -d -r1.137 -r1.138
*** python.perl	16 Jul 2003 14:01:56 -0000	1.137
--- python.perl	5 Aug 2003 03:45:37 -0000	1.138
***************
*** 52,56 ****
                     : '')
                  . " alt=\"[off-site link]\"\n"
!                 . "  >");
      }
      return '';
--- 52,56 ----
                     : '')
                  . " alt=\"[off-site link]\"\n"
!                 . "  />");
      }
      return '';
***************
*** 346,351 ****
      my $nstr = gen_index_id("Python Enhancement Proposals!PEP $rfcnumber", '');
      $index{$nstr} .= make_half_href("$CURRENT_FILE#$id");
!     return ("<a class=\"rfc\" name=\"$id\"\nhref=\"$href\">PEP $rfcnumber"
!             . "$icon</a>" . $_);
  }
  
--- 346,351 ----
      my $nstr = gen_index_id("Python Enhancement Proposals!PEP $rfcnumber", '');
      $index{$nstr} .= make_half_href("$CURRENT_FILE#$id");
!     return ("<a class=\"rfc\" name=\"$id\" id='$id'\n"
!             . "href=\"$href\">PEP $rfcnumber$icon</a>" . $_);
  }
  
***************
*** 359,364 ****
      my $nstr = gen_index_id("RFC!RFC $rfcnumber", '');
      $index{$nstr} .= make_half_href("$CURRENT_FILE#$id");
!     return ("<a class=\"rfc\" name=\"$id\"\nhref=\"$href\">RFC $rfcnumber"
!             . "$icon</a>" . $_);
  }
  
--- 359,364 ----
      my $nstr = gen_index_id("RFC!RFC $rfcnumber", '');
      $index{$nstr} .= make_half_href("$CURRENT_FILE#$id");
!     return ("<a class=\"rfc\" name=\"$id\" id='$id'\nhref=\"$href\">"
!             . "RFC $rfcnumber$icon</a>" . $_);
  }
  
***************
*** 395,399 ****
      return ('<div class="versionnote">'
              . "<b>Deprecated since release $release.</b>"
!             . "\n$reason</div><p>"
              . $_);
  }
--- 395,399 ----
      return ('<div class="versionnote">'
              . "<b>Deprecated since release $release.</b>"
!             . "\n$reason</div><p></p>"
              . $_);
  }
***************
*** 513,517 ****
  sub new_link_info(){
      my $name = "l2h-" . ++$globals{'max_id'};
!     my $aname = "<a name=\"$name\">";
      my $ahref = gen_link($CURRENT_FILE, $name);
      return ($name, $aname, $ahref);
--- 513,517 ----
  sub new_link_info(){
      my $name = "l2h-" . ++$globals{'max_id'};
!     my $aname = "<a name=\"$name\" id='$name'>";
      my $ahref = gen_link($CURRENT_FILE, $name);
      return ($name, $aname, $ahref);
***************
*** 811,815 ****
      $TokenToTargetMapping{"$CURRENT_GRAMMAR:$token"} = $target;
      return ("<tr valign=\"baseline\">\n"
!             . "    <td><code><a name=\"tok-$token\">$token</a></code></td>\n"
              . "    <td>&nbsp;::=&nbsp;</td>\n"
              . "    <td><code>"
--- 811,816 ----
      $TokenToTargetMapping{"$CURRENT_GRAMMAR:$token"} = $target;
      return ("<tr valign=\"baseline\">\n"
!             . "    <td><code><a name=\"tok-$token\" id='tok-$token'>"
!             . "$token</a></code></td>\n"
              . "    <td>&nbsp;::=&nbsp;</td>\n"
              . "    <td><code>"
***************
*** 963,970 ****
                     . "\n</div>");
      }
!     return "<dl><dt>$siginfo\n<dd>"
             . $rcinfo
             . $_
!            . '</dl>';
  }
  
--- 964,971 ----
                     . "\n</div>");
      }
!     return "<dl><dt>$siginfo</dt>\n<dd>"
             . $rcinfo
             . $_
!            . '</dd></dl>';
  }
  
***************
*** 977,981 ****
                                     . " ($container member)");
      $idx =~ s/ \(.*\)//;
!     return "<dt>$type <b>$idx</b>\n<dd>"
             . $_;
  }
--- 978,982 ----
                                     . " ($container member)");
      $idx =~ s/ \(.*\)//;
!     return "<dt>$type <b>$idx</b></dt>\n<dd>"
             . $_;
  }
***************
*** 988,992 ****
                                     . " ($container member)");
      $idx =~ s/ \(.*\)//;
!     return "<dl><dt>$type <b>$idx</b>\n<dd>"
             . $_
             . '</dl>';
--- 989,993 ----
                                     . " ($container member)");
      $idx =~ s/ \(.*\)//;
!     return "<dl><dt>$type <b>$idx</b></dt>\n<dd>"
             . $_
             . '</dl>';
***************
*** 997,1001 ****
      my $name = next_argument();
      my $idx = make_str_index_entry("<tt class=\"macro\">$name</tt>");
!     return "<dl><dt><b>$idx</b>\n<dd>"
             . $_
             . '</dl>'
--- 998,1002 ----
      my $name = next_argument();
      my $idx = make_str_index_entry("<tt class=\"macro\">$name</tt>");
!     return "<dl><dt><b>$idx</b></dt>\n<dd>"
             . $_
             . '</dl>'
***************
*** 1010,1014 ****
      my($name, $aname, $ahref) = new_link_info();
      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>"
             . $_
             . '</dl>'
--- 1011,1016 ----
      my($name, $aname, $ahref) = new_link_info();
      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></dt>"
!            . "\n<dd>"
             . $_
             . '</dl>'
***************
*** 1022,1029 ****
  				   . get_indexsubitem());
      $idx =~ s/ \(.*\)//;
!     return "<dl><dt>$var_type <b>$idx</b>\n"
             . '<dd>'
             . $_
!            . '</dl>';
  }
  
--- 1024,1031 ----
  				   . get_indexsubitem());
      $idx =~ s/ \(.*\)//;
!     return "<dl><dt>$var_type <b>$idx</b></dt>\n"
             . '<dd>'
             . $_
!            . '</dd></dl>';
  }
  
***************
*** 1039,1043 ****
              . '<dt><table cellpadding="0" cellspacing="0"><tr valign="baseline">'
              . "\n  <td><nobr><b>$idxitem</b>(</nobr></td>"
!             . "\n  <td><var>$arglist</var>)</td></tr></table>\n<dd>");
  }
  
--- 1041,1045 ----
              . '<dt><table cellpadding="0" cellspacing="0"><tr valign="baseline">'
              . "\n  <td><nobr><b>$idxitem</b>(</nobr></td>"
!             . "\n  <td><var>$arglist</var>)</td></tr></table></dt>\n<dd>");
  }
  
***************
*** 1105,1109 ****
  	$stuff .= "&nbsp;&nbsp;&nbsp;&nbsp;<var>$arg_list</var>";
      }
!     return $stuff . "\n<dd>" . $_ . '</dl>';
  }
  
--- 1107,1111 ----
  	$stuff .= "&nbsp;&nbsp;&nbsp;&nbsp;<var>$arg_list</var>";
      }
!     return $stuff . "</dt>\n<dd>" . $_ . '</dt></dl>';
  }
  
***************
*** 1113,1119 ****
      my $idx = make_str_index_entry("<tt>$dataname</tt>" . get_indexsubitem());
      $idx =~ s/ \(.*\)//;
!     return "<dl><dt><b>$idx</b>\n<dd>"
             . $_
! 	   . '</dl>';
  }
  
--- 1115,1121 ----
      my $idx = make_str_index_entry("<tt>$dataname</tt>" . get_indexsubitem());
      $idx =~ s/ \(.*\)//;
!     return "<dl><dt><b>$idx</b></dt>\n<dd>"
             . $_
! 	   . '</dd></dl>';
  }
  
***************
*** 1124,1128 ****
  	$idx = "<tt>$idx</tt>";
      }
!     return "<dl><dt><b>$idx</b>\n<dd>" . $_ . '</dl>';
  }
  
--- 1126,1130 ----
  	$idx = "<tt>$idx</tt>";
      }
!     return "<dl><dt><b>$idx</b></dt>\n<dd>" . $_ . '</dd></dl>';
  }
  
***************
*** 1132,1136 ****
      my $idx = make_str_index_entry("<tt>$data_name</tt>" . get_indexsubitem());
      $idx =~ s/ \(.*\)//;
!     return "<dt><b>$idx</b><dd>" . $_;
  }
  
--- 1134,1138 ----
      my $idx = make_str_index_entry("<tt>$data_name</tt>" . get_indexsubitem());
      $idx =~ s/ \(.*\)//;
!     return "<dt><b>$idx</b></dt><dd>" . $_;
  }
  
***************
*** 1138,1142 ****
      local($_) = @_;
      my $data_name = next_argument();
!     return "<dt><b><tt>$data_name</tt></b><dd>" . $_;
  }
  
--- 1140,1144 ----
      local($_) = @_;
      my $data_name = next_argument();
!     return "<dt><b><tt>$data_name</tt></b></dt><dd>" . $_;
  }
  
***************
*** 1145,1152 ****
      my $excname = next_argument();
      my $idx = make_str_index_entry("<tt class=\"exception\">$excname</tt>");
!     return ("<dl><dt><b>${TLSTART}exception$TLEND$idx</b>"
              . "\n<dd>"
              . $_
!             . '</dl>');
  }
  
--- 1147,1154 ----
      my $excname = next_argument();
      my $idx = make_str_index_entry("<tt class=\"exception\">$excname</tt>");
!     return ("<dl><dt><b>${TLSTART}exception$TLEND$idx</b></dt>"
              . "\n<dd>"
              . $_
!             . '</dd></dl>');
  }
  
***************
*** 1252,1256 ****
      $idx =~ s/ \(.*\)//;
      $idx =~ s/\(\)//;
!     return "<dl><dt><b>$idx</b>\n<dd>" . $_ . '</dl>';
  }
  
--- 1254,1258 ----
      $idx =~ s/ \(.*\)//;
      $idx =~ s/\(\)//;
!     return "<dl><dt><b>$idx</b></dt>\n<dd>" . $_ . '</dl>';
  }
  
***************
*** 1268,1272 ****
      $idx =~ s/ \(.*\)//;
      $idx =~ s/\(\)//;
!     return "<dt><b>$idx</b><dd>" . $_;
  }
  
--- 1270,1274 ----
      $idx =~ s/ \(.*\)//;
      $idx =~ s/\(\)//;
!     return "<dt><b>$idx</b></dt><dd>" . $_;
  }
  
***************
*** 1276,1282 ****
      next_optional_argument();
      my $member = next_argument();
!     return "<dl><dt><b><tt class=\"member\">$member</tt></b>\n<dd>"
             . $_
!            . '</dl>';
  }
  
--- 1278,1284 ----
      next_optional_argument();
      my $member = next_argument();
!     return "<dl><dt><b><tt class=\"member\">$member</tt></b></dt>\n<dd>"
             . $_
!            . '</dd></dl>';
  }
  
***************
*** 1286,1290 ****
      next_optional_argument();
      my $member = next_argument();
!     return "<dt><b><tt class=\"member\">$member</tt></b><dd>" . $_;
  }
  
--- 1288,1292 ----
      next_optional_argument();
      my $member = next_argument();
!     return "<dt><b><tt class=\"member\">$member</tt></b></dt>\n<dd>" . $_;
  }
  
***************
*** 1636,1640 ****
  	if ($PACKAGE_VERSION) {
  	    $the_title .= ('<strong>Release '
!                            . "$PACKAGE_VERSION$RELEASE_INFO</strong><br>\n");
          }
  	$the_title .= "<strong>$t_date</strong></p>"
--- 1638,1642 ----
  	if ($PACKAGE_VERSION) {
  	    $the_title .= ('<strong>Release '
!                            . "$PACKAGE_VERSION$RELEASE_INFO</strong><br />\n");
          }
  	$the_title .= "<strong>$t_date</strong></p>"
***************
*** 1644,1648 ****
      }
      else {
!         $the_title .= "\n<p>";
      }
      if ($t_email) {
--- 1646,1650 ----
      }
      else {
!         $the_title .= "\n<p></p>";
      }
      if ($t_email) {
***************
*** 1662,1666 ****
      $graphic .= " height=\"$TITLE_PAGE_GRAPHIC_HEIGHT\""
        if ($TITLE_PAGE_GRAPHIC_HEIGHT);
!     $graphic .= "\n  src=\"$filename\"></td>\n";
      return $graphic;
  }
--- 1664,1668 ----
      $graphic .= " height=\"$TITLE_PAGE_GRAPHIC_HEIGHT\""
        if ($TITLE_PAGE_GRAPHIC_HEIGHT);
!     $graphic .= "\n  src=\"$filename\" /></td>\n";
      return $graphic;
  }
***************
*** 1670,1674 ****
      my $the_title = "\n";
      if ($EXTERNAL_UP_LINK) {
!         # This generates a <LINK> 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
--- 1672,1676 ----
      my $the_title = "\n";
      if ($EXTERNAL_UP_LINK) {
!         # This generates a <link> 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
***************
*** 1677,1681 ****
                         . ($EXTERNAL_UP_TITLE
                            ? " title='$EXTERNAL_UP_TITLE'" : '')
!                        . ">\n");
      }
      $the_title .= '<div class="titlepage">';
--- 1679,1683 ----
                         . ($EXTERNAL_UP_TITLE
                            ? " title='$EXTERNAL_UP_TITLE'" : '')
!                        . " />\n");
      }
      $the_title .= '<div class="titlepage">';
***************
*** 1898,1909 ****
          return '<dl compact class="seetitle">'
            . "\n    <dt><em class=\"citetitle\"><a href=\"$url\""
!           . "\n        >$title$icon</a></em>"
!           . "\n    <dd>$text\n  </dl>"
            . $_;
      }
      return '<dl compact class="seetitle">'
        . "\n    <dt><em class=\"citetitle\""
!       . "\n        >$title</em>"
!       . "\n    <dd>$text\n  </dl>"
        . $_;
  }
--- 1900,1911 ----
          return '<dl compact class="seetitle">'
            . "\n    <dt><em class=\"citetitle\"><a href=\"$url\""
!           . "\n        >$title$icon</a></em></dt>"
!           . "\n    <dd>$text</dd>\n  </dl>"
            . $_;
      }
      return '<dl compact class="seetitle">'
        . "\n    <dt><em class=\"citetitle\""
!       . "\n        >$title</em></dt>"
!       . "\n    <dd>$text</dd>\n  </dl>"
        . $_;
  }
***************
*** 1916,1921 ****
      return '<dl compact class="seeurl">'
        . "\n    <dt><a href=\"$url\""
!       . "\n        class=\"url\">$url$icon</a>"
!       . "\n    <dd>$text\n  </dl>"
        . $_;
  }
--- 1918,1923 ----
      return '<dl compact class="seeurl">'
        . "\n    <dt><a href=\"$url\""
!       . "\n        class=\"url\">$url$icon</a></dt>"
!       . "\n    <dd>$text</dd>\n  </dl>"
        . $_;
  }
***************
*** 1924,1928 ****
      local($_) = @_;
      my $content = next_argument();
!     return '<div class="seetext"><p>' . $content . '</div>' . $_;
  }
  
--- 1926,1930 ----
      local($_) = @_;
      my $content = next_argument();
!     return '<div class="seetext"><p>' . $content . '</p></div>' . $_;
  }
  
***************
*** 1933,1937 ****
  
  sub do_env_definitions{
!     return "<dl class=\"definitions\">" . $_[0] . "</dl>\n";
  }
  
--- 1935,1939 ----
  
  sub do_env_definitions{
!     return '<dl class="definitions">' . $_[0] . "</dl>\n";
  }
  
***************
*** 1941,1945 ****
      my($name, $aname, $ahref) = new_link_info();
      # could easily add an index entry here...
!     return "<dt><b>$aname" . $term . "</a></b>\n<dd>" . $_;
  }
  
--- 1943,1947 ----
      my($name, $aname, $ahref) = new_link_info();
      # could easily add an index entry here...
!     return "<dt><b>$aname" . $term . "</a></b></dt>\n<dd>" . $_;
  }
  





More information about the Python-checkins mailing list