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

fdrake at users.sourceforge.net fdrake at users.sourceforge.net
Fri Sep 5 09:44:00 EDT 2003


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

Modified Files:
	python.perl 
Log Message:
normalize whitespace; detabify


Index: python.perl
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/perl/python.perl,v
retrieving revision 1.141
retrieving revision 1.142
diff -C2 -d -r1.141 -r1.142
*** python.perl	5 Sep 2003 15:43:00 -0000	1.141
--- python.perl	5 Sep 2003 15:43:58 -0000	1.142
***************
*** 1,3 ****
! # python.perl by Fred L. Drake, Jr. <fdrake at acm.org>		-*- perl -*-
  #
  # Heavily based on Guido van Rossum's myformat.perl (now obsolete).
--- 1,3 ----
! # python.perl by Fred L. Drake, Jr. <fdrake at acm.org>            -*- perl -*-
  #
  # Heavily based on Guido van Rossum's myformat.perl (now obsolete).
***************
*** 17,21 ****
      $param = missing_braces()
        unless ((s/$next_pair_pr_rx/$param=$2;''/eo)
! 	      ||(s/$next_pair_rx/$param=$2;''/eo));
      return $param;
  }
--- 17,21 ----
      $param = missing_braces()
        unless ((s/$next_pair_pr_rx/$param=$2;''/eo)
!               ||(s/$next_pair_rx/$param=$2;''/eo));
      return $param;
  }
***************
*** 66,83 ****
      s/[\\]([a-zA-Z]+)\s*(=\s*)?[\\]([a-zA-Z]*)/$matched=1; ''/e;
      if ($matched) {
! 	my($new, $old) = ($1, $3);
! 	eval "sub do_cmd_$new { do_cmd_$old" . '(@_); }';
! 	print "\ndefining handler for \\$new using \\$old\n";
      }
      else {
! 	s/[\\]([a-zA-Z]+)\s*(=\s*)?([^\\])/$matched=1; ''/es;
! 	if ($matched) {
! 	    my($new, $char) = ($1, $3);
! 	    eval "sub do_cmd_$new { \"\\$char\" . \$_[0]; }";
! 	    print "\ndefining handler for \\$new to insert '$char'\n";
! 	}
! 	else {
! 	    write_warnings("Could not interpret \\let construct...");
! 	}
      }
      return $_;
--- 66,83 ----
      s/[\\]([a-zA-Z]+)\s*(=\s*)?[\\]([a-zA-Z]*)/$matched=1; ''/e;
      if ($matched) {
!         my($new, $old) = ($1, $3);
!         eval "sub do_cmd_$new { do_cmd_$old" . '(@_); }';
!         print "\ndefining handler for \\$new using \\$old\n";
      }
      else {
!         s/[\\]([a-zA-Z]+)\s*(=\s*)?([^\\])/$matched=1; ''/es;
!         if ($matched) {
!             my($new, $char) = ($1, $3);
!             eval "sub do_cmd_$new { \"\\$char\" . \$_[0]; }";
!             print "\ndefining handler for \\$new to insert '$char'\n";
!         }
!         else {
!             write_warnings("Could not interpret \\let construct...");
!         }
      }
      return $_;
***************
*** 305,309 ****
      # the variable name case-insensitive.
      add_index_entry("environment variables!$envvar@<tt>$envvar</tt>",
! 		    $ahref);
      add_index_entry("$envvar (environment variable)", $ahref);
      $aname =~ s/<a/<a class="envvar"/;
--- 305,309 ----
      # the variable name case-insensitive.
      add_index_entry("environment variables!$envvar@<tt>$envvar</tt>",
!                     $ahref);
      add_index_entry("$envvar (environment variable)", $ahref);
      $aname =~ s/<a/<a class="envvar"/;
***************
*** 484,488 ****
  open(INTLABELS, '>intlabels.pl') || die "\n$!\n";
  print INTLABELS "%internal_labels = ();\n";
! print INTLABELS "1;		# hack in case there are no entries\n\n";
  
  # Using \0 for this is bad because we can't use common tools to work with the
