--- loncom/homework/structuretags.pm 2002/09/03 01:19:13 1.110
+++ loncom/homework/structuretags.pm 2002/10/14 20:48:36 1.126
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.110 2002/09/03 01:19:13 albertel Exp $
+# $Id: structuretags.pm,v 1.126 2002/10/14 20:48:36 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -161,8 +161,14 @@ sub problem_web_to_edit_header {
Show All Foils
+ $result.= ' /> Show All Foils
';
+ my $numtoanalyze=$ENV{'form.numtoanalyze'};
+ if (!$numtoanalyze) { $numtoanalyze=100; }
+ #DISABLED for now.
+ #$result.= '
+# ';
}
sub initialize_storage {
@@ -297,7 +303,9 @@ sub start_problem {
$msg.=&checkout_msg;
}
$result.=$msg.' ';
- }
+ } elsif ($target eq 'tex') {
+ $result.="\\begin{document}\\noindent \\vskip 1 mm \\begin{minipage}{\\textwidth}\\vskip 0 mm Problem is not open to be viewed. It $accessmsg \\vskip 0 mm ";
+ }
} elsif ($target eq 'web') {
my $name= &get_resource_name($parstack,$safeeval);
if ($status eq 'CAN_ANSWER') {
@@ -345,18 +353,18 @@ sub start_problem {
print $temp_file "$duedate\n";
if (not $ENV{'request.symb'} =~ m/\.page_/) {
if(not $duedate=~m/1969/) {
- $result .= '\begin{document} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm';
+ $result .= '\begin{document} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent \begin{minipage}{\textwidth}';
} else {
- $result .= '\begin{document} \noindent \vskip 1 mm';
+ $result .= '\begin{document} \noindent \vskip 1 mm \noindent\begin{minipage}{\textwidth}';
}
} else {
- $result .= '\parbox{\minipagewidth}{\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';
+ $result .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';
}
} else {
if (not $ENV{'request.symb'} =~ m/\.page_/) {
- $result .= '\begin{document} \noindent \vskip 1 mm';
+ $result .= '\begin{document} \noindent \vskip 1 mm\noindent\begin{minipage}{\textwidth}';
} else {
- $result .= '\parbox{\minipagewidth}{\vskip 1mm \\\\\\\\';
+ $result .= '\vskip 1mm \\\\\\\\';
}
}
}
@@ -387,14 +395,12 @@ sub end_problem {
$status ne 'UNCHECKEDOUT') {
# if part is zero, no s existed, so we need show the current
# grading status
- my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part);
- #FIXME this is ugly we should just generate tex in inputtags
- if ($target eq 'tex') { $gradestatus=&html_to_tex($gradestatus); }
- $result.= $gradestatus;
+ my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part,$target);
+ if ($Apache::lonhomework::type ne 'exam') {$result.= $gradestatus;}
}
if (
- (($target eq 'web' || $target eq 'tex') && ($ENV{'request.state'} ne 'construct')) ||
- ($target eq 'answer')
+ (($target eq 'web') && ($ENV{'request.state'} ne 'construct')) ||
+ ($target eq 'answer') || ($target eq 'tex')
) {
if ($status eq 'CAN_ANSWER') {
if ($target ne 'tex') {
@@ -411,9 +417,9 @@ sub end_problem {
} else {
$result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
if (not $ENV{'request.symb'} =~ m/\.page_/) {
- $result .= '\end{document} ';
+ $result .= '\end{minipage}\end{document} ';
} else {
- $result .= '} ';
+ $result .= '';
}
}
}
@@ -432,21 +438,6 @@ sub end_problem {
return $result;
}
-#FIXME I am ugly shoot me
-sub html_to_tex {
- my ($string)=@_;
- $string =~ s/