--- rat/lonpage.pm 2002/09/01 19:29:01 1.45
+++ rat/lonpage.pm 2003/07/19 13:11:41 1.52
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Page Handler
#
-# $Id: lonpage.pm,v 1.45 2002/09/01 19:29:01 www Exp $
+# $Id: lonpage.pm,v 1.52 2003/07/19 13:11:41 ng 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,15 @@ 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}//;
+ $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;
+ }
my $parser=HTML::TokeParser->new(\$output);
my $token;
my $thisdir=$src;
@@ -341,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) {
@@ -361,7 +372,7 @@ sub handler {
$requrl.'">');
}
} else {
- $r->print('\documentclass[letterpaper]{article}
+ $r->print('\documentclass{article}
\newcommand{\keephidden}[1]{}
\usepackage[dvips]{graphicx}
\usepackage{epsfig}
@@ -403,15 +414,18 @@ sub handler {
&Apache::lonnet::declutter($hash{'src_'.$rid});
$metainfo.=
''.
+# '&command=submission" target="LONcatInfo">'.
+ '&command=submission">'.
'
'.
''.
''.
+# '&command=gradingmenu" target="LONcatInfo">'.
+ '&command=gradingmenu">'.
'
'.
''.
''.
+# '" target="LONcatInfo">'.
+ '" >'.
'
'.
'';
}
@@ -479,7 +493,7 @@ sub handler {
unless ($target eq 'tex') {
$r->print("\n");
} else {
- $r->print('\end{longtable}');
+ $r->print('\end{longtable}\strut');
}
# ---------------------------------------------------------------- Submit, etc.
if ($nforms) {