--- loncom/interface/lonprintout.pm	2002/04/10 16:21:33	1.21
+++ loncom/interface/lonprintout.pm	2002/04/26 18:19:05	1.24
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.21 2002/04/10 16:21:33 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.24 2002/04/26 18:19:05 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -219,30 +219,30 @@ ENDPART
         m/.*\/(.*)/;
         $courseidinfo = $ENV{'course.physnet_'.$1.'.description'};
 	$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/\\begin{document}/\\textheight 25\.9cm\\oddsidemargin = -0\.57in\\evensidemargin = -0\.57in\\textwidth= 7\.7in\\renewcommand{\\ref}{\\keephidden\}\\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.5cm\]\[b\]{\\hfill}LON-CAPA\\copyright MSU GNU\/GPS $1/;
     }
-#-- LaTeX corrections 
+#-- 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);
+    }
     $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;
+	$result =~ s/\\\\\s+\[/ \[/g;
+    $result =~ s/&#952;/\$\\theta\$/g; #converts theta from html into tex
 #-- Do all of eps figures exist?
-    my $notepslist = '';
-    my $end_eps = index($result,'.eps}',0);
-    while ($end_eps != -1) {
-	my $start_eps = rindex($result,'{',$end_eps);
-        my $start_path = rindex($result,'\graphicspath{',$start_eps);
-        my $end_path = index($result,'}',$start_path);
-	my $chunk_eps = substr($result,$start_eps+1,$end_eps-$start_eps+3);
-	my $chunk_path = substr($result,$start_path+14,$end_path-$start_path-14);
-	$chunk_path =~ s/^{*//g;
-	unless (-s $chunk_path.$chunk_eps) {
-	    $notepslist .= $chunk_path.$chunk_eps;
-	}
-	 $end_eps = index($result,'.eps}',$end_eps+5);
-    }
+    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";
@@ -252,7 +252,7 @@ ENDPART
     } 
     print $temp_file $result;
 $r->print(<<FINALEND);
-<meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle&$notepslist">
+<meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle&$needconvert">
 </body>
 </html>
 FINALEND
@@ -331,12 +331,9 @@ sub handler {
     unless  ($ENV{'form.phase'}) {
 	&menu_for_output($r);
     }
-
-
 #-- core part 
     if ($ENV{'form.phase'} eq 'two') {
 	&output_data($r);
-
     }
     return OK;