[LON-CAPA-cvs] cvs: rat(bz2851) / lonpage.pm

foxr foxr@source.lon-capa.org
Tue, 06 Oct 2009 11:01:35 -0000


foxr		Tue Oct  6 11:01:35 2009 EDT

  Modified files:              (Branch: bz2851)
    /rat	lonpage.pm 
  Log:
  BZ2851 Centralize the production of the latex front matter -> londefdef.pm
  a last? holdout.
  
  
Index: rat/lonpage.pm
diff -u rat/lonpage.pm:1.91 rat/lonpage.pm:1.91.2.1
--- rat/lonpage.pm:1.91	Fri Dec 19 14:30:51 2008
+++ rat/lonpage.pm	Tue Oct  6 11:01:35 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.91 2008/12/19 14:30:51 raeburn Exp $
+# $Id: lonpage.pm,v 1.91.2.1 2009/10/06 11:01:35 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -274,7 +274,7 @@
                               if ($target eq 'tex') {
 				  $output =~ s/^([^&]+)\\begin{document}//;
 				  $output =~ s/\\end{document}//;
-				  $output = '\parbox{\minipagewidth}{ '.$output.' }';
+#				  $output = '\parbox{\minipagewidth}{ '.$output.' }';
                                   #some additional cleanup necessary for LateX (due to limitations of table environment 
 				  $output =~ s/(\\vskip\s*\d+mm)\s*(\\\\)+/$1/g;
 			      }
@@ -397,17 +397,21 @@
 					.'">');
 			  }
 		      } elsif ($target eq 'tex') {
-			  $r->print('\documentclass{article}
-                                 \newcommand{\keephidden}[1]{}           
-                                 \usepackage[dvips]{graphicx}
-                                 \usepackage{epsfig}
-                                 \usepackage{calc}
-                                 \usepackage{longtable}
-                                 \begin{document}');
+			  #  I think this is not needed as the header
+			  # will be put in for each of the page parts
+			  # by the londefdef.pm now that we are opening up
+			  # the parts of a page.
+			  #$r->print('\documentclass{article}
+                          #       \newcommand{\keephidden}[1]{}           
+                          #       \usepackage[dvips]{graphicx}
+                          #       \usepackage{epsfig}
+                          #       \usepackage{calc}
+                          #       \usepackage{longtable}
+                          #       \begin{document}');
 		      }
 # ----------------------------------------------------------------- Start table
 		      if ($target eq 'tex') {
-			  $r->print('\begin{longtable}INSERTTHEHEADOFLONGTABLE\endfirsthead\endhead ');
+#			 #  $r->print('\begin{longtable}INSERTTHEHEADOFLONGTABLE\endfirsthead\endhead ');
 			  if ($number_of_columns le $lcm) {$number_of_columns=$lcm;};
 		      } else {
 			  $r->print('<table width="100%" cols="'.$lcm.'" border="0">');