--- loncom/homework/structuretags.pm 2002/04/11 17:37:13 1.90
+++ loncom/homework/structuretags.pm 2002/06/21 20:27:54 1.97
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.90 2002/04/11 17:37:13 albertel Exp $
+# $Id: structuretags.pm,v 1.97 2002/06/21 20:27:54 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -150,11 +150,10 @@ permanent record is left in the system.<
Checking out resources is subject to course policies, and may exclude future
credit even if done erroneously.
-
-
ENDCHECKOUT
}
@@ -202,7 +201,7 @@ sub start_problem {
#should get back a or the neccesary stuff to start XML/MathML
my ($result,$head_tag_start,$body_tag_start)=
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
-
+ if ($target eq 'tex' and $ENV{'request.symb'} =~ m/\.page_/) { $result = '';}
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
#handle exam checkout
@@ -267,6 +266,9 @@ sub start_problem {
$rndseed.'" />
+ Show All Foils
';
}
# if we are viewing someone else preserve that info
@@ -288,10 +290,11 @@ sub start_problem {
$ENV{'request.uri'}.'">
-
+
-
+
+
';
my $temp=&Apache::edit::insertlist($target,$token);
$result.=$temp;
@@ -299,7 +302,11 @@ sub start_problem {
$result=$token->[4];
$result.=&Apache::edit::handle_insert();
} elsif ($target eq 'tex') {
- $result .= '\begin{document} ';
+ if (not $ENV{'request.symb'} =~ m/\.page_/) {
+ $result .= '\begin{document} ';
+ } else {
+ $result .= '\begin{minipage}{\minipagewidth} ';
+ }
} else {
# page_start returned a starting result, delete it if we don't need it
$result = '';
@@ -315,7 +322,8 @@ sub end_problem {
if ( $target eq 'grade' && $Apache::inputtags::part eq '0') {
# if part is zero, no s existed, so we need to the grading
&Apache::inputtags::grade;
- } elsif ( $target eq 'web' && $Apache::inputtags::part eq '0') {
+ } elsif ( $target eq 'web' && $Apache::inputtags::part eq '0' &&
+ $status ne 'UNCHECKEDOUT') {
# if part is zero, no s existed, so we need show the current
# grading status
$result.= &Apache::inputtags::gradestatus($Apache::inputtags::part);
@@ -326,7 +334,8 @@ sub end_problem {
) {
if ($status eq 'CAN_ANSWER') {
$result.="\n";
- } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {
+ } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' ||
+ $status eq 'UNCHECKEDOUT' ) {
$result.="