--- 484,488 ----
  open(INTLABELS, '>intlabels.pl') || die "\n$!\n";
  print INTLABELS "%internal_labels = ();\n";
! print INTLABELS "1;             # hack in case there are no entries\n\n";
  
  # Using \0 for this is bad because we can't use common tools to work with the
***************
*** 523,538 ****
      my $i = 0;
      for (; $i < $count; ++$i) {
! 	my $name = $_[$i];
! 	my $cmd = "idx_cmd_$name";
! 	die "\nNo function $cmd() defined!\n"
! 	  if (!defined &$cmd);
! 	eval ("sub do_cmd_$name { return process_index_macros("
! 	      . "\$_[0], '$name'); }");
! 	if (length($IndexMacroPattern) == 0) {
! 	    $IndexMacroPattern = "$name";
! 	}
! 	else {
! 	    $IndexMacroPattern .= "|$name";
! 	}
      }
  }
--- 523,538 ----
      my $i = 0;
      for (; $i < $count; ++$i) {
!         my $name = $_[$i];
!         my $cmd = "idx_cmd_$name";
!         die "\nNo function $cmd() defined!\n"
!           if (!defined &$cmd);
!         eval ("sub do_cmd_$name { return process_index_macros("
!               . "\$_[0], '$name'); }");
!         if (length($IndexMacroPattern) == 0) {
!             $IndexMacroPattern = "$name";
!         }
!         else {
!             $IndexMacroPattern .= "|$name";
!         }
      }
  }
