--- loncom/xml/londefdef.pm	2002/03/22 17:52:20	1.49
+++ loncom/xml/londefdef.pm	2002/04/16 14:37:24	1.53
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.49 2002/03/22 17:52:20 albertel Exp $
+# $Id: londefdef.pm,v 1.53 2002/04/16 14:37:24 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','table','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','tr','td','allow','frameset','pre','insert','externallink'));
+    &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 +114,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}
@@ -1259,12 +1260,26 @@ EDITBUTTON
 	}
 #-- <table> tag
         sub start_table {
-	    my ($target,$token) = @_;
+	    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
-              $currentstring = '';  
+		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; }
+		if ($border) { 
+		    $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;
 	}
@@ -1274,49 +1289,89 @@ EDITBUTTON
             if ($target eq 'web') {
               $currentstring = $token->[2];     
 	    } elsif ($target eq 'tex') {
-              $currentstring = '';  
-	    } 
+		my $inmemory = '';
+		my $output = '';
+		my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'};
+		my $in;
+		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 .= '}';
+		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) = @_;
+	    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
-	      $currentstring = '';
+		$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];     
+		$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;
 	}
 #-- <td> tag
         sub start_td {
-	    my ($target,$token) = @_;
+	    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = $token->[4];
+              $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
-	      $currentstring = '';
+		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') {
-              $currentstring = '';
+		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;
 	}