[Mupad-combinat-commits] MuPAD-Combinat/lib/OUTPUT asciiArt.mu,1.26,1.27

[Francois D. <fde...@us...>]

Update of /cvsroot/mupad-combinat/MuPAD-Combinat/lib/OUTPUT
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12249

Modified Files:
	asciiArt.mu 
Log Message:
Bugs fixes for the pretty printing with the Compact and Packed options.


Index: asciiArt.mu
===================================================================
RCS file: /cvsroot/mupad-combinat/MuPAD-Combinat/lib/OUTPUT/asciiArt.mu,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** asciiArt.mu	15 Jul 2005 10:50:13 -0000	1.26
--- asciiArt.mu	29 Jul 2005 22:22:41 -0000	1.27
***************
*** 156,168 ****
  		      // Filling the top of the cell
  		      xt := x;
! 		      drawing[x,y] := cross(row, col);
! 		      x := x + width(options[ColumnSeparator]);
! 		      drawing[x,y] := if separator[row+1,col+1][1] = TRUE then _concat(options[RowSeparator]$ totalWidth);
! 				      else _concat(options[HorizontalPadding]$ totalWidth); end_if;
! 		      x := x + totalWidth;
! 		      drawing[x,y] := cross(row, col);
! 		      x := xt;
! 		      y := y - 1;
! 		      
  		      // Filling the middle of the cell
  		      drawing[x,y] := if separator[row+1,col+1][4] = TRUE then options[ColumnSeparator];
--- 156,171 ----
  		      // Filling the top of the cell
  		      xt := x;
! 		      if height(options[RowSeparator]) <> 0 then
! 			  //xt := x;
! 			  drawing[x,y] := cross(row, col);
! 			  x := x + width(options[ColumnSeparator]);
! 			  drawing[x,y] := if separator[row+1,col+1][1] = TRUE
! 					      then _concat(options[RowSeparator]$ totalWidth);
! 					  else _concat(options[HorizontalPadding]$ totalWidth); end_if;
! 			  x := x + totalWidth;
! 			  drawing[x,y] := cross(row, col);
! 			  x := xt;
! 			  y := y-height(options[RowSeparator]); 
! 		      end_if;
  		      // Filling the middle of the cell
  		      drawing[x,y] := if separator[row+1,col+1][4] = TRUE then options[ColumnSeparator];
***************
*** 177,191 ****
  		      x := xt;
  		      y := y - 1;
! 		      
  		      // Filling the bottom of the cell
! 		      drawing[x,y] := cross(row, col);
! 		      x := x + width(options[ColumnSeparator]);
! 		      drawing[x,y] := if separator[row+1,col+1][3] = TRUE then _concat(options[RowSeparator]$ totalWidth);
! 				      else _concat(options[HorizontalPadding]$ totalWidth); end_if;
! 		      x := x + totalWidth;
! 		      drawing[x,y] := cross(row, col);
! 		      x := xt;
  		  else
! 		      y := y - 2;
  		  end_if;
  	      end_for;
--- 180,197 ----
  		      x := xt;
  		      y := y - 1;
! 		      	      
  		      // Filling the bottom of the cell
! 		      if height(options[RowSeparator]) <> 0 then
! 			  drawing[x,y] := cross(row, col);
! 			  x := x + width(options[ColumnSeparator]);
! 			  drawing[x,y] := if separator[row+1,col+1][3] = TRUE
! 					      then _concat(options[RowSeparator]$ totalWidth);
! 					  else _concat(options[HorizontalPadding]$ totalWidth); end_if;
! 			  x := x + totalWidth;
! 			  drawing[x,y] := cross(row, col);
! 			  x := xt;
! 		      end_if;
  		  else
! 		      y := y - 1 - height(options[RowSeparator]);
  		  end_if;
  	      end_for;