***************
*** 541,563 ****
  sub process_index_macros($$){
      local($_) = @_;
!     my $cmdname = $_[1];	# This is what triggered us in the first place;
! 				# we know it's real, so just process it.
      my($name, $aname, $ahref) = new_link_info();
      my $cmd = "idx_cmd_$cmdname";
      print "\nIndexing: \\$cmdname"
        if $DEBUG_INDEXING;
!     &$cmd($ahref);		# modifies $_ and adds index entries
      while (/^[\s\n]*\\($IndexMacroPattern)</) {
! 	$cmdname = "$1";
! 	print " \\$cmdname"
! 	  if $DEBUG_INDEXING;
! 	$cmd = "idx_cmd_$cmdname";
! 	if (!defined &$cmd) {
! 	    last;
! 	}
! 	else {
! 	    s/^[\s\n]*\\$cmdname//;
! 	    &$cmd($ahref);
! 	}
      }
      if (/^[ \t\r\n]/) {
--- 541,563 ----
  sub process_index_macros($$){
      local($_) = @_;
!     my $cmdname = $_[1];        # This is what triggered us in the first place;
!                                 # we know it's real, so just process it.
      my($name, $aname, $ahref) = new_link_info();
      my $cmd = "idx_cmd_$cmdname";
      print "\nIndexing: \\$cmdname"
        if $DEBUG_INDEXING;
!     &$cmd($ahref);              # modifies $_ and adds index entries
      while (/^[\s\n]*\\($IndexMacroPattern)</) {
!         $cmdname = "$1";
!         print " \\$cmdname"
!           if $DEBUG_INDEXING;
!         $cmd = "idx_cmd_$cmdname";
!         if (!defined &$cmd) {
!             last;
!         }
!         else {
!             s/^[\s\n]*\\$cmdname//;
!             &$cmd($ahref);
!         }
      }
      if (/^[ \t\r\n]/) {
***************
*** 649,656 ****
  
      if ($define eq 'DEF') {
! 	# add to the module index
          $str =~ /(<tt.*<\/tt>)/;
          my $nstr = $1;
! 	$Modules{$nstr} .= $ahref;
      }
      return "$aname$anchor_invisible_mark2</a>";
--- 649,656 ----
  
      if ($define eq 'DEF') {
!         # add to the module index
          $str =~ /(<tt.*<\/tt>)/;
          my $nstr = $1;
!         $Modules{$nstr} .= $ahref;
      }
      return "$aname$anchor_invisible_mark2</a>";
***************
*** 665,672 ****
      my $section_tag = join('', @curr_sec_id);
      if ($word ne "built-in" && $word ne "extension"
! 	&& $word ne "standard" && $word ne "") {
! 	write_warnings("Bad module type '$word'"
! 		       . " for \\declaremodule (module $name)");
! 	$word = "";
      }
      $word = "$word " if $word;
--- 665,672 ----
      my $section_tag = join('', @curr_sec_id);
      if ($word ne "built-in" && $word ne "extension"
!         && $word ne "standard" && $word ne "") {
!         write_warnings("Bad module type '$word'"
!                        . " for \\declaremodule (module $name)");
!         $word = "";
      }
      $word = "$word " if $word;
***************
*** 707,711 ****
  # these should be adjusted a bit....
  define_indexing_macro('refmodindex', 'refbimodindex',
! 		      'refexmodindex', 'refstmodindex');
  sub idx_cmd_refmodindex($){
      return ref_module_index_helper('', $_[0]); }
--- 707,711 ----
  # these should be adjusted a bit....
  define_indexing_macro('refmodindex', 'refbimodindex',
!                       'refexmodindex', 'refstmodindex');
  sub idx_cmd_refmodindex($){
      return ref_module_index_helper('', $_[0]); }
***************
*** 898,904 ****
  
      my($myname, $mydir, $myext) = fileparse(__FILE__, '\..*');
!     chop $mydir;			# remove trailing '/'
      ($myname, $mydir, $myext) = fileparse($mydir, '\..*');
!     chop $mydir;			# remove trailing '/'
      $mydir = getcwd() . "$dd$mydir"
        unless $mydir =~ s|^/|/|;
--- 898,904 ----
  
      my($myname, $mydir, $myext) = fileparse(__FILE__, '\..*');
!     chop $mydir;                        # remove trailing '/'
      ($myname, $mydir, $myext) = fileparse($mydir, '\..*');
!     chop $mydir;                        # remove trailing '/'
      $mydir = getcwd() . "$dd$mydir"
        unless $mydir =~ s|^/|/|;
***************
*** 932,936 ****
          "<tt class=\"cfunction\">$name()</tt>" . get_indexsubitem());
      $idx =~ s/ \(.*\)//;
!     $idx =~ s/\(\)//;		# ???? - why both of these?
      $args =~ s/(\s|\*)([a-z_][a-z_0-9]*),/$1<var>$2<\/var>,/g;
      $args =~ s/(\s|\*)([a-z_][a-z_0-9]*)$/$1<var>$2<\/var>/s;
--- 932,936 ----
          "<tt class=\"cfunction\">$name()</tt>" . get_indexsubitem());
      $idx =~ s/ \(.*\)//;
!     $idx =~ s/\(\)//;           # ???? - why both of these?
      $args =~ s/(\s|\*)([a-z_][a-z_0-9]*),/$1<var>$2<\/var>,/g;
      $args =~ s/(\s|\*)([a-z_][a-z_0-9]*)$/$1<var>$2<\/var>/s;
***************
*** 1029,1033 ****
      my $var_name = next_argument();
      my $idx = make_str_index_entry("<tt class=\"cdata\">$var_name</tt>"
! 				   . get_indexsubitem());
      $idx =~ s/ \(.*\)//;
      return "<dl><dt>$var_type <b>$idx</b></dt>\n"
--- 1029,1033 ----
      my $var_name = next_argument();
      my $idx = make_str_index_entry("<tt class=\"cdata\">$var_name</tt>"
!                                    . get_indexsubitem());
      $idx =~ s/ \(.*\)//;
      return "<dl><dt>$var_type <b>$idx</b></dt>\n"
***************
*** 1057,1061 ****
      my $idx = make_str_index_entry("<tt class=\"function\">$function_name()"
                                     . '</tt>'
! 				   . get_indexsubitem());
      $idx =~ s/ \(.*\)//;
      $idx =~ s/\(\)<\/tt>/<\/tt>/;
--- 1057,1061 ----
      my $idx = make_str_index_entry("<tt class=\"function\">$function_name()"
                                     . '</tt>'
!                                    . get_indexsubitem());
      $idx =~ s/ \(.*\)//;
      $idx =~ s/\(\)<\/tt>/<\/tt>/;
***************
*** 1103,1116 ****
      my $idx;
      if ($INDEX_OPCODES) {
! 	$idx = make_str_index_entry("<tt class=\"opcode\">$opcode_name</tt>"
                                      . ' (byte code instruction)');
! 	$idx =~ s/ \(byte code instruction\)//;
      }
      else {
! 	$idx = "<tt class=\"opcode\">$opcode_name</tt>";
      }
      my $stuff = "<dl><dt><b>$idx</b>";
      if ($arg_list) {
! 	$stuff .= "&nbsp;&nbsp;&nbsp;&nbsp;<var>$arg_list</var>";
      }
      return $stuff . "</dt>\n<dd>" . $_ . '</dt></dl>';
--- 1103,1116 ----
      my $idx;
      if ($INDEX_OPCODES) {
!         $idx = make_str_index_entry("<tt class=\"opcode\">$opcode_name</tt>"
                                      . ' (byte code instruction)');
!         $idx =~ s/ \(byte code instruction\)//;
      }
      else {
!         $idx = "<tt class=\"opcode\">$opcode_name</tt>";
      }
      my $stuff = "<dl><dt><b>$idx</b>";
      if ($arg_list) {
!         $stuff .= "&nbsp;&nbsp;&nbsp;&nbsp;<var>$arg_list</var>";
      }
      return $stuff . "</dt>\n<dd>" . $_ . '</dt></dl>';
***************
*** 1124,1128 ****
      return "<dl><dt><b>$idx</b></dt>\n<dd>"
             . $_
! 	   . '</dd></dl>';
  }
  
--- 1124,1128 ----
      return "<dl><dt><b>$idx</b></dt>\n<dd>"
             . $_
!            . '</dd></dl>';
  }
  
