--- loncom/xml/londefdef.pm	2002/04/04 19:20:33	1.50
+++ loncom/xml/londefdef.pm	2002/04/05 18:11:11	1.51
@@ -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.51 2002/04/05 18:11:11 sakharuk Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -50,7 +50,7 @@ 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'));
 
 }
 
@@ -1264,74 +1264,94 @@ EDITBUTTON
             if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
+		&Apache::lonxml::startredirection;
 		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;
+		@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 =  '|';
 		}
-		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';
-		} else {
-		     $default_value = 'c';
-		}
-		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 $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 $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::counter_columns;$in++) {
+		    $header_of_table .= $Apache::londefdef::columns[$in].$Apache::londefdef::vvinc;
 		}
 		$header_of_table .= '}';
-		$currentstring .= '\begin{tabular}'.$header_of_table.$tabletext.$hinc.'\end{tabular}';
+		$currentstring .= '\begin{tabular}'.$header_of_table.$output.$Apache::londefdef::hinc.'\end{tabular}';
+	    }
+	   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') {
+		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);
+		} else {
+		    push @Apache::londefdef::rows, 'c';
+		}
+		$currentstring = '\hline ';
+		$Apache::londefdef::counter_columns = 0;
 	    } 
 	   return $currentstring;
+	}        
+        sub end_tr {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+		$currentstring = $token->[2];     
+	    } elsif ($target eq 'tex') {
+		$currentstring = '\\\\'; 
+	    }
+	   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::rows[0],0,1);
+		}
+		    push @Apache::londefdef::columns, $what_to_push;
+		$Apache::londefdef::counter_columns++;
+		$currentstring = $token->[4];;
+	    } 
+	   return $currentstring;
+	}        
+        sub end_td {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = $token->[2];     
+		$currentstring = $token->[2];     
+	    } elsif ($target eq 'tex') {
+		$currentstring = $token->[2];;
 	    }
 	   return $currentstring;
 	}