[Python-checkins] python/dist/src/Doc/perl python.perl,1.142,1.143

[fdrake at users.sourceforge.net]

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

Modified Files:
	python.perl 
Log Message:
- clean up generated HTML
- make the output more XHTML friendly


Index: python.perl
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/perl/python.perl,v
retrieving revision 1.142
retrieving revision 1.143
diff -C2 -d -r1.142 -r1.143
*** python.perl	5 Sep 2003 15:43:58 -0000	1.142
--- python.perl	26 Nov 2003 20:55:49 -0000	1.143
***************
*** 346,350 ****
      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>" . $_);
  }
--- 346,350 ----
      my $nstr = gen_index_id("Python Enhancement Proposals!PEP $rfcnumber", '');
      $index{$nstr} .= make_half_href("$CURRENT_FILE#$id");
!     return ("<a class=\"rfc\" id='$id'\n"
              . "href=\"$href\">PEP $rfcnumber$icon</a>" . $_);
  }
***************
*** 359,363 ****
      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>" . $_);
  }
--- 359,363 ----
      my $nstr = gen_index_id("RFC!RFC $rfcnumber", '');
      $index{$nstr} .= make_half_href("$CURRENT_FILE#$id");
!     return ("<a class=\"rfc\" id='$id'\nhref=\"$href\">"
              . "RFC $rfcnumber$icon</a>" . $_);
  }
***************
*** 511,518 ****
  }
  
! 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);
  }
--- 511,524 ----
  }
  
! sub new_link_name_info(){
      my $name = "l2h-" . ++$globals{'max_id'};
!     my $aname = "<a id='$name'>";
      my $ahref = gen_link($CURRENT_FILE, $name);
+     return ($name, $ahref);
+ }
+ 
+ sub new_link_info(){
+     my($name, $ahref) = new_link_name_info();
+     my $aname = "<a id='$name'>";
      return ($name, $aname, $ahref);
  }
***************
*** 739,745 ****
  sub make_str_index_entry($){
      my $str = $_[0];
!     my($name, $aname, $ahref) = new_link_info();
      add_index_entry($str, $ahref);
!     return "$aname$str</a>";
  }
  
--- 745,758 ----
  sub make_str_index_entry($){
      my $str = $_[0];
!     my($name, $ahref) = new_link_name_info();
      add_index_entry($str, $ahref);
!     if ($str =~ /^<[a-z]+\b/) {
!         my $s = "$str";
!         $s =~ s/^<([a-z]+)\b/<$1 id='$name'/;
!         return $s;
!     }
!     else {
!         return "<a id='$name'>$str</a>";
!     }
  }
  
***************
*** 818,822 ****
      $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"
--- 831,835 ----
      $TokenToTargetMapping{"$CURRENT_GRAMMAR:$token"} = $target;
      return ("<tr valign=\"baseline\">\n"
!             . "    <td><code><a id='tok-$token'>"
              . "$token</a></code></td>\n"
              . "    <td>&nbsp;::=&nbsp;</td>\n"