***************
*** 1131,1135 ****
      my $idx = next_argument();
      if (! $STRING_INDEX_TT) {
! 	$idx = "<tt>$idx</tt>";
      }
      return "<dl><dt><b>$idx</b></dt>\n<dd>" . $_ . '</dd></dl>';
--- 1131,1135 ----
      my $idx = next_argument();
      if (! $STRING_INDEX_TT) {
!         $idx = "<tt>$idx</tt>";
      }
      return "<dl><dt><b>$idx</b></dt>\n<dd>" . $_ . '</dd></dl>';
***************
*** 1168,1172 ****
      my $arg_list = convert_args(next_argument());
      $idx = make_str_index_entry(
! 	"<tt class=\"$what\">$THIS_CLASS</tt> ($what in $THIS_MODULE)" );
      $idx =~ s/ \(.*\)//;
      my $prefix = "$TLSTART$what$TLEND$idx";
--- 1168,1172 ----
      my $arg_list = convert_args(next_argument());
      $idx = make_str_index_entry(
!         "<tt class=\"$what\">$THIS_CLASS</tt> ($what in $THIS_MODULE)" );
      $idx =~ s/ \(.*\)//;
      my $prefix = "$TLSTART$what$TLEND$idx";
***************
*** 1182,1186 ****
      $THIS_CLASS = next_argument();
      $idx = make_str_index_entry(
! 	"<tt class=\"class\">$THIS_CLASS</tt> (class in $THIS_MODULE)");
      $idx =~ s/ \(.*\)//;
      my $prefix = "${TLSTART}class$TLEND$idx";
--- 1182,1186 ----
      $THIS_CLASS = next_argument();
      $idx = make_str_index_entry(
!         "<tt class=\"class\">$THIS_CLASS</tt> (class in $THIS_MODULE)");
      $idx =~ s/ \(.*\)//;
      my $prefix = "${TLSTART}class$TLEND$idx";
