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

[sakharuk]

sakharuk		Wed May 28 15:03:22 2003 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  Changes to print CBI materials.
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.184 loncom/interface/lonprintout.pm:1.185
--- loncom/interface/lonprintout.pm:1.184	Tue May 27 15:00:35 2003
+++ loncom/interface/lonprintout.pm	Wed May 28 15:03:22 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.184 2003/05/27 19:00:35 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.185 2003/05/28 19:03:22 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -469,7 +469,7 @@
 
     my ($number_of_columns,$result) = @_;
 
-    $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g;
+#    $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g;
     $result =~ s/\$number_of_columns/$number_of_columns/g;
     $result =~ s/(\\end{document})/\\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  $1/;
     $result =~ s/(\\end{longtable}\s*)(\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g;
@@ -537,10 +537,10 @@
       #-- single document - problem, page, html, xml, ...
 	my $currentURL;
 	if ($helper->{'VARS'}->{'construction'} ne '1') {
-            #prins published resource
+            #prints published resource
 	    $currentURL=$helper->{'VARS'}->{'postdata'};
 	} else {
-            #prins resource from the construction space
+            #prints resource from the construction space
 	    $currentURL=$helper->{'VARS'}->{'filename'};
 	    $currentURL=~s/\/home\//\/~/;
 	    $currentURL=~s/public_html\///;
@@ -746,9 +746,6 @@
     }
 #-------------------------------------------------------- corrections for the different page formats
     $result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'});
-#    if ($layout eq 'CBI') {
-#        $laystyle = 'album';
-#    }
     $result = &latex_corrections($number_of_columns,$result);
 #    #changes page's parameters for the one column output 
 #    if ($ENV{'form.numberofcolumns'} == 1) {