--- loncom/xml/londefdef.pm	2002/04/05 18:11:11	1.51
+++ loncom/xml/londefdef.pm	2002/05/09 18:55:47	1.58
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.51 2002/04/05 18:11:11 sakharuk Exp $
+# $Id: londefdef.pm,v 1.58 2002/05/09 18:55:47 sakharuk Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -45,8 +45,10 @@
 
 package Apache::londefdef; 
 
+use Apache::lonnet;
 use strict;
 use Apache::lonxml;
+use Apache::File();
 
 BEGIN {
 
@@ -114,6 +116,7 @@ sub end_m {
               $currentstring = &Apache::lonxml::xmlbegin().
                                &Apache::lonxml::fontsettings();     
 	    } elsif ($target eq 'tex') {
+	      @Apache::londefdef::table = ();
 	      $currentstring .= '\documentclass[letterpaper]{article}
                                  \newcommand{\keephidden}[1]{}           
                                  \usepackage[dvips]{graphicx}
@@ -334,7 +337,8 @@ sub end_m {
 		  delete($token->[2]->{$key});
 		}
 	      }
-	      $token->[2]->{'onLoad'}=$onLoad.&Apache::lonxml::loadevents();
+	      $token->[2]->{'onLoad'}=&Apache::lonxml::loadevents().
+		                       ';'.$onLoad;
 	      my $onUnload='';
 	      foreach my $key (keys(%{$token->[2]})) {
 		if ($key =~ /^onunload$/i) {
@@ -342,8 +346,8 @@ sub end_m {
 		  delete($token->[2]->{$key});
 		}
 	      }
-	      $token->[2]->{'onUnload'}=$onUnload.
-		&Apache::lonxml::unloadevents();
+	      $token->[2]->{'onUnload'}=&Apache::lonxml::unloadevents().
+		                         ';'.$onUnload;
 
 	      $currentstring .= '<'.$token->[1];
 	      foreach (keys %{$token->[2]}) {
@@ -1264,19 +1268,20 @@ EDITBUTTON
             if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
-		&Apache::lonxml::startredirection;
+		my $aa = {};
+		push @Apache::londefdef::table, $aa; 
+		$Apache::londefdef::table[-1]{'row_number'} = -1;
+		$Apache::londefdef::table[-1]{'output'} = '\begin{tabular} ';
 		my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval);
 		unless (defined $border) { $border = 0; }
-		@Apache::londefdef::rows = ();
-		@Apache::londefdef::columns = ();
-		$Apache::londefdef::counter_columns = 0;
-		$Apache::londefdef::hinc = '';
-                $Apache::londefdef::vinc = '';   
-		$Apache::londefdef::vvinc = '';
 		if ($border) { 
-		    $Apache::londefdef::hinc = '\hline '; 
-		    $Apache::londefdef::vinc =  '&'; 
-		    $Apache::londefdef::vvinc =  '|';
+		    $Apache::londefdef::table[-1]{'hinc'} = '\hline '; 
+		    $Apache::londefdef::table[-1]{'vinc'} = '&'; 
+		    $Apache::londefdef::table[-1]{'vvinc'} = '|';
+		} else {
+		    $Apache::londefdef::table[-1]{'hinc'} = ''; 
+		    $Apache::londefdef::table[-1]{'vinc'} = ''; 
+		    $Apache::londefdef::table[-1]{'vvinc'} = '';
 		}
 	    } 
 	   return $currentstring;
@@ -1287,17 +1292,29 @@ EDITBUTTON
             if ($target eq 'web') {
               $currentstring = $token->[2];     
 	    } elsif ($target eq 'tex') {
-		my $output=&Apache::lonxml::endredirection;	
-		$output =~ s/<\/td>\s*<td\s*([^>]*)>/$Apache::londefdef::vinc/g;
-		$output =~ s/<td\s*([^>]*)>//g;
-		$output =~ s/<\/td>//g;
-		my $header_of_table = '{'.$Apache::londefdef::vvinc;
+		my $inmemory = '';
+		my $output = '';
+		my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'};
 		my $in;
-		for ($in=0;$in<$Apache::londefdef::counter_columns;$in++) {
-		    $header_of_table .= $Apache::londefdef::columns[$in].$Apache::londefdef::vvinc;
+		for ($in=0;$in<=$Apache::londefdef::table[-1]{'counter_columns'};$in++) {
+		    $header_of_table .= $Apache::londefdef::table[-1]{'columns'}[$in].$Apache::londefdef::table[-1]{'vvinc'};
 		}
 		$header_of_table .= '}';
-		$currentstring .= '\begin{tabular}'.$header_of_table.$output.$Apache::londefdef::hinc.'\end{tabular}';
+		for ($in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
+		    $output .=  $Apache::londefdef::table[-1]{'rowdata'}[$in];
+		    chop $output;
+		    $output .= ' \\\\ ';
+		}
+		$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}';
+		if ($#Apache::londefdef::table > 0) {
+		    $inmemory = $Apache::londefdef::table[-1]{'output'};
+		    pop @Apache::londefdef::table;
+		    $Apache::londefdef::table[-1]{'rowdata'}[$Apache::londefdef::table[-1]{'row_number'}] .= $inmemory;
+		} else {
+		    $currentstring = $Apache::londefdef::table[-1]{'output'};
+		    $currentstring =~ s/\\\\\s+\\\\/\\\\/g; 
+		    pop @Apache::londefdef::table;
+		}
 	    }
 	   return $currentstring;
 	}