***************
*** 1203,1207 ****
      my $extra = '';
      if ($class_name) {
! 	$extra = " ($class_name method)";
      }
      my $idx = make_str_index_entry(
--- 1203,1207 ----
      my $extra = '';
      if ($class_name) {
!         $extra = " ($class_name method)";
      }
      my $idx = make_str_index_entry(
***************
*** 1222,1226 ****
      my $extra = '';
      if ($class_name) {
! 	$extra = " ($class_name method)";
      }
      my $idx = make_str_index_entry(
--- 1222,1226 ----
      my $extra = '';
      if ($class_name) {
!         $extra = " ($class_name method)";
      }
      my $idx = make_str_index_entry(
***************
*** 1384,1397 ****
      s/\\lineii</\\lineii[$a1|$a2]</g;
      return '<table border align="center" style="border-collapse: collapse">'
! 	   . "\n  <thead>"
! 	   . "\n    <tr class=\"tableheader\">"
! 	   . "\n      $th1<b>$h1</b>\&nbsp;</th>"
! 	   . "\n      $th2<b>$h2</b>\&nbsp;</th>"
! 	   . "\n      </tr>"
! 	   . "\n    </thead>"
! 	   . "\n  <tbody valign=\"baseline\">"
! 	   . $_
! 	   . "\n    </tbody>"
! 	   . "\n</table>";
  }
  
--- 1384,1397 ----
      s/\\lineii</\\lineii[$a1|$a2]</g;
      return '<table border align="center" style="border-collapse: collapse">'
!            . "\n  <thead>"
!            . "\n    <tr class=\"tableheader\">"
!            . "\n      $th1<b>$h1</b>\&nbsp;</th>"
!            . "\n      $th2<b>$h2</b>\&nbsp;</th>"
!            . "\n      </tr>"
!            . "\n    </thead>"
!            . "\n  <tbody valign=\"baseline\">"
!            . $_
!            . "\n    </tbody>"
!            . "\n</table>";
  }
  
***************
*** 1416,1420 ****
      return "\n    <tr>$c1align$sfont$c1$efont$padding</td>\n"
             . "        $c2align$c2</td>"
! 	   . $_;
  }
  
--- 1416,1420 ----
      return "\n    <tr>$c1align$sfont$c1$efont$padding</td>\n"
             . "        $c2align$c2</td>"
!            . $_;
  }
  
***************
*** 1434,1448 ****
      s/\\lineiii</\\lineiii[$a1|$a2|$a3]</g;
      return '<table border align="center" style="border-collapse: collapse">'
! 	   . "\n  <thead>"
! 	   . "\n    <tr class=\"tableheader\">"
! 	   . "\n      $th1<b>$h1</b>\&nbsp;</th>"
! 	   . "\n      $th2<b>$h2</b>\&nbsp;</th>"
! 	   . "\n      $th3<b>$h3</b>\&nbsp;</th>"
! 	   . "\n      </tr>"
! 	   . "\n    </thead>"
! 	   . "\n  <tbody valign=\"baseline\">"
! 	   . $_
! 	   . "\n    </tbody>"
! 	   . "\n</table>";
  }
  
--- 1434,1448 ----
      s/\\lineiii</\\lineiii[$a1|$a2|$a3]</g;
      return '<table border align="center" style="border-collapse: collapse">'
!            . "\n  <thead>"
!            . "\n    <tr class=\"tableheader\">"
!            . "\n      $th1<b>$h1</b>\&nbsp;</th>"
!            . "\n      $th2<b>$h2</b>\&nbsp;</th>"
!            . "\n      $th3<b>$h3</b>\&nbsp;</th>"
!            . "\n      </tr>"
!            . "\n    </thead>"
!            . "\n  <tbody valign=\"baseline\">"
!            . $_
!            . "\n    </tbody>"
!            . "\n</table>";
  }
  
***************
*** 1469,1474 ****
      return "\n    <tr>$c1align$sfont$c1$efont$padding</td>\n"
             . "        $c2align$c2</td>\n"
! 	   . "        $c3align$c3</td>"
! 	   . $_;
  }
  
--- 1469,1474 ----
      return "\n    <tr>$c1align$sfont$c1$efont$padding</td>\n"
             . "        $c2align$c2</td>\n"
