[LON-CAPA-cvs] cvs: loncom(version_1_3_X) /interface lonprintout.pm

[albertel]

albertel		Wed Feb  9 14:53:55 2005 EDT

  Modified files:              (Branch: version_1_3_X)
    /loncom/interface	lonprintout.pm 
  Log:
  - backport 1.344
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.343.2.2 loncom/interface/lonprintout.pm:1.343.2.3
--- loncom/interface/lonprintout.pm:1.343.2.2	Tue Jan  4 17:00:20 2005
+++ loncom/interface/lonprintout.pm	Wed Feb  9 14:53:55 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.343.2.2 2005/01/04 22:00:20 albertel Exp $
+# $Id: lonprintout.pm,v 1.343.2.3 2005/02/09 19:53:55 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -698,12 +698,13 @@
 sub print_latex_header {
     my $mode=shift;
     my $output='\documentclass[letterpaper]{article}';
-    if ($mode eq 'batchmode') {
+    if ($mode eq 'batchmode' || !$ENV{'request.role.adv'}) {
 	$output.='\batchmode';
     }
     $output.='\newcommand{\keephidden}[1]{}\renewcommand{\deg}{$^{\circ}$}'."\n".
 	     '\usepackage{longtable}\usepackage{textcomp}\usepackage{makeidx}'."\n".
-	     '\usepackage[dvips]{graphicx}\usepackage{epsfig}\usepackage{calc}'."\n".
+	     '\usepackage[dvips]{graphicx}\usepackage{epsfig}'."\n".
+	     '\usepackage{picins}\usepackage{calc}'."\n".
 	     '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}'."\n".
 	     '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}'."\n".
 	     '\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}'."\n".
@@ -1103,7 +1104,9 @@
 	    if (&Apache::loncommon::connection_aborted($r)) { last; }
 	}
 	&Apache::lonnet::delenv('form.counter');
-	if ($flag_page_in_sequence eq 'YES') {$result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;}	
+	if ($flag_page_in_sequence eq 'YES') {
+	    $result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;
+	}	
 	$result .= '\end{document}';
      } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') ||
 	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students')){