--- rat/lonpage.pm 2002/09/16 14:23:02 1.46 +++ rat/lonpage.pm 2003/04/18 13:58:44 1.51 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Page Handler # -# $Id: lonpage.pm,v 1.46 2002/09/16 14:23:02 sakharuk Exp $ +# $Id: lonpage.pm,v 1.51 2003/04/18 13:58:44 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,7 +33,6 @@ # 10/02,10/10,10/14,10/16,10/18,10/19,10/31,11/6,11/14,11/16, # YEAR=2001 # 08/13/01,08/30,10/1 Gerd Kortemeyer -# 12/16 Scott Harrison # YEAR=2002 # 03/19 Gerd Kortemeyer # @@ -46,6 +45,7 @@ use Apache::Constants qw(:common :http); use Apache::lonnet(); use Apache::loncommon(); use Apache::lonxml(); +use Apache::lonmenu; use HTML::TokeParser; use GDBM_File; use Apache::lonsequence; @@ -239,6 +239,8 @@ sub handler { } } my $output=Apache::lonnet::ssi($src,%posthash); + $output=~ + s/\/\/ BEGIN LON\-CAPA Internal.+\/\/ END LON\-CAPA Internal\s//gs; if ($target eq 'tex') { $output =~ s/^([^&]+)\\begin{document}//; $output =~ s/\\end{document}//; @@ -348,19 +350,21 @@ sub handler { } # ------------------------------------------------------------------------ Head $r->print("\n\n".$allmeta); - $allscript=~ - s/\/\/ BEGIN LON\-CAPA Internal.+\/\/ END LON\-CAPA Internal\s//gs; if ($allscript) { $r->print("\n\n"); } - $r->print(&Apache::lonxml::registerurl(1,undef)); + $r->print(&Apache::lonmenu::registerurl(1,undef)); $r->print("\n\n"); # ------------------------------------------------------------------ Start body if ($isxml) { $r->print($xmlbody); } else { - $r->print(''); + $r->print( + ''. + &Apache::lonmenu::menubuttons(undef,$target,1) + ); } # ------------------------------------------------------------------ Start form if ($nforms) { @@ -368,7 +372,7 @@ sub handler { $requrl.'">'); } } else { - $r->print('\documentclass[letterpaper]{article} + $r->print('\documentclass{article} \newcommand{\keephidden}[1]{} \usepackage[dvips]{graphicx} \usepackage{epsfig} @@ -486,7 +490,7 @@ sub handler { unless ($target eq 'tex') { $r->print("\n"); } else { - $r->print('\end{longtable}'); + $r->print('\end{longtable}\strut'); } # ---------------------------------------------------------------- Submit, etc. if ($nforms) {