--- loncom/homework/structuretags.pm 2002/05/24 20:33:55 1.94
+++ 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.94 2002/05/24 20:33:55 sakharuk Exp $
+# $Id: structuretags.pm,v 1.97 2002/06/21 20:27:54 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -201,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
@@ -290,10 +290,11 @@ sub start_problem {
$ENV{'request.uri'}.'">
-
+
-
+
+
';
my $temp=&Apache::edit::insertlist($target,$token);
$result.=$temp;
@@ -301,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 = '';
@@ -345,9 +350,15 @@ sub end_problem {
}
} elsif ($target eq 'edit') {
&Apache::lonxml::debug("in end_problem with $target, edit");
- $result='
';
+ $result ='
';
+ $result.='';
} elsif ($target eq 'tex') {
- $result .= '\vskip 0.5mm\noindent\makebox[9.0cm][b]{\hrulefill}\end{document}';
+ $result .= '\vskip 0.5mm\noindent\makebox[9.0cm][b]{\hrulefill}';
+ if (not $ENV{'request.symb'} =~ m/\.page_/) {
+ $result .= '\end{document} ';
+ } else {
+ $result .= '\end{minipage} ';
+ }
}
return $result;
}
@@ -515,6 +526,7 @@ sub end_randomlist {
sub start_part {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $result='';
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
if ($id eq '') { $id = $Apache::lonxml::curdepth; }
$Apache::inputtags::part=$id;
@@ -522,7 +534,7 @@ sub start_part {
@Apache::inputtags::previous=();
if ($target eq 'meta') {
return &Apache::response::mandatory_part_meta;
- } elsif ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
+ } elsif ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
my ($status,$accessmsg) = &Apache::lonhomework::check_access($id);
push (@Apache::inputtags::status,$status);
my $expression='$external::datestatus="'.$status.'";';
@@ -531,15 +543,17 @@ sub start_part {
if ( $status eq 'CLOSED' ) {
my $bodytext=&Apache::lonxml::get_all_text("/part",$$parser[$#$parser]);
if ( $target eq "web" ) {
- return "
Part is not open to be viewed. It $accessmsg
";
+ $result="
Part is not open to be viewed. It $accessmsg
";
+ } elsif ( $target eq 'tex' ) {
+ $result="\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\";
+ }
+ } else {
+ if ($target eq 'tex') {
+ $result='\vskip 0 mm';
}
}
}
- if ($target eq 'tex') {
- return '\vskip 0 mm';
- } else {
- return '';
- }
+ return $result;
}
sub end_part {