[Python-checkins] CVS: python/dist/src/Doc/perl python.perl,1.65.2.8,1.65.2.9

Fred L. Drake fdrake@weyr.cnri.reston.va.us
Thu, 16 Mar 2000 17:52:58 -0500 (EST)


Update of /projects/cvsroot/python/dist/src/Doc/perl
In directory weyr:/home/fdrake/projects/python/Doc-152p2/perl

Modified Files:
      Tag: release152p1-patches
	python.perl 
Log Message:

Really hackish fix to get table alignment right.  Appears to work for
the time module (wherer it counts!).


Index: python.perl
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/perl/python.perl,v
retrieving revision 1.65.2.8
retrieving revision 1.65.2.9
diff -C2 -r1.65.2.8 -r1.65.2.9
*** python.perl	2000/03/16 16:38:56	1.65.2.8
--- python.perl	2000/03/16 22:52:55	1.65.2.9
***************
*** 948,951 ****
--- 948,954 ----
      s/[\s\n]+//;
      $globals{'lineifont'} = $font;
+     my $a1 = $col_aligns[0];
+     my $a2 = $col_aligns[1];
+     s/\\lineii</\\lineii[$a1|$a2]</g;
      return '<table border align="center" style="border-collapse: collapse">'
             . "\n  <thead>"
***************
*** 962,965 ****
--- 965,969 ----
  sub do_cmd_lineii{
      local($_) = @_;
+     my $aligns = next_optional_argument();
      my $c1 = next_argument();
      my $c2 = next_argument();
***************
*** 967,971 ****
      my($font,$sfont,$efont) = get_table_col1_fonts();
      $c2 = '&nbsp;' if ($c2 eq '');
!     my($c1align,$c2align) = @col_aligns[0,1];
      my $padding = '';
      if ($c1align =~ /align="right"/) {
--- 971,975 ----
      my($font,$sfont,$efont) = get_table_col1_fonts();
      $c2 = '&nbsp;' if ($c2 eq '');
!     my($c1align,$c2align) = split('\|', $aligns);
      my $padding = '';
      if ($c1align =~ /align="right"/) {
***************
*** 986,989 ****
--- 990,997 ----
      s/[\s\n]+//;
      $globals{'lineifont'} = $font;
+     my $a1 = $col_aligns[0];
+     my $a2 = $col_aligns[1];
+     my $a3 = $col_aligns[2];
+     s/\\lineiii</\\lineiii[$a1|$a2|$a3]</g;
      return '<table border align="center" style="border-collapse: collapse">'
             . "\n  <thead>"
***************
*** 1001,1004 ****
--- 1009,1013 ----
  sub do_cmd_lineiii{
      local($_) = @_;
+     my $aligns = next_optional_argument();
      my $c1 = next_argument();
      my $c2 = next_argument(); 
***************
*** 1007,1011 ****
      my($font,$sfont,$efont) = get_table_col1_fonts();
      $c3 = '&nbsp;' if ($c3 eq '');
!     my($c1align,$c2align,$c3align) = @col_aligns[0,1,2];
      my $padding = '';
      if ($c1align =~ /align="right"/) {
--- 1016,1020 ----
      my($font,$sfont,$efont) = get_table_col1_fonts();
      $c3 = '&nbsp;' if ($c3 eq '');
!     my($c1align,$c2align,$c3align) = split('\|', $aligns);
      my $padding = '';
      if ($c1align =~ /align="right"/) {
***************
*** 1028,1031 ****
--- 1037,1045 ----
      s/[\s\n]+//;
      $globals{'lineifont'} = $font;
+     my $a1 = $col_aligns[0];
+     my $a2 = $col_aligns[1];
+     my $a3 = $col_aligns[2];
+     my $a4 = $col_aligns[3];
+     s/\\lineiv</\\lineiv[$a1|$a2|$a3|$a4]</g;
      return '<table border align="center" style="border-collapse: collapse">'
             . "\n  <thead>"
***************
*** 1044,1047 ****
--- 1058,1062 ----
  sub do_cmd_lineiv{
      local($_) = @_;
+     my $aligns = next_optional_argument();
      my $c1 = next_argument();
      my $c2 = next_argument(); 
***************
*** 1051,1055 ****
      my($font,$sfont,$efont) = get_table_col1_fonts();
      $c4 = '&nbsp;' if ($c4 eq '');
!     my($c1align,$c2align,$c3align,$c4align) = @col_aligns;
      my $padding = '';
      if ($c1align =~ /align="right"/) {
--- 1066,1070 ----
      my($font,$sfont,$efont) = get_table_col1_fonts();
      $c4 = '&nbsp;' if ($c4 eq '');
!     my($c1align,$c2align,$c3align,$c4align) = split('\|', $aligns);
      my $padding = '';
      if ($c1align =~ /align="right"/) {