--- loncom/interface/lonprintout.pm	2002/04/01 18:23:12	1.20
+++ loncom/interface/lonprintout.pm	2002/04/25 21:38:42	1.23
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.20 2002/04/01 18:23:12 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.23 2002/04/25 21:38:42 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -136,13 +136,12 @@ ENDPART
             $_ = $1;
             my $urlp = $1;
 	    if ($choice eq 'Standard LaTeX output for the primary sequence') {
-		if (/\.problem/) {
+		if (/\.(problem|exam|quiz|assess|survey|form|library)/) {
 		    my %moreenv;
 		    $moreenv{'form.grade_target'}='tex';
 		    &Apache::lonnet::appenv(%moreenv);
 		    my $texversion=&Apache::lonnet::ssi($urlp);
 		    &Apache::lonnet::delenv('form.grade_target');
-		    $texversion =~ s!\.gif!\.eps!g;
 		    $result .= $texversion;        
 		}
 	    } else {
@@ -150,7 +149,6 @@ ENDPART
 		&Apache::lonnet::appenv(%moreenv);
 		my $texversion=&Apache::lonnet::ssi($urlp);
 		&Apache::lonnet::delenv('form.grade_target');
-		$texversion =~ s!\.gif!\.eps!g;
 		$result .= $texversion;    
 	    }
 	}
@@ -192,13 +190,12 @@ ENDPART
 	    m/\"(.*)\"/;
             $_ = $1;
             my $urlp = $1;
-            if (/\.problem/) {
+            if (/\.(problem|exam|quiz|assess|survey|form|library)/) {
 		my %moreenv;
 		$moreenv{'form.grade_target'}='tex';
 		&Apache::lonnet::appenv(%moreenv);
 		my $texversion=&Apache::lonnet::ssi($urlp);
 		&Apache::lonnet::delenv('form.grade_target');
-		$texversion =~ s!\.gif!\.eps!;
 		$result .= $texversion;        
 	    }
 	}
@@ -224,13 +221,26 @@ ENDPART
 	$result =~ s/\\documentclass\[letterpaper\]{article}/\\documentclass\[twocolumn\]{article}/;
 	$result =~ s/\\begin{document}/\\textheight 25\.9cm\\oddsidemargin = -0\.57in\\evensidemargin = -0\.57in\\textwidth= 7\.7in\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1}\\noindent\\fbox{\\textbf{$ENV{'environment.firstname'} $ENV{'environment.lastname'}}}\\hskip 1\.4in $courseidinfo \\vskip 5 mm /;
 	$result =~ s/\\includegraphics/\\includegraphics\[width=9\.0 cm\]/g;
-	$result =~ s/(\\end{document})/\\newline\\noindent\\makebox\[9.0cm\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Dept\. of Physics and Astronomy, MSU\\makebox\[1.0cm\]\[b\]{\\hfill}LON-CAPA\\copyright MSU GNU\/GPS $1/;
+	$result =~ s/(\\end{document})/\\newline\\noindent\\makebox\[9.0cm\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Dept\. of Physics and Astronomy, MSU\\makebox\[1.5cm\]\[b\]{\\hfill}LON-CAPA\\copyright MSU GNU\/GPS $1/;
+    }
+#-- LaTeX corrections     
+    my $first_comment = index($result,'<!--',0);
+    while ($first_comment != -1) {
+	my $end_comment = index($result,'-->',$first_comment);
+	substr($result,$first_comment,$end_comment-$first_comment+3) = '';
+	$first_comment = index($result,'<!--',$first_comment);
     }
-#-- LaTeX corrections 
     $result =~ s/^\s+$//gm; #remove empty lines
     $result =~ s/%/\\%/g;   #corrects %
     $result =~ s/(\s)+/$1/g; #removes more than one empty space
-    $result =~ s/\\\\\s*(\\vskip)/ $1/gm;
+    $result =~ s/\\\\\s*\\vskip/\\vskip/gm;
+    $result =~ s/ (<|>|) / \$$1\$ /g; #corrects < or >
+    $result =~ s/\\\\\s*\\noindent\s*(\\\\)+/\\\\\\noindent/g;
+    $result =~ s/{\\par }\s*\\\\/\\\\/gm;
+#-- Do all of eps figures exist?
+    my $needconvert = 0;
+    $_ = $result;
+    if (/\\needepsconversion/) { $needconvert = 1; }  
 #-- writing .tex file in prtspool 
     my $temp_file;
     $filename = "/home/httpd/prtspool/$ENV{'user.name'}$ENV{'user.domain'}temp$ENV{'user.login.time'}.tex";
@@ -240,7 +250,7 @@ ENDPART
     } 
     print $temp_file $result;
 $r->print(<<FINALEND);
-<meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle">
+<meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle&$needconvert">
 </body>
 </html>
 FINALEND
@@ -319,12 +329,9 @@ sub handler {
     unless  ($ENV{'form.phase'}) {
 	&menu_for_output($r);
     }
-
-
 #-- core part 
     if ($ENV{'form.phase'} eq 'two') {
 	&output_data($r);
-
     }
     return OK;