--- loncom/homework/structuretags.pm	2003/05/13 20:38:55	1.171
+++ loncom/homework/structuretags.pm	2003/08/13 17:54:12	1.203
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.171 2003/05/13 20:38:55 sakharuk Exp $
+# $Id: structuretags.pm,v 1.203 2003/08/13 17:54:12 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,7 +38,8 @@ use Apache::File();
 use Apache::lonmenu;
 
 BEGIN {
-    &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
+    &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext',
+'simpleeditbutton','definetag'));
 }
 
 sub start_web {
@@ -56,11 +57,12 @@ sub end_web {
 
 sub start_tex {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $result='';
     my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
     if ($target eq 'tex') {
 	return $bodytext.' ';
     }
-    return '';
+    return $result;;
 }
 
 sub end_tex {
@@ -89,6 +91,7 @@ sub page_start {
 	    'onUnload="'.&Apache::lonmenu::unloadevents().'" ';
 	my $background=&Apache::lonxml::get_param('background',$parstack,
 						  $safeeval);
+	if ($ENV{'browser.imagesuppress'} eq 'on') { $background=''; }
 	if ($background) {
 	    $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
 		$background;
@@ -96,12 +99,15 @@ sub page_start {
 	} else {
 	    my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,
 						   $safeeval);
-	    if ($bgcolor) {
+	    if (($bgcolor) && ($ENV{'browser.blackwhite'} ne 'on')) {
 		$body_tag_start.='bgcolor="'.$bgcolor.'" ';
 	    } else {
 		$body_tag_start.='bgcolor="#ffffff"';
 	    }
 	}
+	if ($ENV{'browser.fontenhance'} eq 'on') {
+	    $body_tag_start.=' style="font-size: x-large;" ';
+	}
 	$body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1);
 	if ($target eq 'web' && $ENV{'request.state'} ne 'construct') {
 	    my ($symb,undef,undef,undef,$publicuser)=
@@ -146,10 +152,17 @@ sub setup_rndseed {
 		$ENV{'form.rndseed'}=$rndseed;
 	    }
 	}
-	if ($ENV{'form.resetdata'} eq 'New Problem Variation') {
-	    $rndseed=time;
+	if ($ENV{'form.resetdata'} eq 'New Problem Variation' ||
+	    $ENV{'form.newrandomization'} eq 'New Randomization') {
+	    srand(time);
+	    $rndseed=int(rand(2100000000));
 	    $ENV{'form.rndseed'}=$rndseed;
+	    delete($ENV{'form.resetdata'});
+	    delete($ENV{'form.newrandomization'});
 	}
+	if (defined($rndseed) && $rndseed ne int($rndseed)) {
+	   $rndseed=join(',',&Math::Random::random_seed_from_phrase($rndseed));
+        }
 	&Apache::lonxml::debug("Setting rndseed to $rndseed");
 	&Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
     }
@@ -177,19 +190,24 @@ sub problem_web_to_edit_header {
     my $result.='<input type="hidden" name="problemmode" value="View" />
              <input type="submit" name="problemmode" value="Edit" />
              <input type="submit" name="problemmode" value="EditXML" />
-             Random Seed:<input type="text" name="rndseed" width="10" value="'.
-	       $rndseed.'" />
-             <input type="submit" name="changerandseed" value="Change" />
+             <input type="submit" name="newrandomization" value="New Randomization" />
              <input type="submit" name="resetdata" value="Reset Submissions" />
+             <nobr><input type="submit" name="changerandseed" value="Change Random Seed To:" />
+              <input type="text" name="rndseed" width="10" value="'.
+	       $rndseed.'"
+           onChange="javascript:document.lonhomework.changerandseed.click()" /></nobr>
              <input type="checkbox" name="showallfoils" ';
     if (defined($ENV{'form.showallfoils'})) { $result.='checked="on"'; }
     $result.= ' />&nbsp;Show&nbsp;All&nbsp;Foils
              <hr />';
     my $numtoanalyze=$ENV{'form.numtoanalyze'};
-    if (!$numtoanalyze) { $numtoanalyze=100; }
-    $result.= '<input type="submit" name="problemmode" value="Answer Distribution" />
+    if (!$numtoanalyze) { $numtoanalyze=20; }
+    $result.= '<input type="submit" name="problemmode" value="Calculate answers" /> for
              <input type="text" name="numtoanalyze" value="'.
-		 $numtoanalyze.'" size="5" /> <hr />';
+		 $numtoanalyze.'" size="5" /> versions of this problem.'.
+		     &Apache::loncommon::help_open_topic("Analyze_Problem",
+						     '',undef,undef,300).
+		     '<hr />';
     return $result;
 }
 
@@ -253,18 +271,19 @@ ENDCHECKOUT
 sub start_problem {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 
-    $Apache::lonhomework::parsing_a_problem=1;
-    # meta is called from lonpublisher, which doesn't uses the normal
-    # lonhomework method of parsing the file which means that inputtags 
-    # won't get reset
-    if ( $Apache::inputtags::part ne '' && $target != 'meta' ) {
-	&Apache::lonxml::error('Only one problem allowed in a .problem file');
-	my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
+    if ( $Apache::inputtags::part ne '' ||
+	 $Apache::lonhomework::parsing_a_problem) {
+	&Apache::lonxml::error('Only one &lt;problem&gt; allowed in a .problem file');
+	#my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
 	return '';
     }
+
+    $Apache::lonhomework::parsing_a_problem=1;
 #initialize globals
     $Apache::inputtags::part='0';
+    @Apache::inputtags::partlist=('0');
     @Apache::inputtags::responselist = ();
+    @Apache::inputtags::importlist = ();
     @Apache::inputtags::previous=();
     @Apache::inputtags::previous_version=();
     $Apache::structuretags::printanswer='No';
@@ -333,7 +352,7 @@ sub start_problem {
 		    '<input type="submit" name="resetdata"
                              value="New Problem Variation" />'.
 		    '<input type="hidden" name="username"
-                             value="'.$ENV{'form.username'}.'" />';
+                             value="'.$ENV{'form.username'}.'" /> <br />';
 	}
 	($status,$accessmsg) = &Apache::lonhomework::check_access('0');
 	push (@Apache::inputtags::status,$status);
@@ -376,7 +395,7 @@ sub start_problem {
               $body_tag_start \n $form_tag_start".	
 		  '<input type="hidden" name="submitted" value="yes" />';
 		if ($ENV{'request.state'} eq "construct") {
-		    $result.= &problem_web_to_edit_header($rndseed);
+		    $result.= &problem_web_to_edit_header($ENV{'form.rndseed'});
 		}
 		# if we are viewing someone else preserve that info
 		if (defined $ENV{'form.grade_symb'}) {
@@ -391,6 +410,10 @@ sub start_problem {
 		    "<title>$name</title></head>\n$body_tag_start\n";
 	    }
 	} elsif ($target eq 'tex') {
+	    my $startminipage = '';
+	    if (not $ENV{'form.problem_split'}=~/yes/) {
+		$startminipage = '\begin{minipage}{\textwidth}';
+	    }
 	    my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
 	    if ($name eq '') {
 		$name=&Apache::lonnet::EXT('resource.title');
@@ -420,14 +443,19 @@ sub start_problem {
 	    my $due_file_content = $due_file_content[$#due_file_content];
 	    chomp $due_file_content;
 	    my $name_of_resourse= &get_resource_name($parstack,$safeeval);
+	    if (not $name_of_resourse=~/\S+/) {
+		$name_of_resourse=$ENV{'request.uri'};
+		$name_of_resourse=~/\/([^\/]+)$/;
+		$name_of_resourse=$1;
+	    }
 	    if ($due_file_content ne $duedate) {
 		$temp_file = Apache::File->new('>'.$filename);
 		print $temp_file "$duedate\n";
 		if (not $ENV{'request.symb'} =~ m/\.page_/) {
 		    if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') {
-			$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent \begin{minipage}{\textwidth}';	
+			$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND}\addcontentsline{toc}{subsection}{'.$name_of_resourse.'} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent '.$startminipage;	
 		    } else {
-			$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent\begin{minipage}{\textwidth}';
+			$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND}\addcontentsline{toc}{subsection}{'.$name_of_resourse.'} \noindent \vskip 1 mm \noindent'.$startminipage;
 			if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
 		    }
 		} else {
@@ -435,7 +463,7 @@ sub start_problem {
 		}
 	    } else {
 		if (not $ENV{'request.symb'} =~ m/\.page_/) {
-		    $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent\begin{minipage}{\textwidth}';	
+		    $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND}\addcontentsline{toc}{subsection}{'.$name_of_resourse.'} \noindent \vskip 1 mm\noindent'.$startminipage;	
 		    if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
 		} else {
 		    $result .= '\vskip 1mm \\\\\\\\';
@@ -480,21 +508,27 @@ sub end_problem {
 	    ($target eq 'answer') || ($target eq 'tex')
 	   ) {
 	    if ($status eq 'CAN_ANSWER') {
-		if ($target ne 'tex') {
-		    if ($ENV{'form.print_answer'} ne 'yes') {$result.="</form></body>\n";}
+		if ($target ne 'tex' &&
+		    $ENV{'form.answer_output_mode'} ne 'tex') {
+		    $result.="</form></body>\n";
 		}
 	    } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' ||
 		     $status eq 'UNCHECKEDOUT' ) {
-		if ($target ne 'tex') {
+		if ($target ne 'tex' &&
+		    $ENV{'form.answer_output_mode'} ne 'tex') {
 		    $result.="</body>\n";
 		}
 	    }
 	    if ($target eq 'web') {
 		$result.=&Apache::lonxml::xmlend();
 	    } elsif ($target eq 'tex') {
-		$result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
+		my $endminipage = '';
+		if (not $ENV{'form.problem_split'}=~/yes/) {
+		    $endminipage = '\end{minipage}';
+		}
+		$result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
 		if (not $ENV{'request.symb'} =~ m/\.page_/) {
-		    $result .= '\end{minipage}\end{document} ';
+		    $result .= $endminipage.'\end{document} ';
 		} else {
 		    $result .= '';
 		}
@@ -504,14 +538,14 @@ sub end_problem {
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
 	    &finalize_storage();
 	}
-	if ($target eq 'answer' && ($ENV{'request.state'} eq 'construct') ) {
-	    if ($ENV{'form.print_answer'} ne 'yes') {
-		$result.='</html>'; #normally we get it from xmlend, but in CSTR
-		                    # we always show answer mode too.
-	    }
+	if ($target eq 'answer' && ($ENV{'request.state'} eq 'construct')
+	    && $ENV{'form.answer_output_mode'} ne 'tex') {
+	    $result.='</html>'; # normally we get it from xmlend, but in CSTR
+	                        # we always show answer mode too.
 	}
     } elsif ($target eq 'meta') {
 	if ($Apache::inputtags::part eq '0') {
+	    @Apache::inputtags::response=();
 	    $result=&Apache::response::mandatory_part_meta;
 	}
     } elsif ($target eq 'edit') {
@@ -519,6 +553,9 @@ sub end_problem {
 	$result = &problem_edit_footer();
     }
 
+    if ($ENV{'request.state'} eq 'construct' && $target eq 'web') {
+	&Apache::inputtags::check_for_duplicate_ids();
+    }
     undef(%Apache::lonhomework::history);
     undef(%Apache::lonhomework::results);
     undef($Apache::inputtags::part);
@@ -568,15 +605,39 @@ sub end_library {
     return $result;
 }
 
-sub start_block {
+sub start_definetag {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 
     my $result;
 
+    my $name = $token->[2]->{'name'};
+    my $skip=&Apache::lonxml::get_all_text("/definetag",$parser);
+    if ($name=~/^\//) {
+	$result=
+ '<br /><table bgcolor="#FFBBBB"><tr><th>END <tt>'.$name.'</tt></th></tr>';
+    } else {
+	$result=
+ '<br /><table bgcolor="#BBFFBB"><tr><th>BEGIN <tt>'.$name.'</tt></th></tr>';
+    }
+    $skip=~s/\</\&lt\;/gs;
+    $skip=~s/\>/\&gt\;/gs;
+    $result.='<tr><td><pre>'.$skip.'</pre></td></tr></table>';
+    return $result;
+}
+
+sub end_definetag {
+    return '';
+}
+
+sub start_block {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+
+    my $result;
+
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
 	$target eq 'tex' || $target eq 'analyze') {
 	my $code = $token->[2]->{'condition'};
-	if ($code) {
+	if (defined($code)) {
 	    if (!$Apache::lonxml::default_homework_loaded) {
 		&Apache::lonxml::default_homework_load($safeeval);
 	    }
@@ -586,7 +647,7 @@ sub start_block {
 	    $result='1';
 	}
 	if ( ! $result ) {
-	    my $skip=&Apache::lonxml::get_all_text("/block",$parser);
+	    my $skip=&Apache::lonxml::get_all_text("/block",$parser,$style);
 	    &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
 	}
 	$result='';
@@ -613,7 +674,7 @@ sub end_block {
 }
 
 sub start_languageblock {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
 
     my $result;
 
@@ -635,7 +696,8 @@ sub start_languageblock {
             }
 	}
 	if ( ! $result ) {
-	    my $skip=&Apache::lonxml::get_all_text("/languageblock",$parser);
+	    my $skip=&Apache::lonxml::get_all_text("/languageblock",$parser,
+						   $style);
 	    &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
 	}
 	$result='';
@@ -665,7 +727,7 @@ sub end_languageblock {
 }
 
 sub start_instructorcomment {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
 
     my $result;
 
@@ -673,7 +735,8 @@ sub start_instructorcomment {
 	$target eq 'tex' || $target eq 'analyze') {
         $result=($ENV{'request.role'}=~/^(in|cc|au|ca|li)/);
 	if ( ! $result ) {
-	    my $skip=&Apache::lonxml::get_all_text("/instructorcomment",$parser);
+	    my $skip=&Apache::lonxml::get_all_text("/instructorcomment",
+						   $parser,$style);
 	    &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
 	}
 	$result='';
@@ -844,7 +907,8 @@ sub start_part {
     my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
     if ($id eq '') { $id = $Apache::lonxml::curdepth; }
     $Apache::inputtags::part=$id;
-    @Apache::inputtags::responselist = ();
+    push(@Apache::inputtags::partlist,$id);
+    @Apache::inputtags::response=();
     @Apache::inputtags::previous=();
     @Apache::inputtags::previous_version=();
     $Apache::lonhomework::problemstatus=
@@ -868,11 +932,17 @@ sub start_part {
 		if ( $target eq "web" ) {
 		    $result="<br />Part is not open to be viewed. It $accessmsg<br />";
 		} elsif ( $target eq 'tex' ) {
-		    $result="\\end{minipage}\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\\\begin{minipage}{\\textwidth}";
+		    if (not $ENV{'form.problem_split'}=~/yes/) {
+			$result="\\end{minipage}\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\\\begin{minipage}{\\textwidth}";
+		    } else {
+			$result="\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\";
+		    }
 		}
 	    } else {
 		if ($target eq 'tex') {
-		    $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
+		    if (not $ENV{'form.problem_split'}=~/yes/) {
+			$result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
+		    }
 		    my $weight = &Apache::lonnet::EXT("resource.$id.weight");
 		    if ($Apache::lonhomework::type eq 'exam') { $result .= '\fbox{\textit{'.$weight.' pt}}';}
 		}
@@ -909,6 +979,8 @@ sub end_part {
 							$target);
 	if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';}
 	$result=$gradestatus;
+    } elsif ($target eq 'edit') {
+	$result=&Apache::edit::end_table();
     }
     pop @Apache::inputtags::status;
     $Apache::inputtags::part='';
@@ -1003,15 +1075,7 @@ sub end_startouttext {
                  &Apache::edit::insertlist($target,$token).
 		 &Apache::edit::end_row().
                  &Apache::edit::start_spanning_row()."\n"
-		 .'<table><tr><td>'.
-		 &Apache::loncommon::help_open_topic("Greek_Symbols",
-						     'Greek Symbols',
-						     undef,undef,600)
-		 .'</td><td>'.
-		 &Apache::loncommon::help_open_topic("Other_Symbols",
-						     'Other Symbols',
-						     undef,undef,600)
-		 .'</td></tr></table>'.
+		 . &Apache::loncommon::helpLatexCheatsheet () .
 		 &Apache::edit::editfield($token->[1],$text,"",80,4);
     }
     if ($target eq 'modified') {
@@ -1055,5 +1119,23 @@ sub delete_startouttext {
     return 1;
 }
 
+sub start_simpleeditbutton {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $result='';
+    if (($target eq 'web') &&
+        (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
+        my $url=$ENV{'REQUEST_URI'};
+        $url=~s/\?.*$//;
+	$result='<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'.
+                '<a href="'.$url.'/smpedit">Simple Problem Editor</a> - Note: it can take up to 10 minutes for changes to take effect for all users.'.
+&Apache::loncommon::help_open_topic('Caching').'</td></tr></table><br />';
+    }
+    return $result;
+}
+
+sub end_simpleeditbutton {
+    return '';
+}
+
 1;
 __END__