@@ -1308,13 +1325,16 @@ EDITBUTTON
             if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
-		if (substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1) ne '') {
-		    push @Apache::londefdef::rows, substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1);
+		$Apache::londefdef::table[-1]{'row_number'}++;
+		my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1);
+		if ($alignchar ne '') {
+		    push @ {$Apache::londefdef::table[-1]{'rows'} }, $alignchar;
 		} else {
-		    push @Apache::londefdef::rows, 'c';
+		    push @ {$Apache::londefdef::table[-1]{'rows'} }, 'c';
 		}
-		$currentstring = '\hline ';
-		$Apache::londefdef::counter_columns = 0;
+		push ( @{ $Apache::londefdef::table[-1]{'rowdata'} }, $Apache::londefdef::table[-1]{'hinc'});
+		$Apache::londefdef::table[-1]{'counter_columns'} = -1;
+
 	    } 
 	   return $currentstring;
 	}        
@@ -1324,7 +1344,7 @@ EDITBUTTON
             if ($target eq 'web') {
 		$currentstring = $token->[2];     
 	    } elsif ($target eq 'tex') {
-		$currentstring = '\\\\'; 
+#		$currentstring .= ' START ROW '. $Apache::londefdef::table[-1]{'rowdata'}[$Apache::londefdef::table[-1]{'row_number'}].' END ROW ';
 	    }
 	   return $currentstring;
 	}
@@ -1337,11 +1357,12 @@ EDITBUTTON
 	    } elsif ($target eq 'tex') {
 		my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1);
 		if ($what_to_push eq '') {
-		    $what_to_push = substr($Apache::londefdef::rows[0],0,1);
+		    $what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);;
 		}
-		    push @Apache::londefdef::columns, $what_to_push;
-		$Apache::londefdef::counter_columns++;
-		$currentstring = $token->[4];;
+		    push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push;
+		$Apache::londefdef::table[-1]{'counter_columns'}++;
+		&Apache::lonxml::startredirection();
+;
 	    } 
 	   return $currentstring;
 	}        
@@ -1351,7 +1372,9 @@ EDITBUTTON
             if ($target eq 'web') {
 		$currentstring = $token->[2];     
 	    } elsif ($target eq 'tex') {
-		$currentstring = $token->[2];;
+		my $current_row = $Apache::londefdef::table[-1]{'row_number'};
+		my $data=&Apache::lonxml::endredirection();
+		@{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= $data.' '.$Apache::londefdef::table[-1]{'vinc'};
 	    }
 	   return $currentstring;
 	}
@@ -1361,33 +1384,49 @@ EDITBUTTON
             $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
                                         $token->[2]->{'src'};
             my $currentstring = '';
+	    my $width_param = '';
 
 	    if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
+	      my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval); 
+              my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval); 
+	      my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval);
+	      if ($TeXwidth ne '') { 
+		  $width_param = $TeXwidth; 
+	      } elsif ($TeXheight ne '') { 
+		  $width_param = $TeXheight; 
+	      } else {
+		  if ($width ne '') {
+		      $width_param = $width*.3;
+		      if ($width_param <= 900) {
+			  $width_param = '[width='.$width_param.'mm]';
+		      } else {
+			  $width_param = '[width= 9.0 cm]';
+		      }
+		  }
+	      }
 	      my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
+	      $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
 	      my $file;
-	      my $path;
+	      my $path;	
               if ($src =~ m!(.*)/([^/]*)$!) {
-		$file = $2;
-		$path = $1;
-		if ($path=~m:^/:) {
-		  $path = '/home/httpd/html'.$path;
-		} elsif ($path =~ /^\./) {
-		  $path = $Apache::lonxml::pwd[-1].'/'.$path;
-		} else {
-		  #else it is a full url don't print
-		  $path = undef;
-		}
-	      } else {
-		$path = $Apache::lonxml::pwd[-1];
-		$file = $src;
+		  $file = $2;
+		  $path = $1.'/'; 
 	      }
-	      $file=~s/(\.gif|\.jpg)$/\.eps/;
-	      if ($path) {
-		$currentstring = '\graphicspath{{'.$path.'/}}\fbox{\includegraphics{'.$file.'}}';
+	      my $newsrc = $src;
+	      $newsrc =~ s/(\.gif|\.jpg)$/\.eps/;
+		  $file=~s/(\.gif|\.jpg)$/\.eps/;
+	      if (-e $newsrc) {
+		  if ($path) {
+		      $currentstring .= '\graphicspath{{'.$path.'}}\fbox{\includegraphics'.$width_param.'{'.$file.'}}';
+		  }
 	      } else {
-		$currentstring = 'See the image at \tt{'.$src.'}';
+		  my $temp_file;
+		  my $filename = "/home/httpd/prtspool/$ENV{'user.name'}$ENV{'user.domain'}temp$ENV{'user.login.time'}.dat";
+		  $temp_file = Apache::File->new('>>'.$filename); 
+		  print $temp_file "$src\n";
+		  $currentstring .= '\graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics'.$width_param.'{'.$file.'}}';
 	      }
 	    }
 	    return $currentstring;