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

[raeburn]

raeburn		Mon May 24 22:10:42 2010 EDT

  Modified files:              (Branch: version_2_9_X)
    /loncom/interface	lonprintout.pm 
  Log:
  - Backport 1.580.
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.568.2.6 loncom/interface/lonprintout.pm:1.568.2.7
--- loncom/interface/lonprintout.pm:1.568.2.6	Sat May 22 13:36:55 2010
+++ loncom/interface/lonprintout.pm	Mon May 24 22:10:42 2010
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.568.2.6 2010/05/22 13:36:55 raeburn Exp $
+# $Id: lonprintout.pm,v 1.568.2.7 2010/05/24 22:10:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2304,7 +2304,11 @@
 		if ($i > 0) {
 		    $result .= '\cleardoublepage';
 		}
-		$result .= &include_pdf($urlp);
+                my $texfrompdf = &include_pdf($urlp);
+                if ($flag_latex_header_remove ne 'NO') {
+                    $texfrompdf = &latex_header_footer_remove($texfrompdf);
+                }
+                $result .= $texfrompdf;
 		if ($i != $#master_seq) {
 		    if ($numberofcolumns eq '1') {
 			$result .= '\newpage';