!            . "        $c3align$c3</td>"
!            . $_;
  }
  
***************
*** 1490,1505 ****
      s/\\lineiv</\\lineiv[$a1|$a2|$a3|$a4]</g;
      return '<table border align="center" style="border-collapse: collapse">'
! 	   . "\n  <thead>"
! 	   . "\n    <tr class=\"tableheader\">"
! 	   . "\n      $th1<b>$h1</b>\&nbsp;</th>"
! 	   . "\n      $th2<b>$h2</b>\&nbsp;</th>"
! 	   . "\n      $th3<b>$h3</b>\&nbsp;</th>"
! 	   . "\n      $th4<b>$h4</b>\&nbsp;</th>"
! 	   . "\n      </tr>"
! 	   . "\n    </thead>"
! 	   . "\n  <tbody valign=\"baseline\">"
! 	   . $_
! 	   . "\n    </tbody>"
! 	   . "\n</table>";
  }
  
--- 1490,1505 ----
      s/\\lineiv</\\lineiv[$a1|$a2|$a3|$a4]</g;
      return '<table border align="center" style="border-collapse: collapse">'
!            . "\n  <thead>"
!            . "\n    <tr class=\"tableheader\">"
!            . "\n      $th1<b>$h1</b>\&nbsp;</th>"
!            . "\n      $th2<b>$h2</b>\&nbsp;</th>"
!            . "\n      $th3<b>$h3</b>\&nbsp;</th>"
!            . "\n      $th4<b>$h4</b>\&nbsp;</th>"
!            . "\n      </tr>"
!            . "\n    </thead>"
!            . "\n  <tbody valign=\"baseline\">"
!            . $_
!            . "\n    </tbody>"
!            . "\n</table>";
  }
  
***************
*** 1512,1516 ****
      my $aligns = next_optional_argument();
      my $c1 = next_argument();
!     my $c2 = next_argument(); 
      my $c3 = next_argument();
      my $c4 = next_argument();
--- 1512,1516 ----
      my $aligns = next_optional_argument();
      my $c1 = next_argument();
!     my $c2 = next_argument();
      my $c3 = next_argument();
      my $c4 = next_argument();
***************
*** 1528,1534 ****
      return "\n    <tr>$c1align$sfont$c1$efont$padding</td>\n"
             . "        $c2align$c2</td>\n"
! 	   . "        $c3align$c3</td>\n"
! 	   . "        $c4align$c4</td>"
! 	   . $_;
  }
  
--- 1528,1534 ----
      return "\n    <tr>$c1align$sfont$c1$efont$padding</td>\n"
             . "        $c2align$c2</td>\n"
!            . "        $c3align$c3</td>\n"
!            . "        $c4align$c4</td>"
!            . $_;
  }
  
***************
*** 1552,1568 ****
      s/\\linev</\\linev[$a1|$a2|$a3|$a4|$a5]</g;
      return '<table border align="center" style="border-collapse: collapse">'
! 	   . "\n  <thead>"
! 	   . "\n    <tr class=\"tableheader\">"
! 	   . "\n      $th1<b>$h1</b>\&nbsp;</th>"
! 	   . "\n      $th2<b>$h2</b>\&nbsp;</th>"
! 	   . "\n      $th3<b>$h3</b>\&nbsp;</th>"
! 	   . "\n      $th4<b>$h4</b>\&nbsp;</th>"
! 	   . "\n      $th5<b>$h5</b>\&nbsp;</th>"
! 	   . "\n      </tr>"
! 	   . "\n    </thead>"
! 	   . "\n  <tbody valign=\"baseline\">"
! 	   . $_
! 	   . "\n    </tbody>"
! 	   . "\n</table>";
  }
  
--- 1552,1568 ----
      s/\\linev</\\linev[$a1|$a2|$a3|$a4|$a5]</g;
      return '<table border align="center" style="border-collapse: collapse">'
