--- loncom/interface/lonprintout.pm	2003/08/18 18:12:47	1.215
+++ loncom/interface/lonprintout.pm	2003/08/18 19:57:36	1.218
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.215 2003/08/18 18:12:47 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.218 2003/08/18 19:57:36 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -750,13 +750,12 @@ ENDPART
 		my $answer=&Apache::lonnet::ssi($urlp,%form);
 		$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
 	    }
-
 	    if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
 		$texversion=&IndexCreation($texversion,$urlp);
 	    }
 	    if (($selectionmade == 4) and ($assignment ne $prevassignment) and ($i>=1)) {
 		my ($name,$courseidinfo) = &get_name;
-		my $courseidinfo = &get_course();
+		$courseidinfo = &get_course();
 		if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
 		$prevassignment=$assignment;
 		$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$name.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}} \vskip -5 mm ';
@@ -884,6 +883,9 @@ ENDPART
 		} else {
 		    $texversion =~ s/\\end{document}//;
 		}
+		if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
+		    $texversion=&IndexCreation($texversion,$urlp);
+		}
 		$result .= $texversion;
 	    }
 	    $flag_latex_header_remove = 'YES';  
@@ -1201,7 +1203,7 @@ CHOOSE_FROM_SUBDIR
     if (($ENV{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) or 
 	($helper->{VARS}->{'construction'} eq '1')) {
         $paramHash = Apache::lonhelper::getParamHash();
-        $paramHash->{MESSAGE_TEXT} = "<br /><big><b><i>Next four options are available only for advanced users:  </i></b></big><br />";
+        $paramHash->{MESSAGE_TEXT} = "<br /><table><tr><td><big><b><i>Next four options are available only for advanced users:  </i></b></big></td><td>";
         Apache::lonhelper::message->new();
         $paramHash = Apache::lonhelper::getParamHash();
 	$paramHash->{'variable'} = 'ANSWER_TYPE';   
@@ -1214,7 +1216,7 @@ CHOOSE_FROM_SUBDIR
 
     if ($ENV{'request.role.adv'}) {
         $paramHash = Apache::lonhelper::getParamHash();
-        $paramHash->{MESSAGE_TEXT} = "<br />";
+        $paramHash->{MESSAGE_TEXT} = "</td></tr><tr><td>&nbsp;</td><td>";
         Apache::lonhelper::message->new();
         $paramHash = Apache::lonhelper::getParamHash();
 	$paramHash->{'variable'} = 'LATEX_TYPE';   
@@ -1229,11 +1231,9 @@ CHOOSE_FROM_SUBDIR
 				     ['Print in standard LaTeX mode', 'standard'] ];
 	}
         Apache::lonhelper::dropdown->new();
-    } 
-
-    if ($ENV{'request.role.adv'}) {
+ 
         $paramHash = Apache::lonhelper::getParamHash();
-        $paramHash->{MESSAGE_TEXT} = "<br />";
+        $paramHash->{MESSAGE_TEXT} = "</td></tr><tr><td>&nbsp;</td><td>";
         Apache::lonhelper::message->new();
         $paramHash = Apache::lonhelper::getParamHash();
 	$paramHash->{'variable'} = 'TABLE_CONTENTS';   
@@ -1244,7 +1244,7 @@ CHOOSE_FROM_SUBDIR
         Apache::lonhelper::dropdown->new();
         
         $paramHash = Apache::lonhelper::getParamHash();
-        $paramHash->{MESSAGE_TEXT} = "<br />";
+        $paramHash->{MESSAGE_TEXT} = "</td></tr><tr><td>&nbsp;</td><td>";
         Apache::lonhelper::message->new();
         $paramHash = Apache::lonhelper::getParamHash();
 	$paramHash->{'variable'} = 'TABLE_INDEX';   
@@ -1253,6 +1253,10 @@ CHOOSE_FROM_SUBDIR
                                    ['Print without Index', 'no'],
                                    ['Print with Index', 'yes'] ];
         Apache::lonhelper::dropdown->new();
+
+        $paramHash = Apache::lonhelper::getParamHash();
+        $paramHash->{MESSAGE_TEXT} = "</td></tr><table>";
+        Apache::lonhelper::message->new();
     }
 
     Apache::lonprintout::page_format_state->new("FORMAT");