--- loncom/xml/londefdef.pm	2002/04/04 19:20:33	1.50
+++ loncom/xml/londefdef.pm	2002/04/26 18:25:56	1.55
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.50 2002/04/04 19:20:33 sakharuk Exp $
+# $Id: londefdef.pm,v 1.55 2002/04/26 18:25:56 sakharuk Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -45,12 +45,14 @@
 
 package Apache::londefdef; 
 
+use Apache::lonnet;
 use strict;
 use Apache::lonxml;
 
+
 BEGIN {
 
-    &Apache::lonxml::register('Apache::londefdef',('m','html','head','map','select','option','input','textarea','form','meta','title','body','center','b','strong','dt','h1','h2','h3','h4','h5','h6','cite','i','address','dd','dl','dir','ol','ul','menu','dfn','kbd','tt','code','em','q','p','br','big','small','basefont','font','s','sub','strike','sup','hr','a','li','u','output','param','applet','img','embed','allow','frameset','pre','insert','externallink','table'));
+    &Apache::lonxml::register('Apache::londefdef',('m','html','head','map','select','option','input','textarea','form','meta','title','body','center','b','strong','dt','h1','h2','h3','h4','h5','h6','cite','i','address','dd','dl','dir','ol','ul','menu','dfn','kbd','tt','code','em','q','p','br','big','small','basefont','font','s','sub','strike','sup','hr','a','li','u','output','param','applet','img','embed','allow','frameset','pre','insert','externallink','table','tr','td'));
 
 }
 
@@ -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}
@@ -1264,74 +1267,113 @@ EDITBUTTON
             if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
+		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);
-		my $tabletext=&Apache::lonxml::get_all_text("/table",$$parser[$#$parser]);
-		my %mystyle;
-		$tabletext = &Apache::lonxml::xmlparse('tex',$tabletext,'',%mystyle);       
 		unless (defined $border) { $border = 0; }
-		my $hinc = '';
-                my $vinc = '';   
-		my $vvinc = '';
-		if ($border) { $hinc = '\hline '; $vinc =  '&'; $vvinc =  '|';}
-		my @raws = ();
-		my @columns = ();
-		my $counter_columns;
-#serch row
-		$_ = $tabletext;
-		while (m/<tr\s*([^>]*)>/) {
-		    push @raws,$1;
-                    $tabletext =~ s/<tr\s*([^>]*)>/$hinc/;
-#serch and convert column
-		    my $boundary = index($tabletext,'</tr>',0);
-		    my $textchunk = substr($tabletext,0,$boundary); 
-		    $_ = $textchunk;
-		    $counter_columns = 0;
-		    while (m/<td\s*([^>]*)>/) {
-			push @columns,$1;
-			$counter_columns++;
-			$textchunk =~ s/<\/td>\s*<td\s*([^>]*)>/$vinc/;
-			$textchunk =~ s/<td\s*([^>]*)>//;
-			$textchunk =~ s/<\/td>//;
-			$_ = $textchunk;
-		    }			
-		    substr($tabletext,0,$boundary) = $textchunk;
-#convert row
-		    $tabletext =~ s/<\/tr>/\\\\/;
-		    $_ = $tabletext;
-		}
-		my $default_value = '';
-		if ($raws[1] eq 'left') {
-		    $default_value = 'l';
-		} elsif ($raws[1] eq 'center') {
-		    $default_value = 'c';
-		} elsif ($raws[1] eq 'right') {
-		    $default_value = 'r';
+		if ($border) { 
+		    $Apache::londefdef::table[-1]{'hinc'} = '\hline '; 
+		    $Apache::londefdef::table[-1]{'vinc'} = '&'; 
+		    $Apache::londefdef::table[-1]{'vvinc'} = '|';
 		} else {
-		     $default_value = 'c';
+		    $Apache::londefdef::table[-1]{'hinc'} = ''; 
+		    $Apache::londefdef::table[-1]{'vinc'} = ''; 
+		    $Apache::londefdef::table[-1]{'vvinc'} = '';
 		}
-		my $header_of_table = '{'.$vvinc;
+	    } 
+	   return $currentstring;
+	}
+        sub end_table {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];     
+	    } elsif ($target eq 'tex') {
+		my $inmemory = '';
+		my $output = '';
+		my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'};
 		my $in;
-		for ($in=0;$in<=$counter_columns;$in++) {
-		    if ($columns[$in] eq 'left') {
-			$header_of_table .= 'l'.$vvinc;
-		    } elsif ($columns[$in] eq 'center') {
-			$header_of_table .= 'c'.$vvinc;
-		    } elsif ($columns[$in] eq 'right') {
-			$header_of_table .= 'r'.$vvinc;
-		    } else {
-		       $header_of_table .= $default_value.$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.$tabletext.$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;
+	}
+#-- <tr> tag
+        sub start_tr {
+	    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } elsif ($target eq 'tex') {
+		$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::table[-1]{'rows'} }, 'c';
+		}
+		push ( @{ $Apache::londefdef::table[-1]{'rowdata'} }, $Apache::londefdef::table[-1]{'hinc'});
+		$Apache::londefdef::table[-1]{'counter_columns'} = -1;
+
 	    } 
 	   return $currentstring;
+	}        
+        sub end_tr {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+		$currentstring = $token->[2];     
+	    } elsif ($target eq 'tex') {
+#		$currentstring .= ' START ROW '. $Apache::londefdef::table[-1]{'rowdata'}[$Apache::londefdef::table[-1]{'row_number'}].' END ROW ';
+	    }
+	   return $currentstring;
 	}
-        sub end_table {
+#-- <td> tag
+        sub start_td {
+	    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } 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::table[-1]{'rows'}[0],0,1);;
+		}
+		    push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push;
+		$Apache::londefdef::table[-1]{'counter_columns'}++;
+		&Apache::lonxml::startredirection();
+;
+	    } 
+	   return $currentstring;
+	}        
+        sub end_td {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = $token->[2];     
+		$currentstring = $token->[2];     
+	    } elsif ($target eq 'tex') {
+		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;
 	}
@@ -1346,28 +1388,21 @@ EDITBUTTON
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
 	      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;
-		}
+		  $file = $2;
+		  $path = $1; 
 	      } else {
-		$path = $Apache::lonxml::pwd[-1];
-		$file = $src;
+		  $path = $Apache::lonxml::pwd[-1];
+		  $file = $src;
 	      }
 	      $file=~s/(\.gif|\.jpg)$/\.eps/;
 	      if ($path) {
-		$currentstring = '\graphicspath{{'.$path.'/}}\fbox{\includegraphics{'.$file.'}}';
+		$currentstring .= '\graphicspath{{'.$path.'/}}\fbox{\includegraphics{'.$file.'}}';
 	      } else {
-		$currentstring = 'See the image at \tt{'.$src.'}';
+		$currentstring .= 'See the image at \tt{'.$src.'}';
 	      }
 	    }
 	    return $currentstring;