!            . "\n  <thead>"
!            . "\n    <tr class=\"tableheader\">"
!            . "\n      $th1<b>$h1</b>\&nbsp;</th>"
!            . "\n      $th2<b>$h2</b>\&nbsp;</th>"
!            . "\n      $th3<b>$h3</b>\&nbsp;</th>"
!            . "\n      $th4<b>$h4</b>\&nbsp;</th>"
!            . "\n      $th5<b>$h5</b>\&nbsp;</th>"
!            . "\n      </tr>"
!            . "\n    </thead>"
!            . "\n  <tbody valign=\"baseline\">"
!            . $_
!            . "\n    </tbody>"
!            . "\n</table>";
  }
  
***************
*** 1593,1600 ****
      return "\n    <tr>$c1align$sfont$c1$efont$padding</td>\n"
             . "        $c2align$c2</td>\n"
! 	   . "        $c3align$c3</td>\n"
! 	   . "        $c4align$c4</td>\n"
! 	   . "        $c5align$c5</td>"
! 	   . $_;
  }
  
--- 1593,1600 ----
      return "\n    <tr>$c1align$sfont$c1$efont$padding</td>\n"
             . "        $c2align$c2</td>\n"
!            . "        $c3align$c3</td>\n"
!            . "        $c4align$c4</td>\n"
!            . "        $c5align$c5</td>"
!            . $_;
  }
  
***************
*** 1621,1625 ****
      my $the_title = "";
      if ($t_title) {
! 	$the_title .= "\n<h1>$t_title</h1>";
      }
      else {
--- 1621,1625 ----
      my $the_title = "";
      if ($t_title) {
!         $the_title .= "\n<h1>$t_title</h1>";
      }
      else {
***************
*** 1627,1641 ****
      }
      if ($t_author) {
! 	if ($t_authorURL) {
! 	    my $href = translate_commands($t_authorURL);
! 	    $href = make_named_href('author', $href,
! 				    "<b><font size=\"+2\">$t_author"
                                      . '</font></b>');
! 	    $the_title .= "\n<p>$href</p>";
! 	}
          else {
! 	    $the_title .= ("\n<p><b><font size=\"+2\">$t_author"
                             . '</font></b></p>');
! 	}
      }
      else {
--- 1627,1641 ----
      }
      if ($t_author) {
!         if ($t_authorURL) {
!             my $href = translate_commands($t_authorURL);
!             $href = make_named_href('author', $href,
!                                     "<b><font size=\"+2\">$t_author"
                                      . '</font></b>');
!             $the_title .= "\n<p>$href</p>";
!         }
          else {
!             $the_title .= ("\n<p><b><font size=\"+2\">$t_author"
                             . '</font></b></p>');
!         }
      }
      else {
***************
*** 1649,1664 ****
      }
      if ($t_affil) {
! 	$the_title .= "\n<p><i>$t_affil</i></p>";
      }
      if ($t_date) {
! 	$the_title .= "\n<p>";
! 	if ($PACKAGE_VERSION) {
! 	    $the_title .= ('<strong>Release '
                             . "$PACKAGE_VERSION$RELEASE_INFO</strong><br />\n");
          }
! 	$the_title .= "<strong>$t_date</strong></p>"
      }
      if ($t_address) {
! 	$the_title .= "\n<p>$t_address</p>";
      }
      else {
--- 1649,1664 ----
      }
      if ($t_affil) {
!         $the_title .= "\n<p><i>$t_affil</i></p>";
      }
      if ($t_date) {
!         $the_title .= "\n<p>";
!         if ($PACKAGE_VERSION) {
!             $the_title .= ('<strong>Release '
                             . "$PACKAGE_VERSION$RELEASE_INFO</strong><br />\n");
          }
!         $the_title .= "<strong>$t_date</strong></p>"
      }
      if ($t_address) {
!         $the_title .= "\n<p>$t_address</p>";
      }
      else {
***************
*** 1666,1670 ****
      }
      if ($t_email) {
! 	$the_title .= "\n<p>$t_email</p>";
      }
      return $the_title;
--- 1666,1670 ----
      }
      if ($t_email) {
!         $the_title .= "\n<p>$t_email</p>";
      }
      return $the_title;
