--- rat/lonpage.pm	2002/06/27 18:48:30	1.42
+++ rat/lonpage.pm	2002/09/16 14:23:02	1.46
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.42 2002/06/27 18:48:30 sakharuk Exp $
+# $Id: lonpage.pm,v 1.46 2002/09/16 14:23:02 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -152,17 +152,17 @@ sub handler {
        $r->send_http_header;
        return OK;
    }
- 
+  
    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                           ['forceselect','launch']);
-
+  my $number_of_columns = 1;
   my $requrl=$r->uri;  
   my $target = $ENV{'form.grade_target'};
 # ----------------------------------------------------------------- Tie db file
   if (($ENV{'request.course.fn'}) && (!$ENV{'form.forceselect'})) {
       my $fn=$ENV{'request.course.fn'};
       if (-e "$fn.db") {
-          if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER,0640)) {
+          if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640)) {
 # ------------------------------------------------------------------- Hash tied
               my $firstres=$hash{'map_start_'.$requrl};
               my $lastres=$hash{'map_finish_'.$requrl};
@@ -171,14 +171,7 @@ sub handler {
 
                   @rows=();
 
-                  &tracetable(0,$firstres,'&'.$lastres.'&');
-                  if ($hash{'src_'.$lastres}) {
-                     my $brepriv=
-                        &Apache::lonnet::allowed('bre',$hash{'src_'.$lastres});
-                     if (($brepriv eq '2') || ($brepriv eq 'F')) {
-                        $rows[$#rows+1]=''.$lastres;
-		     }
-		  }
+                  &tracetable(0,$firstres,'&');
 
 # ------------------------------------------------------------ Add to symb list
 
@@ -196,7 +189,6 @@ sub handler {
 
 # ------------------------------------------------------------------ Page parms
 
-                  my $number_of_columns = 1;
                   my $j;
                   my $lcm=1;
                   my $contents=0;
@@ -247,6 +239,13 @@ sub handler {
                                }
 			      }
                               my $output=Apache::lonnet::ssi($src,%posthash);
+                              if ($target eq 'tex') {
+				  $output =~ s/^([^&]+)\\begin{document}//;
+				  $output =~ s/\\end{document}//;
+				  $output = '\parbox{\minipagewidth}{ '.$output.' }';
+                                  #some additional cleanup necessary for LateX (due to limitations of table environment 
+				  $output =~ s/(\\vskip\s*\d+mm)\s*(\\\\)+/$1/g;
+			      }
                               my $parser=HTML::TokeParser->new(\$output);
                               my $token;
                               my $thisdir=$src;
@@ -380,6 +379,7 @@ sub handler {
 # ----------------------------------------------------------------- Start table
 		      if ($target eq 'tex') {
 			  $r->print('\begin{longtable}INSERTTHEHEADOFLONGTABLE\endfirsthead\endhead ');
+			  if ($number_of_columns le $lcm) {$number_of_columns=$lcm;};
 		      } else {
 			  $r->print('<table cols="'.$lcm.'" border="0">');
 		      }
@@ -471,14 +471,14 @@ sub handler {
 			      unless ($target eq 'tex') {
 				  $r->print('</td>');
 			      } else {
-				  $number_of_columns++;
-				  $r->print(' & ');
+                                  for (my $incol=1;$incol<=$avespan;$incol++) {
+				      $r->print(' & ');
+				  }
 			      }
                           }
 			      unless ($target eq 'tex') {
 				  $r->print('</tr>');
 			      } else {
-				  $number_of_columns = 1;
 				  $r->print('REMOVETHEHEADOFLONGTABLE\\\\');
 			      }
 		        }