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

[foxr]

foxr		Tue Jun 23 10:24:31 2009 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  Merge back to main branch.
  
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.556 loncom/interface/lonprintout.pm:1.557
--- loncom/interface/lonprintout.pm:1.556	Mon Jun 22 09:50:39 2009
+++ loncom/interface/lonprintout.pm	Tue Jun 23 10:24:31 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.556 2009/06/22 09:50:39 foxr Exp $
+# $Id: lonprintout.pm,v 1.557 2009/06/23 10:24:31 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1475,7 +1475,7 @@
 	    $result.=$texversion;
 
 	} elsif ($urlp=~/\.(sequence|page)$/) {
-	    
+ 
 	    # header:
 
 	    $result.='\strut\newline\noindent Sequence/page '.$urlp.'\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent ';
@@ -1630,7 +1630,7 @@
 	}
 	$selectionmade = 1;
 	if ($cleanURL!~m|^/adm/|
-	    && $cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+	    && $cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
 	    my $rndseed=time;
 	    my $texversion='';
 	    if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
@@ -1723,7 +1723,7 @@
 		($result,$number_of_columns) = &page_cleanup($result);
 	    }
         } elsif ($cleanURL!~m|^/adm/|
-		 && $currentURL=~/\.sequence$/ && $helper->{'VARS'}->{'construction'} eq '1') {
+		 && $currentURL=~/\.(sequence|page)$/ && $helper->{'VARS'}->{'construction'} eq '1') {
             #printing content of sequence from the construction space	
 	    $currentURL=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;
 #	    $result .= &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});