***************
*** 1748,1754 ****
      my $key;
      foreach $key (keys %ModuleSynopses) {
! 	if ($key eq $chap) {
! 	    return $ModuleSynopses{$chap};
! 	}
      }
      my $st = SynopsisTable->new();
--- 1748,1754 ----
      my $key;
      foreach $key (keys %ModuleSynopses) {
!         if ($key eq $chap) {
!             return $ModuleSynopses{$chap};
!         }
      }
      my $st = SynopsisTable->new();
***************
*** 1822,1830 ****
      # need to get contents of file in $_
      while (/<tex2html-localmoduletable><(\d+)>/) {
! 	my $match = $&;
! 	my $chap = $1;
! 	my $st = get_synopsis_table($chap);
! 	my $data = $st->tohtml();
! 	s/$match/$data/;
      }
      open(MYFILE,">$file");
--- 1822,1830 ----
      # need to get contents of file in $_
      while (/<tex2html-localmoduletable><(\d+)>/) {
!         my $match = $&;
!         my $chap = $1;
!         my $st = get_synopsis_table($chap);
!         my $data = $st->tohtml();
!         s/$match/$data/;
      }
      open(MYFILE,">$file");
***************
*** 1866,1870 ****
          unless $key;
      if ($text =~ /\.$/) {
! 	$period = '';
      }
      return ('<dl compact class="seemodule">'
--- 1866,1870 ----
          unless $key;
      if ($text =~ /\.$/) {
!         $period = '';
      }
      return ('<dl compact class="seemodule">'
***************
*** 2008,2025 ****
      ($local_closures, $local_reopens, at open_block_tags)
        = &preserve_open_block_tags
! 	if (@$open_tags_R);
  
      $open_tags_R = [ @open_block_tags ];
  
      do {
! 	local($open_tags_R) = [ @open_block_tags ];
! 	local(@save_open_tags) = ();
  
! 	local($cnt) = ++$global{'max_id'};
! 	$_ = join('',"$O$cnt$C\\tt$O", ++$global{'max_id'}, $C
! 		, $_ , $O, $global{'max_id'}, "$C$O$cnt$C");
  
! 	$_ = &translate_environments($_);
! 	$_ = &translate_commands($_) if (/\\/);
  
          # remove spurious <BR> someone sticks in; not sure where they
--- 2008,2025 ----
      ($local_closures, $local_reopens, at open_block_tags)
        = &preserve_open_block_tags
!         if (@$open_tags_R);
  
      $open_tags_R = [ @open_block_tags ];
  
      do {
!         local($open_tags_R) = [ @open_block_tags ];
!         local(@save_open_tags) = ();
  
!         local($cnt) = ++$global{'max_id'};
!         $_ = join('',"$O$cnt$C\\tt$O", ++$global{'max_id'}, $C
!                 , $_ , $O, $global{'max_id'}, "$C$O$cnt$C");
  
!         $_ = &translate_environments($_);
!         $_ = &translate_commands($_) if (/\\/);
  
          # remove spurious <BR> someone sticks in; not sure where they
***************
*** 2030,2038 ****
          s/<BR>/ /gi;
  
! 	$_ = join('', $closures, $alltt_start, $local_reopens
! 		, $_
! 		, &balance_tags() #, $local_closures
! 		, $alltt_end, $reopens);
! 	undef $open_tags_R; undef @save_open_tags;
      };
      $open_tags_R = [ @keep_open_tags ];
--- 2030,2038 ----
          s/<BR>/ /gi;
  
!         $_ = join('', $closures, $alltt_start, $local_reopens
!                 , $_
!                 , &balance_tags() #, $local_closures
!                 , $alltt_end, $reopens);
!         undef $open_tags_R; undef @save_open_tags;
      };
      $open_tags_R = [ @keep_open_tags ];
***************
*** 2153,2155 ****
  }
  
! 1;				# This must be the last line
--- 2153,2155 ----
  }
  
! 1;                              # This must be the last line





More information about the Python-checkins mailing list