--- loncom/interface/lonprintout.pm	2003/08/18 18:18:48	1.216
+++ loncom/interface/lonprintout.pm	2003/08/20 18:34:14	1.221
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.216 2003/08/18 18:18:48 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.221 2003/08/20 18:34:14 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -687,6 +687,10 @@ ENDPART
 	    if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
 		$texversion=&IndexCreation($texversion,$currentURL);
 	    }
+	    if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes') {
+		$texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$currentURL| \\strut\\\\\\strut /;
+
+	    }
 	    $result .= $texversion;
 	    if ($currentURL=~m/\.page\s*$/) {
 		($result,$number_of_columns) = &page_cleanup($result);
@@ -755,7 +759,7 @@ ENDPART
 	    }
 	    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 ';
@@ -812,13 +816,13 @@ ENDPART
 	    }
 	    my $courseidinfo = &get_course();
 	    if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
-
+	    my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
 	    if ($current_output=~/\\documentclass/) {
-		$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}}$courseidinfo \\hfill \\thepage \\\\ \\textit{$helper->{VARS}->{'assignment'}}}\\vskip 3 mm /;
+		$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}}$courseidinfo \\hfill \\thepage \\\\ \\textit{$currentassignment}}\\vskip 3 mm /;
 	    } else {
 		my $blanspages = '';
 		for (my $j=0;$j<$helper->{'VARS'}->{'EMPTY_PAGES'};$j++) {$blanspages.='\clearpage\strut\clearpage';}
-		$current_output = '\strut\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage '.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$helper->{VARS}->{'assignment'}.'}}} \vskip -5 mm '.$current_output;
+		$current_output = '\strut\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage '.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$currentassignment.'}}} \vskip -5 mm '.$current_output;
 	    }
 	    $result .= $current_output;
 	    &Apache::lonnet::delenv('form.counter');	    
@@ -886,6 +890,10 @@ ENDPART
 		if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
 		    $texversion=&IndexCreation($texversion,$urlp);
 		}
+		if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes') {
+		    $texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$urlp| \\strut\\\\\\strut /;
+		    
+		}
 		$result .= $texversion;
 	    }
 	    $flag_latex_header_remove = 'YES';  
@@ -1203,7 +1211,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';   
@@ -1216,7 +1224,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';   
@@ -1231,11 +1239,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';   
@@ -1245,16 +1251,35 @@ CHOOSE_FROM_SUBDIR
                                    ['Print with Table of Contents', 'yes'] ];
         Apache::lonhelper::dropdown->new();
         
+	if (not $helper->{VARS}->{'construction'}) {
+	    $paramHash = Apache::lonhelper::getParamHash();
+	    $paramHash->{MESSAGE_TEXT} = "</td></tr><tr><td>&nbsp;</td><td>";
+	    Apache::lonhelper::message->new();
+	    $paramHash = Apache::lonhelper::getParamHash();
+	    $paramHash->{'variable'} = 'TABLE_INDEX';   
+	    $helper->declareVar('TABLE_INDEX');         
+	    $paramHash->{CHOICES} = [
+				     ['Print without Index', 'no'],
+				     ['Print with Index', 'yes'] ];
+	    Apache::lonhelper::dropdown->new();
+	}
+
+	if ($helper->{VARS}->{'construction'}) {
+	    $paramHash = Apache::lonhelper::getParamHash();
+	    $paramHash->{MESSAGE_TEXT} = "</td></tr><tr><td>&nbsp;</td><td>";
+	    Apache::lonhelper::message->new();
+	    $paramHash = Apache::lonhelper::getParamHash();
+	    $paramHash->{'variable'} = 'CONSTR_RESOURSE_URL';   
+	    $helper->declareVar('CONSTR_RESOURSE_URL');         
+	    $paramHash->{CHOICES} = [
+				     ['Print without URL', 'no'],
+				     ['Print with UTL', 'yes'] ];
+	    Apache::lonhelper::dropdown->new();
+	}
+
         $paramHash = Apache::lonhelper::getParamHash();
-        $paramHash->{MESSAGE_TEXT} = "<br />";
+        $paramHash->{MESSAGE_TEXT} = "</td></tr><table>";
         Apache::lonhelper::message->new();
-        $paramHash = Apache::lonhelper::getParamHash();
-	$paramHash->{'variable'} = 'TABLE_INDEX';   
-	$helper->declareVar('TABLE_INDEX');         
-        $paramHash->{CHOICES} = [
-                                   ['Print without Index', 'no'],
-                                   ['Print with Index', 'yes'] ];
-        Apache::lonhelper::dropdown->new();
     }
 
     Apache::lonprintout::page_format_state->new("FORMAT");