--- loncom/homework/structuretags.pm	2003/10/03 15:27:56	1.200.2.2
+++ loncom/homework/structuretags.pm	2009/03/27 01:07:10	1.441
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.200.2.2 2003/10/03 15:27:56 albertel Exp $
+# $Id: structuretags.pm,v 1.441 2009/03/27 01:07:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,9 +25,30 @@
 #
 # http://www.lon-capa.org/
 #
-# 2/19 Guy
-# 6/26/2001 fixed extra web display at end of <web></web> tags
-# 8/17,8/18,8/20 Gerd Kortemeyer
+###
+
+=pod
+
+=head1 NAME
+
+Apache::structuretags
+
+=head1 SYNOPSIS
+
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+
+=head1 NOTABLE SUBROUTINES
+
+=over
+
+=item 
+
+=back
+
+=cut
 
 
 package Apache::structuretags; 
@@ -36,17 +57,33 @@ use strict;
 use Apache::lonnet;
 use Apache::File();
 use Apache::lonmenu;
-
+use Apache::lonlocal;
+use Apache::lonxml;
+use Apache::londefdef;
+use Apache::lonenc();
+use Time::HiRes qw( gettimeofday tv_interval );
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+ 
 BEGIN {
-    &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext',
-'simpleeditbutton','definetag'));
+    &Apache::lonxml::register('Apache::structuretags',('block','languageblock','translated','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag'));
 }
 
 sub start_web {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    my $bodytext=&Apache::lonxml::get_all_text("/web",$parser);
-    if ($target eq 'web') {
-	return $bodytext;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    if ($target ne 'edit' && $target ne 'modified') {
+	my $bodytext=&Apache::lonxml::get_all_text("/web",$parser,$style);
+	if ($target eq 'web' || $target eq 'webgrade') {
+	    return $bodytext;
+	}
+    } elsif ($target eq "edit" ) {
+	my $bodytext = 
+	    &Apache::lonxml::get_all_text_unbalanced("/web",$parser);
+	my $result = &Apache::edit::tag_start($target,$token);
+	$result .= &Apache::edit::editfield($token->[1],$bodytext,'',80,1);
+	return $result;
+    } elsif ( $target eq "modified" ) {
+	return $token->[4].&Apache::edit::modifiedfield("/web",$parser);
     }
     return '';
 }
@@ -56,11 +93,28 @@ sub end_web {
 }
 
 sub start_tex {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
-    my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
-    if ($target eq 'tex') {
-	return $bodytext.' ';
+    if ($target ne 'edit' && $target ne 'modified') {
+	my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style);
+	if ($target eq 'tex') {
+	    
+	    # If inside a table, occurrences of \\ must be removed;
+	    # else the table blows up.
+
+	    if (&Apache::londefdef::is_inside_of($tagstack, "table")) {
+		$bodytext =~ s/\\\\//g;
+	    }
+	    return $bodytext.'{}';
+	}
+    } elsif ($target eq "edit" ) {
+	my $bodytext = 
+	    &Apache::lonxml::get_all_text_unbalanced("/tex",$parser);
+	my $result = &Apache::edit::tag_start($target,$token);
+	$result .= &Apache::edit::editfield($token->[1],$bodytext,'',80,1);
+	return $result;
+    } elsif ( $target eq "modified" ) {
+	return $token->[4].&Apache::edit::modifiedfield("/tex",$parser);
     }
     return $result;;
 }
@@ -69,8 +123,47 @@ sub end_tex {
     return '';
 }
 
+sub homework_js {
+    return &Apache::loncommon::resize_textarea_js().
+           &setmode_javascript().
+	<<'JS';
+<script type="text/javascript">
+function setSubmittedPart (part) {
+   this.document.lonhomework.submitted.value="part_"+part;
+}
+
+function image_response_click (which, e) {
+    init_geometry();
+    if (!e) { e = window.event; } //IE
+    var input_element = document.lonhomework.elements[which];
+    var token_element = document.lonhomework.elements[which+'_token'];
+    var token = token_element.value;
+    var img_element   = document.getElementById(which+'_imageresponse');
+    var x= e.clientX-getX(img_element)+Geometry.getHorizontalScroll();
+    var y= e.clientY-getY(img_element)+Geometry.getVerticalScroll();
+    var click = x+':'+y;
+    input_element.value = click;
+    img_element.src = '/adm/randomlabel.png?token='+token+'&clickdata='+click;
+}
+
+</script>
+JS
+}
+
+sub setmode_javascript {
+    return <<"ENDSCRIPT";
+<script type="text/javascript">
+function setmode(form,probmode) {
+    form.problemmode.value = probmode;
+    form.submit();
+}
+</script>
+ENDSCRIPT
+}
+
 sub page_start {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$name,
+	$extra_head)=@_;
     my %found;
     foreach my $taginside (@$tagstack) {
 	foreach my $taglookedfor ('html','body','form') {
@@ -78,210 +171,578 @@ sub page_start {
 	}
     }
 
-    my $result;
-    my $head_tag_start;
-    if (!defined($found{'html'})) {
-	$result=&Apache::londefdef::start_html($target,$token,$tagstack,
-					       $parstack,$parser,$safeeval);
-	$head_tag_start='<head>'.&Apache::lonmenu::registerurl(undef,$target);
-    }
-    my $body_tag_start;
-    if (!defined($found{'body'})) {
-	$body_tag_start='<body onLoad="'.&Apache::lonmenu::loadevents().'" '.
-	    'onUnload="'.&Apache::lonmenu::unloadevents().'" ';
+    if ($target eq 'tex') {
+	return
+	    &Apache::londefdef::start_html($target,$token,$tagstack,
+					   $parstack,$parser,$safeeval);
+    }
+
+    $extra_head .= &homework_js();
+
+    if ($env{'environment.wysiwygeditor'} eq 'on') {
+	$extra_head .= &Apache::lonhtmlcommon::dragmath_js("FCKEditMathPopup");
+    } else {
+        $extra_head .= &Apache::lonhtmlcommon::dragmath_js("EditMathPopup");
+    }
+
+    my %body_args;
+    if (defined($found{'html'})) {
+	$body_args{'skip_phases'}{'head'}=1;
+    } else {
+	
+	$extra_head .= &Apache::lonhtmlcommon::spellheader();
+
+	$extra_head .= &Apache::londefdef::generate_css_links();
+
+	if ($env{'request.state'} eq 'construct') {
+	    $extra_head.=&Apache::edit::js_change_detection().
+		"<script type=\"text/javascript\">\n".
+		"if (typeof swmenu != 'undefined') {swmenu.currentURL=null;}\n".
+		&Apache::loncommon::browser_and_searcher_javascript().
+                "\n</script>\n";
+	}
+    }
+
+    if (defined($found{'body'})) {
+	$body_args{'skip_phases'}{'body'}=1;
+    } elsif (!defined($found{'body'}) 
+	     && $env{'request.state'} eq 'construct') {
+	if ($target eq 'web' || $target eq 'edit') {
+	    if ($env{'environment.remote'} ne 'off') {
+		$body_args{'only_body'}  = 1;
+	    }
+	}
+    } elsif (!defined($found{'body'})) {
+	my %add_entries;
 	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;
-	    $body_tag_start.='background="'.$background.'" ';
-	} else {
-	    my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,
-						   $safeeval);
-	    if (($bgcolor) && ($ENV{'browser.blackwhite'} ne 'on')) {
-		$body_tag_start.='bgcolor="'.$bgcolor.'" ';
-	    } else {
-		$body_tag_start.='bgcolor="#ffffff"';
-	    }
+	if ($background ne '' ) {
+	    $add_entries{'background'} = $background;
 	}
-	if ($ENV{'browser.fontenhance'} eq 'on') {
-	    $body_tag_start.=' style="font-size: x-large;" ';
+
+	my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,
+					       $safeeval);
+       	if ($bgcolor eq '' ) { $bgcolor = '#FFFFFF'; }
+
+	$body_args{'bgcolor'}        = $bgcolor;
+	$body_args{'no_title'}       = 1;
+	$body_args{'force_register'} = 1;
+	$body_args{'add_entries'}    = \%add_entries;	
+	if ($env{'environment.remote'} eq 'off'
+	    && $env{'request.state'} eq   'construct') {
+	    $body_args{'only_body'}  = 1;
 	}
-	$body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1);
-	if ($target eq 'web' && $ENV{'request.state'} ne 'construct') {
-	    my ($symb,undef,undef,undef,$publicuser)=
-		&Apache::lonxml::whichuser();
-	    if ($symb eq '' && !$publicuser) {
-		my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");
-		$help="Browsing resource, all submissions are temporary.<br />";
-		$body_tag_start.=$help;
-	    }
+    }
+    $body_args{'no_auto_mt_title'} = 1;
+    my $page_start = &Apache::loncommon::start_page($name,$extra_head,
+						    \%body_args);
+
+    if (!defined($found{'body'}) 
+	&& $env{'request.state'} ne 'construct'
+	&& ($target eq 'web' || $target eq 'webgrade')) {
+
+	my ($symb,undef,undef,undef,$publicuser)= &Apache::lonnet::whichuser();
+	if ($symb eq '' && !$publicuser) {
+	    my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");
+	    $help=&mt("Browsing resource, all submissions are temporary.")."<br />";
+	    $page_start .= $help;
 	}
     }
+
+    if (!defined($found{'body'}) && $env{'request.state'} ne 'construct') {
+	$page_start .= &Apache::lonxml::message_location();
+    }
+    
     my $form_tag_start;
     if (!defined($found{'form'})) {
-	$form_tag_start='<form name="lonhomework" method="POST" action="'.
-	    $ENV{'request.uri'}.'">';
+	$form_tag_start='<form name="lonhomework" enctype="multipart/form-data" method="post" action="';
+	my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
+	$form_tag_start.=$uri.'" ';
+	if ($target eq 'edit') {
+	    $form_tag_start.=&Apache::edit::form_change_detection();
+	}
+	$form_tag_start.='>'."\n";
+
+	my $symb=&Apache::lonnet::symbread();
+	if ($symb =~ /\S/) {
+	    $symb=
+		&HTML::Entities::encode(&Apache::lonenc::check_encrypt($symb));
+	    $form_tag_start.=
+		"\t".'<input type="hidden" name="symb" value="'.$symb.'" />'."\n";
+	}
     }
-    return ($result,$head_tag_start,$body_tag_start,$form_tag_start);
+    return ($page_start,$form_tag_start);
 }
 
 #use Time::HiRes();
 sub get_resource_name {
     my ($parstack,$safeeval)=@_;
-    my $name=&Apache::lonnet::gettitle();
-    if ($name eq '') {
-	$name=&Apache::lonnet::EXT('resource.title');
-	if ($name eq 'con_lost') { $name = ''; }
+    my $name;
+    if (defined($Apache::lonhomework::name)) {
+	$name = $Apache::lonhomework::name;
+    } else {
+	my ($symb)=&Apache::lonnet::whichuser();
+	$name=&Apache::lonnet::gettitle($symb);
+	if ($name eq '') {
+	    $name=&Apache::lonnet::EXT('resource.title');
+	    if ($name eq 'con_lost') { $name = ''; }
+	}
+	if ($name!~/\S+/) {
+	    $name=$env{'request.uri'};
+	    $name=~s-.*/([^/]+)$-$1-;
+	}
+	# The name has had html tags escaped:
+       
+	$name=~s/&lt;/</gs;
+	$name=~s/&gt;/>/gs;
+
+	$Apache::lonhomework::name=$name;
     }
-    $Apache::lonhomework::name=$name;
     return $name;
 }
 
 sub setup_rndseed {
     my ($safeeval)=@_;
     my $rndseed;
-    my ($symb)=&Apache::lonxml::whichuser();
-    if ($ENV{'request.state'} eq "construct" || $symb eq '') {
-	$rndseed=$ENV{'form.rndseed'};
+    my ($symb)=&Apache::lonnet::whichuser();
+    if ($env{'request.state'} eq "construct" 
+	|| $symb eq '' 
+	|| $Apache::lonhomework::type eq 'practice'
+	|| $Apache::lonhomework::history{'resource.CODE'}) {
+	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+						['rndseed']);
+	$rndseed=$env{'form.rndseed'};
 	if (!$rndseed) {
 	    $rndseed=$Apache::lonhomework::history{'rndseed'};
 	    if (!$rndseed) {
 		$rndseed=time;
-		$ENV{'form.rndseed'}=$rndseed;
 	    }
+	    $env{'form.rndseed'}=$rndseed;
 	}
-	if ($ENV{'form.resetdata'} eq 'New Problem Variation' ||
-	    $ENV{'form.newrandomization'} eq 'New Randomization') {
+	if ( ($env{'form.resetdata'} eq &mt('New Problem Variation')
+	      && $env{'form.submitted'} eq 'yes')  ||
+	    $env{'form.newrandomization'} eq &mt('New Randomization')) {
 	    srand(time);
 	    $rndseed=int(rand(2100000000));
-	    $ENV{'form.rndseed'}=$rndseed;
-	    delete($ENV{'form.resetdata'});
-	    delete($ENV{'form.newrandomization'});
+	    $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));
+	    $rndseed=join(':',&Apache::lonnet::digest($rndseed));
         }
-	&Apache::lonxml::debug("Setting rndseed to $rndseed");
-	&Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
+        if ($Apache::lonhomework::history{'resource.CODE'}) {
+	   $rndseed=&Apache::lonnet::rndseed();
+	}
+	if ($safeeval) {
+	    &Apache::lonxml::debug("Setting rndseed to $rndseed");
+	    &Apache::run::run('$external::randomseed="'.$rndseed.'";',$safeeval);
+	}
     }
     return $rndseed;
 }
 
+sub remember_problem_state {
+    return '
+       <input type="hidden" name="problemstate" value="'.$env{'form.problemstate'}.'" />
+       <input type="hidden" name="problemtype" value="'.$env{'form.problemtype'}.'" />
+       <input type="hidden" name="problemstatus" value="'.$env{'form.problemstatus'}.'" />';
+}
+
+sub problem_edit_buttons {
+   return  '
+<div class="LC_edit_problem_discards">
+       <input type="button" name="submitmode" accesskey="d" value="'.&mt('Discard Edits and View').'" '.
+       ' onclick="javscript:setmode(this.form,'."'discard'".')"  />
+       <input '.&Apache::edit::submit_ask_anyway('setmode(this.form,'."'editxml'".')').' type="button" name="submitmode" accesskey="x" value="'.&mt('EditXML').'" />
+       <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" />
+</div>
+<div class="LC_edit_problem_saves">
+       <input type="submit" name="submitbutton" accesskey="s" value="'.&mt('Save and Edit').'" />
+       <input type="submit" name="submitbutton" accesskey="v" value="'.&mt('Save and View').'" />
+</div>';
+}
+
 sub problem_edit_header {
-    return '<input type="hidden" name="submitted" value="edit" />
-       <input type="hidden" name="problemmode" value="Edit" />
-       <input type="submit" name="problemmode" value="Discard Edits and View" />
-       <input type="submit" name="problemmode" value="EditXML" />
-       <input type="submit" name="Undo" value="undo" /> <hr />
-       <input type="submit" name="submit" value="Submit Changes and Edit" />
-       <input type="submit" name="submit" value="Submit Changes and View" /><br /><p>&nbsp;</p><table border="0"><tr><td bgcolor="#DDDDDD">
-      ';
+    return '<input type="hidden" name="submitted" value="edit" /><input type="hidden" name="problemmode" value="edit" />'.
+	&Apache::structuretags::remember_problem_state().'
+<div class="LC_edit_problem_header">
+<div class="LC_edit_problem_header_title">
+'.&mt('Problem Editing').&Apache::loncommon::help_open_menu('Problem Editing','Problem_Editor_XML_Index',5,'Authoring').'
+</div>'.
+&problem_edit_buttons().'
+<hr class="LC_edit_problem_divide" />
+'.&Apache::lonxml::message_location().'
+</div>
+'.
+       '<table border="0" width="100%"><tr><td bgcolor="#DDDDDD">';
 }
 
 sub problem_edit_footer {
-    return '</td></tr></table><br /><input type="submit" name="submit" value="Submit Changes and Edit" />
-    <input type="submit" name="submit" value="Submit Changes and View" />';
+    return '</td></tr></table><br />
+<div class="LC_edit_problem_footer">
+  <hr class="LC_edit_problem_divide" />'.
+&problem_edit_buttons().'
+  <hr class="LC_edit_problem_divide" />
+</div>
+'.
+
+    &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields()).
+    "\n</form>\n".&Apache::loncommon::end_page();
+}
+
+sub option {
+    my ($value,$name) = @_;
+    my $result ="<option value='".$value."' ";
+    if ($env{'form.'.$name} eq $value) {
+	$result.=" selected='on' ";
+    }
+    $result.='>';
+    return $result;
 }
 
 sub problem_web_to_edit_header {
     my ($rndseed)=@_;
-    my $result.='<input type="hidden" name="problemmode" value="View" />
-             <input type="submit" name="problemmode" value="Edit" />
-             <input type="submit" name="problemmode" value="EditXML" />
-             <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="'.
+    my $result .= '<div class="LC_edit_problem_header">';
+
+    if (!$Apache::lonhomework::parsing_a_task) {
+	$result .= 
+	    '<div class="LC_edit_problem_header_title">'.
+	    &mt('Problem Testing').
+	    &Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area').
+	    '</div>';
+    } else {
+	$result .= 
+	    '<div class="LC_edit_problem_header_title">'.
+	    &mt('Task Testing').
+	    '</div>';
+    }
+    
+    my $show_all_foils_text = 
+	($Apache::lonhomework::parsing_a_task) ?
+	&mt('&nbsp;Show&nbsp;All&nbsp;Instances')
+	: &mt('&nbsp;Show&nbsp;All&nbsp;Foils');
+
+    my $show_all= '<span class="LC_nobreak"><label><input type="checkbox" name="showallfoils"';
+    if (defined($env{'form.showallfoils'})) { $show_all.=' checked="checked"'; }
+    $show_all.= ' />'.$show_all_foils_text.'</label></span>';
+
+
+
+    $result .= '<div class="LC_edit_problem_header_status_row">';
+    if (!$Apache::lonhomework::parsing_a_task) {
+	$result.="
+<div class='LC_edit_problem_header_row1'>
+<span class=\"LC_nobreak\">
+".&mt("Problem Status:")."
+<select name='problemstate'>
+  <option value=''></option>
+  ".&option('CLOSED'               ,'problemstate').&mt("Closed")."</option>
+  ".&option('CAN_ANSWER'           ,'problemstate').&mt("Answerable")."</option>
+  ".&option('CANNOT_ANSWER_tries'  ,'problemstate').&mt("Open with full tries")."</option>
+  ".&option('CANNOT_ANSWER_correct','problemstate').&mt("Open and correct")."</option>
+  ".&option('SHOW_ANSWER'          ,'problemstate').&mt("Show Answer")."</option>
+</select>
+</span>
+<span class=\"LC_nobreak\">
+".&mt("Problem Type:")."
+<select name='problemtype'>
+  <option value=''></option>
+  ".&option('exam'   ,'problemtype').&mt("Exam Problem")."</option>
+  ".&option('problem','problemtype').&mt("Homework Problem")."</option>
+  ".&option('survey' ,'problemtype').&mt("Survey Question")."</option>
+  ".&option('practice' ,'problemtype').&mt("Practice Problem")."</option>
+</select>
+</span>
+$show_all
+</div>
+<div class='LC_edit_problem_header_row2'>
+<span class=\"LC_nobreak\">
+".&mt("Feedback Mode:")."
+<select name='problemstatus'>
+  <option value=''></option>
+  ".&option('yes','problemstatus').&mt("Show Feedback")."</option>
+  ".&option('no', 'problemstatus').&mt("Don't Show Incorect/Correct Feedback")."</option>
+  ".&option('no_feedback_ever', 'problemstatus').&mt("Don't Show Any Feedback")."</option>
+</select>
+</span>
+";
+
+    } elsif ($Apache::lonhomework::parsing_a_task) {
+	$result.="
+<div class='LC_edit_problem_header_row1'>
+<span class=\"LC_nobreak\">
+".&mt("Problem Status:")."
+<select name='problemstate'>
+  <option value=''></option>
+  ".&option('CLOSED'               ,'problemstate').&mt("Closed")."</option>
+  ".&option('CAN_ANSWER'           ,'problemstate').&mt("Answerable")."</option>
+  ".&option('WEB_GRADE'            ,'problemstate').&mt("Criteria Grading")."</option>
+  ".&option('SHOW_ANSWER'          ,'problemstate').&mt("Show Feedback")."</option>
+</select>
+</span>
+$show_all
+";
+    }
+    $result.='
+       <span class="LC_nobreak">
+       '.&mt('Apply style file: ').'
+         <input type="text" name="style_file" value="'.&HTML::Entities::encode($env{'construct.style'},'"<>&').'" />
+         <a href="javascript:openbrowser(\'lonhomework\',\'style_file\',\'sty\')">'.&mt('Select').'</a>
+       </span>
+     </div>
+     <div class="LC_edit_problem_header_row1">'.
+       &Apache::lonxml::renderingoptions().'
+     </div>
+     <input type="submit" name="changeproblemmode" value="'.&mt("Change View").'" />
+     <input type="submit" name="clear_style_file" accesskey="d" value="'.&mt('Show Default View').'" />
+     <input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" />
+   </div>
+   <hr class="LC_edit_problem_divide" />
+   <div class="LC_edit_problem_header_randomize_row">
+     <input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" />
+     <input type="submit" name="changerandseed" value="'.&mt('Change Random Seed To:').'" />
+     <input type="text" name="rndseed" size="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=20; }
-    $result.= '<input type="submit" name="problemmode" value="Calculate answers" /> for
-             <input type="text" name="numtoanalyze" value="'.
-		 $numtoanalyze.'" size="5" /> versions of this problem.'.
-		     &Apache::loncommon::help_open_topic("Analyze_Problem",
-						     '',undef,undef,300).
-		     '<hr />';
+             onchange="javascript:document.lonhomework.changerandseed.click()" />';
+
+    if (!$Apache::lonhomework::parsing_a_task) {
+	my $numtoanalyze=$env{'form.numtoanalyze'};
+	if (!$numtoanalyze) { $numtoanalyze=20; }
+	$result .= '<span class="LC_nobreak">'.
+	    &mt('[_1] for [_2] versions.',
+		'<input type="button" name="submitmode" value="'.&mt('Calculate answers').'" '.
+                'onclick="javascript:setmode(this.form,'."'calcanswers'".')" />'
+               ,'<input type="text" name="numtoanalyze" value="'.
+		$numtoanalyze.'" size="5" />').
+		&Apache::loncommon::help_open_topic("Analyze_Problem",'',undef,undef,300).
+		'</span>';
+						    
+    }
+
+    $result.='
+   </div>
+   <div class="LC_edit_problem_header_edit_row">';
+    $result.='<input type="hidden" name="problemmode" value="view" />';
+    $result .= '<input type="button" name="submitmode" accesskey="e" value="'.&mt('Edit').'" '.
+               'onclick="javascript:setmode(this.form,'."'edit'".')" />';
+    $result .= '<input type="button" name="submitmode" accesskey="x" value="'.&mt('EditXML').'" '.
+               'onclick="javascript:setmode(this.form,'."'editxml'".')" />';
+    $result.='
+   </div>
+   '.&Apache::lonxml::message_location().'
+</div>';
     return $result;
 }
 
 sub initialize_storage {
-    %Apache::lonhomework::results=();
-    %Apache::lonhomework::history=();
-    my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
-    if ($ENV{'request.state'} eq 'construct' || $symb eq '') {
+    my ($given_symb) = @_;
+    undef(%Apache::lonhomework::results);
+    undef(%Apache::lonhomework::history);
+    my ($symb,$courseid,$domain,$name) = 
+	&Apache::lonnet::whichuser($given_symb);
+    
+    # anonymous users (CODEd exams) have no data
+    if ($name eq 'anonymous' 
+	&& !defined($domain)) {
+	return;
+    }
+
+    if ($env{'request.state'} eq 'construct' 
+	|| $symb eq ''
+	|| $Apache::lonhomework::type eq 'practice') {
+	
+	my $namespace = $symb || $env{'request.uri'};
+	if ($env{'form.resetdata'} eq &mt('Reset Submissions') ||
+	    ($env{'form.resetdata'} eq &mt('New Problem Variation')
+	     && $env{'form.submitted'} eq 'yes') ||
+	    $env{'form.newrandomization'} eq &mt('New Randomization')) {
+	    &Apache::lonnet::tmpreset($namespace,'',$domain,$name);
+	    &Apache::lonxml::debug("Attempt reset");
+	}
 	%Apache::lonhomework::history=
-	    &Apache::lonnet::tmprestore($ENV{'request.uri'},'',$domain,$name);
+	    &Apache::lonnet::tmprestore($namespace,'',$domain,$name);
 	my ($temp)=keys %Apache::lonhomework::history ;
 	&Apache::lonxml::debug("Return message of $temp");
     } else {
 	%Apache::lonhomework::history=
 	    &Apache::lonnet::restore($symb,$courseid,$domain,$name);
     }
+
     #ignore error conditions
     my ($temp)=keys %Apache::lonhomework::history ;
     if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); }
 }
 
-# -------------------------------------------------------------finalize_storage
-# Stores away the result has to a student's environment
-# checks form.grade_ for specific values, other wises stores
-# to the running users environment
+=pod
+
+=item finalize_storage()
+
+	Stores away the result has to a student's environment
+	checks form.grade_ for specific values, other wises stores
+	to the running users environment
+	Will increment totals for attempts, students, and corrects
+	if running user has student role.
+	
+=cut
+
+
 sub finalize_storage {
+    my ($given_symb) = @_;
     my $result;
-    my ($temp) = keys %Apache::lonhomework::results;
-    if ( $temp ne '' ) {
-	my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
-	if ($ENV{'request.state'} eq 'construct' || $symb eq '') {
-	    $Apache::lonhomework::results{'rndseed'}=$ENV{'form.rndseed'};
+    if (%Apache::lonhomework::results) {
+	my @remove = grep(/^INTERNAL_/,keys(%Apache::lonhomework::results));
+	delete(@Apache::lonhomework::results{@remove});
+	my ($symb,$courseid,$domain,$name) = 
+	    &Apache::lonnet::whichuser($given_symb);
+	if ($env{'request.state'} eq 'construct' 
+	    || $symb eq ''
+	    || $Apache::lonhomework::type eq 'practice') {
+	    my $namespace = $symb || $env{'request.uri'};
+	    $Apache::lonhomework::results{'rndseed'}=$env{'form.rndseed'};
 	    $result=&Apache::lonnet::tmpstore(\%Apache::lonhomework::results,
-					$ENV{'request.uri'},'',$domain,$name);
+					      $namespace,'',$domain,$name);
 	    &Apache::lonxml::debug('Construct Store return message:'.$result);
 	} else {
 	    $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,
 					    $symb,$courseid,$domain,$name);
 	    &Apache::lonxml::debug('Store return message:'.$result);
+            if ($env{'request.role'} =~/^st/) {
+                &store_aggregates($symb,$courseid);
+            }
 	}
+    } else {
+	&Apache::lonxml::debug('Nothing to store');
     }
     return $result;
 }
 
+=pod
+
+item store_aggregates()
+
+	Sends hash of values to be incremented in nohist_resourcetracker.db
+	for the course. Increments total number of attempts, unique students 
+	and corrects for each part for an instance of a problem, as appropriate.
+	
+=cut
+
+sub store_aggregates {
+    my ($symb,$courseid) = @_;
+    my %aggregate;
+    my @parts;
+    my $cdomain = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cname = $env{'course.'.$env{'request.course.id'}.'.num'};
+    foreach my $key (keys(%Apache::lonhomework::results)) {
+        if ($key =~ /resource\.([^\.]+)\.tries/) {
+            push(@parts, $1);
+        }
+    }
+    foreach my $part (@parts) {
+        if ($Apache::lonhomework::results{'resource.'.$part.'.award'}
+	    eq 'APPROX_ANS' ||
+	    $Apache::lonhomework::results{'resource.'.$part.'.award'}
+	    eq 'EXACT_ANS') {
+            $aggregate{$symb."\0".$part."\0correct"} = 1;
+        }
+        if ($Apache::lonhomework::results{'resource.'.$part.'.tries'} == 1) {
+            $aggregate{$symb."\0".$part."\0users"} = 1;
+        } else {
+            my (undef,$last_reset) = &Apache::grades::get_last_resets($symb,$env{'request.course.id'},[$part]); 
+            if ($last_reset) {
+                if (&Apache::grades::get_num_tries(\%Apache::lonhomework::history,$last_reset,$part) == 0) {
+                    $aggregate{$symb."\0".$part."\0users"} = 1;
+                }
+            }
+        }
+        $aggregate{$symb."\0".$part."\0attempts"} = 1;
+    }
+    if (keys (%aggregate) > 0) {
+	&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
+                            $cdomain,$cname);
+    }
+}
+
 sub checkout_msg {
+    my %lt=&Apache::lonlocal::texthash( 
+		'resource'=>'The resource needs to be checked out',
+		'id_expln'=>'As a resource gets checked out, a unique timestamped ID is given to it, and a permanent record is left in the system.',
+                'warning'=>'Checking out resources is subject to course policies, and may exclude future credit even if done erroneously.',
+                'checkout'=>'Check out Exam for Viewing',
+		'checkout?'=>'Check out Exam?');
+    my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
     return (<<ENDCHECKOUT);
-<h2>The resource needs to be checked out</h2>
-As a resource gets checked out, a unique timestamped ID is given to it, and a
-permanent record is left in the system.<p />
-<font color=red>
-Checking out resources is subject to course policies, and may exclude future
-credit even if done erroneously.<p />
+<h2>$lt{'resource'}</h2>
+    <p>$lt{'id_expln'}</p>
+<font color="red">
+<p>$lt{'warning'}</p>
 </font>
-<form name="checkout" method="POST" action="$ENV{'request.uri'}">
+<form name="checkout" method="POST" action="$uri">
 <input type="hidden" name="doescheckout" value="yes" />
-<input type="button" name="checkoutbutton" value="Check out Exam for Viewing" onClick="javascript:if (confirm('Check out Exam?')) { document.checkout.submit(); }" />
+<input type="button" name="checkoutbutton" value="$lt{'checkout'}" onClick="javascript:if (confirm('$lt{'checkout?'}')) { document.checkout.submit(); }" />
 </form>
 ENDCHECKOUT
 }
 
-sub start_problem {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+sub firstaccess_msg {
+    my ($time,$symb)=@_;
+    my $result;
+    my @interval=&Apache::lonnet::EXT("resource.0.interval");
+    if ($interval[1] eq 'map') {
+	my ($map)=&Apache::lonnet::decode_symb($symb);
+	my $foldertitle=&Apache::lonnet::gettitle($map);
+    
+	&Apache::lonxml::debug("map is $map title is $foldertitle");
+	$result .= "<h2>".&mt('The resources in "[_1]" are open for a limited time.'
+                             .' Once you click the "Show Resource" button below you have [_2] to complete all resources "[_1]".'
+                             ,$foldertitle,$time)."</h2>";
+    } elsif ($interval[1] eq 'course') {
+	my $course = $env{'course.'.$env{'request.course.id'}.'.description'};
+        $result .= "<h2>".&mt('The resources in "[_1]" are open for a limited time.'
+                             .' Once you click the "Show Resource" button below you have [_2] to complete all resources "[_1]".'
+                             ,$course,$time)."</h2>";
+    } else {
+	my $title=&Apache::lonnet::gettitle($symb);
+        $result .= "<h2>".&mt('This resource "[_1]" is open for a limited time.'
+                             .' Once you click the "Show Resource" button below you have [_2] to complete this resource "[_1]".'
+                             ,$title,$time)."</h2>";
+    }
+    my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
+    my $buttontext = &mt('Show Resource');
+    my $timertext = &mt('Start Timer?');
+    $result .= (<<ENDCHECKOUT);
+<form name="markaccess" method="POST" action="$uri">
+<input type="hidden" name="markaccess" value="yes" />
+<input type="button" name="accessbutton" value="$buttontext" onClick="javascript:if (confirm('$timertext')) { document.markaccess.submit(); }" />
+</form>
+ENDCHECKOUT
+    return $result;
+}
 
-    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 '';
+sub init_problem_globals {
+    my ($type)=@_;
+    #initialize globals
+    #   For problems, we start out in part 0 (outside a <part> tag).
+    #   and part 0 is used to describe the main body of the <problem>
+    #
+    if ($type eq 'problem') {
+	$Apache::inputtags::part='0';
+	@Apache::inputtags::partlist=('0');
+	&Apache::lonhomework::set_show_problem_status(&get_problem_status('0'));
+	$Apache::lonhomework::ignore_response_errors=0;
+
+    } elsif ($type eq 'library') {
+	$Apache::inputtags::part='';
+	@Apache::inputtags::partlist=();
+	&Apache::lonhomework::reset_show_problem_status();
+	$Apache::lonhomework::ignore_response_errors=1;
+
+    } elsif ($type eq 'Task') {
+	$Apache::inputtags::part='0';
+	@Apache::inputtags::partlist=('0');
+	&Apache::lonhomework::reset_show_problem_status();
+	$Apache::lonhomework::ignore_response_errors=1;
     }
-
-    $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=();
@@ -291,23 +752,85 @@ sub start_problem {
     @Apache::structuretags::whilebody=();
     @Apache::structuretags::whileline=();
     $Apache::lonhomework::scantronmode=0;
-    $Apache::lonhomework::problemstatus=
-	&Apache::lonnet::EXT('resource.0.problemstatus');
+    undef($Apache::lonhomework::name);
+    undef($Apache::lonhomework::default_type);
+    undef($Apache::lonhomework::type);
+}
+
+sub reset_problem_globals {
+    my ($type)=@_;
+    undef(%Apache::lonhomework::history);
+    undef(%Apache::lonhomework::results);
+    undef($Apache::inputtags::part);
+#don't undef this, lonhomework.pm takes care of this, we use this to 
+#detect if we try to do 2 problems in one file
+#   undef($Apache::lonhomework::parsing_a_problem);
+    undef($Apache::lonhomework::name);
+    undef($Apache::lonhomework::default_type);
+    undef($Apache::lonhomework::type);
+    undef($Apache::lonhomework::scantronmode);
+    undef($Apache::lonhomework::ignore_response_errors);
+    &Apache::lonhomework::reset_show_problem_status();
+}
+
+sub set_problem_state {
+    my ($part)=@_;
+    if ($env{'form.problemstate'} eq 'CANNOT_ANSWER_correct') {
+	$Apache::lonhomework::history{"resource.$part.solved"}=
+	    'correct_by_student';
+    }
+}
+
+sub get_problem_status {
+    my ($part)=@_;
+    my $problem_status;
+    if ($env{'request.state'} eq 'construct' &&
+	defined($env{'form.problemstatus'})) {
+	$problem_status=$env{'form.problemstatus'};
+    } else {
+	$problem_status=&Apache::lonnet::EXT("resource.$part.problemstatus");
+	&Apache::lonxml::debug("problem status for $part is $problem_status");
+	&Apache::lonxml::debug("env probstat is ".$env{'form.problemstatus'});
+    }
+    return $problem_status;
+}
+
+sub start_problem {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
 
-    if (defined($ENV{'scantron.maxquest'})) {
+    # We'll use the redirection to fix up printing of duedates.
+    if (!$Apache::lonxml::metamode) {
+	&Apache::lonxml::startredirection();
+    }
+
+    # Problems don't nest and we don't allow more than one <problem> in
+    # a .problem file.
+    #
+    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,$style);
+	return '';
+    }
+
+    $Apache::lonhomework::parsing_a_problem=1;
+    &init_problem_globals('problem');
+
+    if (defined($env{'scantron.maxquest'})) {
 	$Apache::lonhomework::scantronmode=1;
     }
 
     if ($target ne 'analyze') {
-	&initialize_storage();
-	if ($target eq 'web') {
-	    &Apache::lonhomework::showhash(%Apache::lonhomework::history);
+        my $type = &Apache::lonnet::EXT('resource.0.type');
+	$Apache::lonhomework::type=$type;
+	if (($env{'request.state'} eq 'construct') &&
+	    $env{'form.problemtype'} =~ /\S/) {
+	    $Apache::lonhomework::type=$env{'form.problemtype'};
 	}
-	$Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
 	&Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");
     }
     if ($Apache::lonhomework::type eq '' ) {
-	my $uri=$ENV{'request.uri'};
+	my $uri=$env{'request.uri'};
 	if ($uri=~/\.(\w+)$/) {
 	    $Apache::lonhomework::type=$1;
 	    &Apache::lonxml::debug("Using type of $1");
@@ -316,17 +839,36 @@ sub start_problem {
 	    &Apache::lonxml::debug("Using default type, problem, :$uri:");
 	}
     }
+    $Apache::lonhomework::default_type = $Apache::lonhomework::type;
+
+    &initialize_storage();
+    if ($target ne 'analyze'
+       	&& $env{'request.state'} eq 'construct') {
+	&set_problem_state('0');
+    }
+
+    if ($target eq 'web') {
+	&Apache::lonxml::debug(" grading history ");
+	&Apache::lonhomework::showhash(%Apache::lonhomework::history);
+    }
 
     #added vars to the scripting enviroment
-    my $expression='$external::part='.$Apache::inputtags::part.';';
+    my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
+    $expression.='$external::type=\''.$Apache::lonhomework::type.'\';';
     &Apache::run::run($expression,$safeeval);
     my $status;
     my $accessmsg;
 
-    #should get back a <html> or the neccesary stuff to start XML/MathML
-    my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
-	&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
-    if ($target eq 'tex' and $ENV{'request.symb'} =~ m/\.page_/) {$result='';}
+    my $name= &get_resource_name($parstack,$safeeval);
+    my ($result,$form_tag_start);
+    if ($target eq 'web' || $target eq 'webgrade' || $target eq 'tex'
+	|| $target eq 'edit') {
+	($result,$form_tag_start) =
+	    &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
+			$name);
+    }
+
+    if ($target eq 'tex' and $env{'request.symb'} =~ m/\.page_/) {$result='';}
 
     if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval); }
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
@@ -335,144 +877,142 @@ sub start_problem {
 	if ($Apache::lonhomework::type eq 'exam') {
 	    my $token=
 		$Apache::lonhomework::history{"resource.0.outtoken"};
-	    if (($ENV{'form.doescheckout'}) && (!$token)) {
+	    if (($env{'form.doescheckout'}) && (!$token)) {
 		$token=&Apache::lonxml::maketoken();
 		$Apache::lonhomework::history{"resource.0.outtoken"}=
 		    $token;
 	    }
-	    $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token);
+	    $result.=&Apache::lonxml::printtokenheader($target,$token);
+	}
+	if ($env{'form.markaccess'}) {
+	    my @interval=&Apache::lonnet::EXT("resource.0.interval");
+	    &Apache::lonnet::set_first_access($interval[1]);
 	}
-
 	#handle rand seed in construction space
 	my $rndseed=&setup_rndseed($safeeval);
-	my ($symb)=&Apache::lonxml::whichuser();
-	if ($ENV{'request.state'} ne "construct" && $symb eq '') {
+	my ($symb)=&Apache::lonnet::whichuser();
+	if ($env{'request.state'} ne "construct" && 
+	    ($symb eq '' || $Apache::lonhomework::type eq 'practice')) {
 	    $form_tag_start.='<input type="hidden" name="rndseed" value="'.
 		$rndseed.'" />'.
 		    '<input type="submit" name="resetdata"
-                             value="New Problem Variation" />'.
+                             value="'.&mt('New Problem Variation').'" />';
+	    if (exists($env{'form.username'})) {
+		$form_tag_start.=
 		    '<input type="hidden" name="username"
-                             value="'.$ENV{'form.username'}.'" /> <br />';
+                             value="'.$env{'form.username'}.'" />';
+	    }
+	    if ($env{'request.role.adv'}) {
+		$form_tag_start.=
+		    ' <label><input type="checkbox" name="showallfoils"';
+		if (defined($env{'form.showallfoils'})) {
+		    $form_tag_start.=' checked="checked"';
+		}
+		$form_tag_start.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils').
+		    '</label>';
+	    }
+            if ($Apache::lonhomework::type eq 'practice') {
+                $form_tag_start.=&practice_problem_header();
+            }
+	    $form_tag_start.='<hr />';
 	}
-	($status,$accessmsg) = &Apache::lonhomework::check_access('0');
+
+	($status,$accessmsg,my $slot_name,my $slot) = 
+	    &Apache::lonhomework::check_slot_access('0','problem');
 	push (@Apache::inputtags::status,$status);
+
 	my $expression='$external::datestatus="'.$status.'";';
 	$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';
 	&Apache::run::run($expression,$safeeval);
 	&Apache::lonxml::debug("Got $status");
+
 	if (( $status eq 'CLOSED' ) ||
 	    ( $status eq 'UNCHECKEDOUT') ||
+	    ( $status eq 'NOT_YET_VIEWED') ||
 	    ( $status eq 'BANNED') ||
-	    ( $status eq 'UNAVAILABLE')) {
-	    my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
+	    ( $status eq 'UNAVAILABLE') ||
+	    ( $status eq 'NOT_IN_A_SLOT') ||
+	    ( $status eq 'INVALID_ACCESS')) {
+	    my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,
+						       $style);
 	    if ( $target eq "web" ) {
-		$result.= $head_tag_start.'</head>';
-		my $msg=$body_tag_start;
+		my $msg;
 		if ($status eq 'UNAVAILABLE') {
-		    $result.='<h1>Unable to determine if this resource is open due to network problems. Please try again later.</h1>';
-		} else {
-		    $result.='<h1>Not open to be viewed</h1>';
+		    $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
+                } elsif ($status eq 'NOT_IN_A_SLOT') {
+                    $msg.='<h1>'.&mt('You are not currently signed up to work at this time and/or place.').'</h1>';
+		} elsif ($status ne 'NOT_YET_VIEWED') {
+		    $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
 		}
-		if ($status eq 'CLOSED') {
-		    $msg.='The problem '.$accessmsg;
+		if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
+		    $msg.=&mt('The problem ').$accessmsg;
 		} elsif ($status eq 'UNCHECKEDOUT') {
-		    $msg.=&checkout_msg;
+		    $msg.=&checkout_msg();
+		} elsif ($status eq 'NOT_YET_VIEWED') {
+		    $msg.=&firstaccess_msg($accessmsg,$symb);
+		} elsif ($status eq 'NOT_IN_A_SLOT') {
+		    $msg.=&Apache::bridgetask::add_request_another_attempt_button("Sign up for time to work");
 		}
 		$result.=$msg.'<br />';
 	    } elsif ($target eq 'tex') {
-		$result.='\begin{document}\noindent \vskip 1 mm  \begin{minipage}{\textwidth}\vskip 0 mm';
+		my $startminipage = ($env{'form.problem_split'}=~/yes/i)? ''
+		                    : '\begin{minipage}{\textwidth}';
+		$result.='\begin{document}\noindent \vskip 1 mm '.
+		    $startminipage.'\vskip 0 mm';
 		if ($status eq 'UNAVAILABLE') {
-		    $result.='Unable to determine if this resource is open due to network problems. Please try again later.\vskip 0 mm ';
+		    $result.=&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'\vskip 0 mm ';
 		} else {
-		    $result.="Problem is not open to be viewed. It $accessmsg \\vskip 0 mm ";
+		    $result.=&mt('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') {
-		# create a page header and exit
-		$result.="$head_tag_start<title>$name</title></head>
-              $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($ENV{'form.rndseed'});
-		}
-		# if we are viewing someone else preserve that info
-		if (defined $ENV{'form.grade_symb'}) {
-		    foreach my $field ('symb','courseid','domain','username') {
-			$result .= '<input type="hidden" name="grade_'.$field.
-			    '" value="'.$ENV{"form.grade_$field"}.'" />'."\n";
-		    }
-		}
-	    } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER'
-		     || $status eq 'CLOSED' || $status eq 'UNAVALAILABLE') {
-		$result.=$head_tag_start.
-		    "<title>$name</title></head>\n$body_tag_start\n";
+	} elsif ($status eq 'NEEDS_CHECKIN') {
+	    my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,
+						       $style);
+	    if ($target eq 'web') {
+		$result .= 
+		    &Apache::bridgetask::proctor_validation_screen($slot);
+	    } elsif ($target eq 'grade') {
+		&Apache::bridgetask::proctor_check_auth($slot_name,$slot,
+							'problem');
 	    }
-	} 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');
-		if ($name eq 'con_lost') { $name = ''; }
-	    }
-	    $Apache::lonhomework::name=$name;
-	    my $id = $Apache::inputtags::part;
-	    my $weight = &Apache::lonnet::EXT("resource.$id.weight");
-	    my $allkeys=&Apache::lonnet::metadata($ENV{'request.uri'},'keys');
-	    my @allkeys = split /,/,$allkeys;
-	    my $allow_print_points = 0;
-	    foreach my $partial_key (@allkeys) {
-		if ($partial_key=~m/weight/) {
-		    $allow_print_points++;
-		}
+	} elsif ($target eq 'web') {
+	    if ($status eq 'CAN_ANSWER' 
+		&& $slot_name ne ''
+		&& $Apache::lonhomework::history{'resource.0.checkedin'} eq '') {
+		# unproctored slot access, self checkin
+		&Apache::bridgetask::check_in('problem',undef,undef,
+					      $slot_name);
 	    }
-	    my $duedate = &Apache::lonnet::EXT("resource.$id.duedate"); 
-	    $duedate = POSIX::strftime("%c",localtime($duedate));
-	    my $temp_file;
-	    my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.due";
-	    if (-e $filename) {
-		$temp_file = Apache::File->new($filename);
-	    } else {
-		$temp_file = Apache::File->new('>>'.$filename);
+	    $result.="\n $form_tag_start \t".	
+	      '<input type="hidden" name="submitted" value="yes" />';
+	    # create a page header and exit
+	    if ($env{'request.state'} eq "construct") {
+		$result.= &problem_web_to_edit_header($env{'form.rndseed'});
+                if ($Apache::lonhomework::type eq 'practice') {
+                    $result.= '<input type="submit" name="resetdata" '.
+                              'value="'.&mt('New Problem Variation').'" />'.
+                              &practice_problem_header().'<hr />';
+                }
 	    }
-	    my @due_file_content = <$temp_file>;
-	    my $due_file_content = $due_file_content[$#due_file_content];
-	    chomp $due_file_content;
-	    my $name_of_resourse= &get_resource_name($parstack,$safeeval);
-	    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 '.$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'.$startminipage;
-			if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
-		    }
-		} else {
-		    $result .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';
-		}
-	    } 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'.$startminipage;	
-		    if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
-		} else {
-		    $result .= '\vskip 1mm \\\\\\\\';
+	    # if we are viewing someone else preserve that info
+	    if (defined $env{'form.grade_symb'}) {
+		foreach my $field ('symb','courseid','domain','username') {
+		    $result .= '<input type="hidden" name="grade_'.$field.
+			'" value="'.$env{"form.grade_$field"}.'" />'."\n";
 		}
 	    }
+	} elsif ($target eq 'tex') {
+	    $result .= 'INSERTTEXFRONTMATTERHERE';
+
 	}
     } elsif ($target eq 'edit') {
-	$result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.
-	    &problem_edit_header();
+	$result .= $form_tag_start.&problem_edit_header();
+	$Apache::lonxml::warnings_error_header=
+	    &mt("Editor Errors - these errors might not effect the running of the problem, but they will likely cause problems with further use of the Edit mode. Please use the EditXML mode to fix these errors.")."<br />";
 	my $temp=&Apache::edit::insertlist($target,$token);
 	$result.=$temp;
     } elsif ($target eq 'modified') {
 	$result=$token->[4];
-	$result.=&Apache::edit::handle_insert();
     } else {
 	# page_start returned a starting result, delete it if we don't need it
 	$result = '';
@@ -482,50 +1022,148 @@ sub start_problem {
 
 sub end_problem {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    my $result='';
+    my $result;
+
+    if (!$Apache::lonxml::metamode) {
+	$result = &Apache::lonxml::endredirection(); #started in &start_problem
+	$Apache::lonxml::post_evaluate=0;
+    }
+
+    if ($target eq 'tex') {
+	# Figure out the front matter and replace the
+	# INSERTTEXFRONTMATTERHERE in result with it.  note that we do
+	# this in end_problem because whether or not we display due
+	# dates depends on whether due dates have already been
+	# displayed in the problem parts.
+
+	my $frontmatter   = '';
+	my $startminipage = '';
+	if (not $env{'form.problem_split'}=~/yes/) {
+	    $startminipage = '\begin{minipage}{\textwidth}';
+	}
+	my $id = $Apache::inputtags::part;
+	my $weight = &Apache::lonnet::EXT("resource.$id.weight");
+	my $packages=&Apache::lonnet::metadata($env{'request.uri'},'packages');
+	my @packages = split /,/,$packages;
+	my $allow_print_points = 0;
+	foreach my $partial_key (@packages) {
+	    if ($partial_key=~m/^part_0$/) {
+		$allow_print_points=1;
+	    }
+	}
+	my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
+	if (defined($maxtries) && $maxtries < 0) { $allow_print_points=0; }
+	if (lc($env{'course.'.$env{'request.course.id'}.
+			'.disableexampointprint'}) eq 'yes') {
+	    $allow_print_points=0;
+	}
+	my $name_of_resourse= &Apache::lonxml::latex_special_symbols(&get_resource_name($parstack,$safeeval),'header');
+	my $begin_doc='\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$env{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent ';
+	my $toc_line='\vskip 1 mm\noindent '.$startminipage.
+	    '\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
+	
+	#  Figure out what the due date is and if we need to print
+	#  it in the problem header.  We have been logging the
+	#  last due date written to file. 
+	
+	my $duetime = &Apache::lonnet::EXT("resource.$id.duedate"); 
+	my $duedate = POSIX::strftime("%c",localtime($duetime));
+	my $temp_file;
+	my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
+	
+	# Figure out what the last printed due date is or set it
+	# to the epoch if no duedates have been printed.
+	
+	my $due_file_content = 0;      #   If the file does not yet exist, time is the epoch.
+	if (-e $filename) {
+	    $temp_file = Apache::File->new($filename);
+	    my @due_file      = <$temp_file>;
+	    $due_file_content = $due_file[$#due_file];
+	    chomp $due_file_content;
+	} 
+	
+	# We display the due date iff it is not the same as the last
+	# duedate in problem header ($due_file_content), and
+	# none of our parts displayed a duedate.
+	#
+	my $parts_with_displayduedate;
+	if (defined $Apache::outputtags::showonce{'displayduedate'}) {
+	    $parts_with_displayduedate = 
+		scalar(@{$Apache::outputtags::showonce{'displayduedate'}});
+	} else {
+	    $parts_with_displayduedate = 0;
+	}
+	if (($due_file_content != $duetime) && ($parts_with_displayduedate == 0) ) {
+	    $temp_file = Apache::File->new('>'.$filename);
+	    print $temp_file "$duetime\n";
+	    if (not $env{'request.symb'} =~ m/\.page_/) {
+		if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') {
+		    $frontmatter .= $begin_doc.
+			'\textit{Due date: '.$duedate.'} '.$toc_line;
+		} else {
+		    $frontmatter.= $begin_doc.$toc_line;
+		    if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}
+		}
+	    } else {
+		$frontmatter .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\'.$startminipage;
+	    }
+	} else {
+	    if (not $env{'request.symb'} =~ m/\.page_/) {
+		$frontmatter .= $begin_doc.$toc_line;
+		if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}
+	    } else {
+		$frontmatter .= '\vskip 1mm \\\\\\\\'.$startminipage;
+	    }
+	}
+	$result =~ s/INSERTTEXFRONTMATTERHERE/$frontmatter/;
+    }
+
     my $status=$Apache::inputtags::status['-1'];
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
 	$target eq 'tex') {
-	if ( $target eq 'grade' && $Apache::inputtags::part eq '0' &&
-	     $status eq 'CAN_ANSWER' ) {
+	if ( $target eq 'grade' && $Apache::inputtags::part eq '0') {
 	    # if part is zero, no <part>s existed, so we need to the grading
-	    &Apache::inputtags::grade;
+	    if ($status eq 'CAN_ANSWER' ||$Apache::lonhomework::scantronmode) {
+		&Apache::inputtags::grade;
+	    } elsif ($status eq 'NEEDS_CHECKIN') {
+		# no need to grade, and don't want to hide data
+	    } else {
+		# move any submission data to .hidden
+		&Apache::inputtags::hidealldata($Apache::inputtags::part);
+	    }
 	} elsif ( ($target eq 'web' || $target eq 'tex') &&
 		  $Apache::inputtags::part eq '0' &&
-		  $status ne 'UNCHECKEDOUT') {
+		  $status ne 'UNCHECKEDOUT' && $status ne 'NOT_YET_VIEWED') {
 	    # if part is zero, no <part>s existed, so we need show the current
 	    # grading status
 	    my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part,$target);
 	    $result.= $gradestatus;
 	}
 	if (
-	    (($target eq 'web') && ($ENV{'request.state'} ne 'construct')) ||
+	    (($target eq 'web') && ($env{'request.state'} ne 'construct')) ||
 	    ($target eq 'answer') || ($target eq 'tex')
 	   ) {
-	    if ($status eq 'CAN_ANSWER') {
-		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' &&
-		    $ENV{'form.answer_output_mode'} ne 'tex') {
-		    $result.="</body>\n";
-		}
+	    if ($target ne 'tex' &&
+		$env{'form.answer_output_mode'} ne 'tex') {
+		$result.="</form>";
+		$result.= &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields());
 	    }
 	    if ($target eq 'web') {
-		$result.=&Apache::lonxml::xmlend();
+		$result.= &Apache::loncommon::end_page({'discussion' => 1});
 	    } elsif ($target eq 'tex') {
 		my $endminipage = '';
-		if (not $ENV{'form.problem_split'}=~/yes/) {
+		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 .= $endminipage.'\end{document} ';
+                if ($env{'form.print_discussions'} eq 'yes') {
+		    $result.=&Apache::lonxml::xmlend($target,$parser);
 		} else {
-		    $result .= '';
+		    $result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
+		    if (not $env{'request.symb'} =~ m/\.page_/) {
+			$result .= $endminipage.'\end{document} ';
+		    } else {
+			$result .= $endminipage;
+		    }
 		}
 	    }
 	}
@@ -533,9 +1171,10 @@ sub end_problem {
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
 	    &finalize_storage();
 	}
-	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
+	if ($target eq 'answer' && ($env{'request.state'} eq 'construct')
+	    && $env{'form.answer_output_mode'} ne 'tex') {
+	    $result.=&Apache::loncommon::end_page({'discussion' => 1});
+	                        # normally we get it from above, but in CSTR
 	                        # we always show answer mode too.
 	}
     } elsif ($target eq 'meta') {
@@ -543,18 +1182,20 @@ sub end_problem {
 	    @Apache::inputtags::response=();
 	    $result=&Apache::response::mandatory_part_meta;
 	}
+	$result.=&Apache::response::meta_part_order();
+	$result.=&Apache::response::meta_response_order();
     } elsif ($target eq 'edit') {
 	&Apache::lonxml::debug("in end_problem with $target, edit");
-	$result = &problem_edit_footer();
+	$result .= &problem_edit_footer();
+    } elsif ($target eq 'modified') {
+	 $result .= $token->[2];
     }
 
-    if ($ENV{'request.state'} eq 'construct' && $target eq 'web') {
+    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);
-    undef($Apache::lonhomework::parsing_a_problem);
+
+    &reset_problem_globals('problem');
 
     return $result;
 }
@@ -562,28 +1203,36 @@ sub end_problem {
 
 sub start_library {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    my ($result,$head_tag_start,$body_tag_start,$form_tag_start);
-
+    my ($result,$form_tag_start);
+    if ($#$tagstack eq 0 && $$tagstack[0] eq 'library') {
+	&init_problem_globals('library');
+	$Apache::lonhomework::type='problem';
+    }
     if ($target eq 'edit') {
-	($result,$head_tag_start,$body_tag_start,$form_tag_start)=
-	    &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
-	$result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.
-	    &problem_edit_header();
+	($result,$form_tag_start)=
+	    &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
+			'Edit');
+	$result.=$form_tag_start.&problem_edit_header();
 	my $temp=&Apache::edit::insertlist($target,$token);
 	$result.=$temp;
     } elsif ($target eq 'modified') {
 	$result=$token->[4];
-	$result.=&Apache::edit::handle_insert();
-    } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&
-	     $ENV{'request.state'} eq "construct" ) {
-	($result,$head_tag_start,$body_tag_start,$form_tag_start)=
-	    &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
+    } elsif (($target eq 'web' || $target eq 'webgrade')
+	     && ($#$tagstack eq 0 && $$tagstack[0] eq 'library')
+	     && $env{'request.state'} eq "construct" ) {
 	my $name=&get_resource_name($parstack,$safeeval);
+	($result,$form_tag_start)=
+	    &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
+			$name);
 	my $rndseed=&setup_rndseed($safeeval);
-	$result.="$head_tag_start<title>$name</title></head>
-              $body_tag_start \n $form_tag_start".	
+	$result.=" \n $form_tag_start".	
 		  '<input type="hidden" name="submitted" value="yes" />';
 	$result.=&problem_web_to_edit_header($rndseed);
+        if ($Apache::lonhomework::type eq 'practice') {
+            $result.= '<input type="submit" name="resetdata" '.
+                      'value="'.&mt('New Problem Variation').'" />'.
+                      &practice_problem_header().'<hr />';
+        }
     }
     return $result;
 }
@@ -593,30 +1242,37 @@ sub end_library {
     my $result='';
     if ($target eq 'edit') {
 	$result=&problem_edit_footer();
-    } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&
-	     $ENV{'request.state'} eq "construct") {
-	$result.='</form></body>'.&Apache::lonxml::xmlend();
+    } elsif ($target eq 'web' 
+	     && ($#$tagstack eq 0 && $$tagstack[0] eq 'library') 
+	     && $env{'request.state'} eq "construct") {
+	$result.='</form>'.&Apache::loncommon::end_page({'discussion' => 1});
+    }
+    if ( $#$tagstack eq 0 && $$tagstack[0] eq 'library') {
+	&reset_problem_globals('library');
     }
     return $result;
 }
 
 sub start_definetag {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
 
     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>';
+    my $skip=&Apache::lonxml::get_all_text("/definetag",$parser,$style);
+    if ($target eq 'web') {
+	if ($name=~/^\//) {
+	    $result=
+		'<br /><table class="LC_sty_end"><tr><th>'.
+		&mt('END [_1]'.'<tt>'.$name.'</tt>').'</th></tr>';
+	} else {
+	    $result=
+		'<br /><table class="LC_sty_begin"><tr><th>'.
+		&mt('BEGIN [_1]'.'<tt>'.$name.'</tt>').'</th></tr>';
+	}
+	$skip = &HTML::Entities::encode($skip, '<>&"');
+	$result.='<tr><td><pre>'.$skip.'</pre></td></tr></table>';
     }
-    $skip=~s/\</\&lt\;/gs;
-    $skip=~s/\>/\&gt\;/gs;
-    $result.='<tr><td><pre>'.$skip.'</pre></td></tr></table>';
     return $result;
 }
 
@@ -625,14 +1281,14 @@ sub end_definetag {
 }
 
 sub start_block {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    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') {
+    if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer'  ||
+	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
 	my $code = $token->[2]->{'condition'};
-	if ($code) {
+	if (defined($code) && $code ne '') {
 	    if (!$Apache::lonxml::default_homework_loaded) {
 		&Apache::lonxml::default_homework_load($safeeval);
 	    }
@@ -642,7 +1298,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='';
@@ -669,18 +1325,57 @@ sub end_block {
 }
 
 sub start_languageblock {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    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') {
-	&Apache::lonxml::startredirection();
+    if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
+	my $include = $token->[2]->{'include'};
+	my $exclude = $token->[2]->{'exclude'};
+        my @preferred_languages=&Apache::lonlocal::preferred_languages();
+# This should not even happen, since we should at least have the server language
+        if (!$preferred_languages[0]) { $preferred_languages[0]='en'; }
+# Now loop over all languages in order of preference
+        foreach my $preferred_language (@preferred_languages) {
+# If the languageblock has no arguments, show the contents
+           $result=1;
+           my $found=0;
+# Do we have an include argument?
+	   if ($include) {
+# If include is specified, by default, don't render the block
+              $result=0;
+              foreach my $included_language (split(/\,/,$include)) {
+# ... but if my preferred language is included, render it
+                 if ($included_language eq $preferred_language) {
+                    $result=1; 
+                    $found=1; 
+                 }
+              }
+	   }
+# Do we have an exclude argument?
+           if ($exclude) {
+              $result=1;
+              foreach my $excluded_language (split(/\,/,$exclude)) {
+                 if ($excluded_language eq $preferred_language) {
+                    $result=0;
+                    $found=1;
+                 }
+              }
+	   }
+           if ($found) { last; }
+        }
+	if ( ! $result ) {
+	    my $skip=&Apache::lonxml::get_all_text("/languageblock",$parser,
+						   $style);
+	    &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
+	}
+	$result='';
     } elsif ($target eq 'edit') {
 	$result .=&Apache::edit::tag_start($target,$token);
-	$result .=&Apache::edit::text_arg('Include Language:','include',
+	$result .=&Apache::edit::text_arg(&mt('Include Language:'),'include',
 					  $token,40);
-	$result .=&Apache::edit::text_arg('Exclude Language:','exclude',
+	$result .=&Apache::edit::text_arg(&mt('Exclude Language:'),'exclude',
 					  $token,40);
 	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
@@ -695,46 +1390,83 @@ sub start_languageblock {
 sub end_languageblock {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
+    if ($target eq "edit") {
+	$result.= &Apache::edit::tag_end($target,$token,'');
+    }
+    return $result;
+}
 
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
-	$target eq 'tex' || $target eq 'analyze') {
-	my $text=&Apache::lonxml::endredirection();
-	my $include= &Apache::lonxml::get_param('include',$parstack,$safeeval);
-	my $exclude= &Apache::lonxml::get_param('exclude',$parstack,$safeeval);
-	my %languages=&Apache::loncommon::display_languages();
-	$result='1';
-	if ($include) {
-	    $result='';
-	    foreach (split(/\,/,$include)) {
-		if ($languages{$_}) { $result='1'; }
-	    }
-	}
-	if ($exclude) {
-	    foreach (split(/\,/,$exclude)) {
-		if ($languages{$_}) { $result='0'; }
-	    }
+{
+    my %available_texts;
+    sub start_translated {
+	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+	&Apache::lonxml::register('Apache::structuretags',('lang'));
+	undef(%available_texts);
+    }
+    
+    sub end_translated {
+	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+	my $result;
+	#show the translation on viewable targets
+	if ($target eq 'web'     || $target eq 'tex' || $target eq 'webgrade'||
+	    # or non-viewable targets, if it's embedded in something that
+	    # wants the output
+	    (($target eq 'answer' || $target eq 'analyze'|| $target eq 'grade')
+	     && &Apache::lonxml::in_redirection() ) ) {
+	    my @possibilities = keys(%available_texts);
+	    my $which = 
+		&Apache::loncommon::languages(\@possibilities) || 'default';
+	    $result = $available_texts{$which};
+	}
+	undef(%available_texts);
+	&Apache::lonxml::deregister('Apache::structuretags',('lang'));
+	return $result;
+    }
+
+
+    sub start_lang {
+	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+	if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
+	    $target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
+	    &Apache::lonxml::startredirection();
 	}
-	if ( ! $result ) {
-	    $result='';
-	} else {
-	    $result=$text;
+	return '';
+    }
+
+    sub end_lang {
+	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+	if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
+	    $target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
+	    my $result = &Apache::lonxml::endredirection();
+	    my $which = &Apache::lonxml::get_param('which',$parstack,
+						   $safeeval);
+            if ($which=~/\w/) {
+                $available_texts{$which} = $result;
+            }
+            my $otherlangs = &Apache::lonxml::get_param('other',$parstack,
+                                                        $safeeval);
+            foreach my $language (split(/\s*\,\s*/,$otherlangs)) {
+                if ($language=~/\w/) {
+                    $available_texts{$language} = $result;
+                }
+            }
+
 	}
-    } elsif ($target eq "edit") {
-	$result.= &Apache::edit::tag_end($target,$token,'');
+	return '';
     }
-    return $result;
 }
 
 sub start_instructorcomment {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    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') {
-        $result=($ENV{'request.role'}=~/^(in|cc|au|ca|li)/);
-	if ( ! $result ) {
-	    my $skip=&Apache::lonxml::get_all_text("/instructorcomment",$parser);
+    if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
+        $result=($env{'request.role'}=~/^(in|cc|au|ca|li)/);
+	if ( (! $result) or ($env{'form.instructor_comments'} eq 'hide')) {
+	    my $skip=&Apache::lonxml::get_all_text("/instructorcomment",
+						   $parser,$style);
 	    &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
 	}
 	$result='';
@@ -755,11 +1487,11 @@ sub end_instructorcomment {
 }
 
 sub start_while {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    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') {
+    if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
 	my $code = $token->[2]->{'condition'};
 
 	push( @Apache::structuretags::whileconds, $code);
@@ -767,7 +1499,7 @@ sub start_while {
 	    &Apache::lonxml::default_homework_load($safeeval);
 	}
 	my $result = &Apache::run::run($code,$safeeval);
-	my $bodytext=&Apache::lonxml::get_all_text("/while",$parser);
+	my $bodytext=&Apache::lonxml::get_all_text("/while",$parser,$style);
 	push( @Apache::structuretags::whilebody, $bodytext);
 	push( @Apache::structuretags::whileline, $token->[5]);
 	&Apache::lonxml::debug("s code $code got -$result-");
@@ -776,7 +1508,7 @@ sub start_while {
 	}
     } elsif ($target eq 'edit') {
 	$result .=&Apache::edit::tag_start($target,$token);
-	$result .=&Apache::edit::text_arg('Test Condition:','condition',
+	$result .=&Apache::edit::text_arg(&mt('Test Condition:'),'condition',
 					  $token,40);
 	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
@@ -791,8 +1523,8 @@ sub end_while {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
 
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
-	$target eq 'tex' || $target eq 'analyze') {
+    if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
 	my $code = pop(@Apache::structuretags::whileconds);
 	my $bodytext = pop(@Apache::structuretags::whilebody);
 	my $line = pop(@Apache::structuretags::whileline);
@@ -805,10 +1537,17 @@ sub end_while {
 		$return = 0; $error=1; next;
 	    }
 	    $result.=&Apache::scripttag::xmlparse($bodytext);
+	    if ($target eq 'grade' || $target eq 'answer' ||
+		$target eq 'analyze') {
+		# grade/answer/analyze should produce no output but if we
+		# are redirecting, the redirecter should know what to do
+		# with the output
+		if (!$Apache::lonxml::redirection) { undef($result); }
+	    }
 	    $return = &Apache::run::run($code,$safeeval);
 	}
 	if ($error) {
-	    &Apache::lonxml::error('<pre>Code ran too long. It ran for more than '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' seconds occured while running &lt;while$gt; on line '.$line.'</pre>');
+	    &Apache::lonxml::error('<pre>'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occurred while running &lt;while&gt; on line').' '.$line.'</pre>');
 	}
     } elsif ($target eq "edit") {
 	$result.= &Apache::edit::tag_end($target,$token,'');
@@ -823,12 +1562,14 @@ sub end_while {
 #  ...
 # </randomlist>
 sub start_randomlist {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
-    if ($target eq 'answer' || $target eq 'grade' || $target eq 'web' ||
-	$target eq 'tex' || $target eq 'analyze') {
+    if ($target eq 'answer' || $target eq 'grade'   || $target eq 'web' ||
+	$target eq 'tex'    || $target eq 'analyze' || $target eq 'webgrade') {
 	my $body= &Apache::lonxml::get_all_text("/randomlist",$parser);
-	my $b_parser= HTML::TokeParser->new(\$body);
+	my $b_parser= HTML::LCParser->new(\$body);
+	$b_parser->xml_mode(1);
+	$b_parser->marked_sections(1);
 	my $b_tok;
 	my @randomlist;
 	my $list_item;
@@ -852,17 +1593,33 @@ sub start_randomlist {
 	    #  print "<b>END-TAG $b_tok->[1]</b><br />";
 	    # }
 	}
-	my @idx_arr = (0 .. $#randomlist);
-	&Apache::structuretags::shuffle(\@idx_arr);
-	my $bodytext = '';
-	my $show=$#randomlist;
-	my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval);
-	$showarg--;
-	if ( ($showarg >= 0) && ($showarg < $show) ) { $show = $showarg; }
-	for(0 .. $show) {
-	    $bodytext .= "$randomlist[ $idx_arr[$_] ]";
+	if (@randomlist) {
+	    my @idx_arr = (0 .. $#randomlist);
+	    &Apache::structuretags::shuffle(\@idx_arr);
+	    my $bodytext = '';
+	    my $show=$#randomlist;
+	    my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval);
+	    $showarg--;
+	    if ( ($showarg >= 0) && ($showarg < $show) ) { $show = $showarg; }
+            if (($target eq 'analyze') && ($env{'form.check_parts_withrandomlist'})) {
+                my @currlist;
+                my $part = $Apache::inputtags::part;
+                if ($part ne '') {
+                    if (ref($Apache::lonhomework::analyze{'parts_withrandomlist'}) eq 'ARRAY') {
+                        my @currlist = @{$Apache::lonhomework::analyze{'parts_withrandomlist'}};
+                        if (!(grep(/^\Q$part\E$/,@currlist))) {
+                            push(@{$Apache::lonhomework::analyze{'parts_withrandomlist'}},$part);
+                        }
+                    } else {
+                        push(@{$Apache::lonhomework::analyze{'parts_withrandomlist'}},$part);
+                    }
+                }
+            }
+	    for(0 .. $show) {
+		$bodytext .= "$randomlist[ $idx_arr[$_] ]";
+	    }
+	    &Apache::lonxml::newparser($parser,\$bodytext);
 	}
-	&Apache::lonxml::newparser($parser,\$bodytext);
     } elsif ($target eq 'edit' ) {
 	$result .=&Apache::edit::tag_start($target,$token);
 	$result .=&Apache::edit::text_arg('Maximum Tags to Show:','show',
@@ -879,13 +1636,14 @@ sub start_randomlist {
 sub shuffle {
     my $a=shift;
     my $i;
-    if (defined(@$a)) {
-	&Apache::response::setrandomnumber();
+    if (ref($a) eq 'ARRAY' && @$a) {
+	&Apache::response::pushrandomnumber();
 	for($i=@$a;--$i;) {
 	    my $j=int(&Math::Random::random_uniform() * ($i+1));
 	    next if $i == $j;
 	    @$a[$i,$j] = @$a[$j,$i];
 	}
+	&Apache::response::poprandomnumber();
     }
 }
 
@@ -899,50 +1657,104 @@ sub end_randomlist {
     return $result;
 }
 
+sub ordered_show_check {
+    my $last_part=$Apache::inputtags::partlist[-2];
+    my $in_order=
+	&Apache::lonnet::EXT('resource.'.$Apache::inputtags::part.'.ordered');
+    my $in_order_show=1;
+    if ($last_part ne '0' && lc($in_order) eq 'yes') {
+	$in_order_show=&Apache::response::check_status($last_part);
+    }
+    return $in_order_show;
+}
+
 sub start_part {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    if (!$Apache::lonxml::metamode) {
+	&Apache::lonxml::startredirection(); # we'll use redirection to fix up 
+	                                     # duedates.
+    }
     my $result='';
-    my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
-    if ($id eq '') { $id = $Apache::lonxml::curdepth; }
+    my $id= &Apache::lonxml::get_id($parstack,$safeeval);
     $Apache::inputtags::part=$id;
     push(@Apache::inputtags::partlist,$id);
     @Apache::inputtags::response=();
     @Apache::inputtags::previous=();
     @Apache::inputtags::previous_version=();
-    $Apache::lonhomework::problemstatus=
-	&Apache::lonnet::EXT("resource.$id.problemstatus");
+    &Apache::lonhomework::set_show_problem_status(&get_problem_status($id));
+    &Apache::response::reset_params();
+
     my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
+    my $newtype=&Apache::lonnet::EXT("resource.$id.type");
+    if ($newtype) { $Apache::lonhomework::type=$newtype; }
+    my $in_order_show=&ordered_show_check();
+    my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
+    $expression.='$external::type=\''.$Apache::lonhomework::type.'\';';
+    &Apache::run::run($expression,$safeeval);
 
     if ($target eq 'meta') {
-	return &Apache::response::mandatory_part_meta;
+	my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval);
+	return &Apache::response::mandatory_part_meta.
+	       &Apache::response::meta_parameter_write('display','string',$display,'Part Description');
     } elsif ($target eq 'web' || $target eq 'grade' ||
 	     $target eq 'answer' || $target eq 'tex') {
-	if ($hidden) {
-	    my $bodytext=&Apache::lonxml::get_all_text("/part",$parser);
+	if ($hidden || !$in_order_show) {
+	    my $bodytext=&Apache::lonxml::get_all_text("/part",$parser,$style);
 	} else {
 	    my ($status,$accessmsg) = &Apache::lonhomework::check_access($id);
 	    push (@Apache::inputtags::status,$status);
 	    my $expression='$external::datestatus="'.$status.'";';
 	    $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';
 	    &Apache::run::run($expression,$safeeval);
-	    if ( $status eq 'CLOSED' ) {
-		my $bodytext=&Apache::lonxml::get_all_text("/part",$parser);
+	    if ($env{'request.state'} eq 'construct') {
+		&set_problem_state($Apache::inputtags::part); 
+	    }
+	    if (( $status eq 'CLOSED' ) ||
+		( $status eq 'UNCHECKEDOUT') ||
+		( $status eq 'NOT_YET_VIEWED') ||
+		( $status eq 'BANNED') ||
+		( $status eq 'UNAVAILABLE') ||
+		( $status eq 'INVALID_ACCESS')) {
+		my $bodytext=&Apache::lonxml::get_all_text("/part",$parser,
+							   $style);
 		if ( $target eq "web" ) {
-		    $result="<br />Part is not open to be viewed. It $accessmsg<br />";
+		    $result="<br />".&mt('Part is not open to be viewed. It')." $accessmsg<br />";
 		} elsif ( $target eq 'tex' ) {
-		    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}";
+		    if (not $env{'form.problem_split'}=~/yes/) {
+			$result="\\end{minipage}\\vskip 0 mm ".&mt('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 \\\\";
+			$result="\\vskip 0 mm ".&mt('Part is not open to be viewed. It')." $accessmsg \\\\";
 		    }
 		}
 	    } else {
 		if ($target eq 'tex') {
-		    if (not $ENV{'form.problem_split'}=~/yes/) {
-			$result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
+		    if (not $env{'form.problem_split'}=~/yes/) {
+			if ($$tagstack[-2] eq 'td') {
+			    $result.='\noindent \begin{minipage}{\textwidth}\noindent';
+			} else {
+			    $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}}';}
+		    my $allkeys=&Apache::lonnet::metadata($env{'request.uri'},'packages');
+		    my @allkeys = split /,/,$allkeys;
+		    my $allow_print_points = 0;
+		    foreach my $partial_key (@allkeys) {
+			if ($partial_key=~m/^part_(.*)$/) {
+			    if ($1 ne '0') {$allow_print_points=1;}
+			}
+		    }
+		    my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
+		    if (defined($maxtries) && $maxtries < 0) {
+			$allow_print_points=0;
+		    }
+		    if (lc($env{'course.'.$env{'request.course.id'}.
+				    '.disableexampointprint'}) eq 'yes') {
+			$allow_print_points=0;
+		    }
+		    if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
+		} elsif ($target eq 'web') {
+		    $result.='<a name="'.&escape($Apache::inputtags::part).'" />';
 		}
 	    }
 	}
@@ -950,13 +1762,16 @@ sub start_part {
 	$result.=&Apache::edit::tag_start($target,$token);
 	$result.=&Apache::edit::text_arg('Part ID:','id',$token).
 	    &Apache::loncommon::help_open_topic("Part_Tag_Edit_Help").
+	    '&nbsp;&nbsp;'.
+&Apache::edit::text_arg('Displayed Part Description:','display',$token).
 		&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
 	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
-						     $safeeval,'id');
+						     $safeeval,'id','display');
 	if ($constructtag) {
+	    #limiting ids to only letters numbers, and space
+	    $token->[2]->{'id'}=~s/[^A-Za-z0-9 ]//gs;
 	    $result = &Apache::edit::rebuild_tag($token);
-	    $result.=&Apache::edit::handle_insert();
 	}
     }
     return $result;
@@ -967,33 +1782,50 @@ sub end_part {
     &Apache::lonxml::debug("in end_part $target ");
     my $status=$Apache::inputtags::status['-1'];
     my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
-    my $result='';
-    if ( $target eq 'meta' ) {
-	$result='';
-    } elsif ( $target eq 'grade' && $status eq 'CAN_ANSWER' && !$hidden) {
-	$result=&Apache::inputtags::grade;
-    } elsif (($target eq 'web' || $target eq 'tex') && !$hidden ) {
+    my $in_order_show=&ordered_show_check();
+    my $result;
+    if (!$Apache::lonxml::metamode) {
+	$result = &Apache::lonxml::endredirection(); # started in &start_part
+	$Apache::lonxml::post_evaluate=0;
+    }
+    if ($target eq 'grade') {
+	if (($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) &&
+	    !$hidden && $in_order_show) {
+	    $result.=&Apache::inputtags::grade;
+	} else {
+	    # move any submission data to .hidden
+	    &Apache::inputtags::hidealldata($Apache::inputtags::part);
+	}
+    } elsif (($target eq 'web' || $target eq 'tex') &&
+	     !$hidden && $in_order_show) {
 	my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,
 							$target);
 	if ($Apache::lonhomework::type eq 'exam' && $target eq 'tex') {
 	    $gradestatus='';
 	}
-	$result=$gradestatus;
+	$result.=$gradestatus;
+	if ($$tagstack[-2] eq 'td' and $target eq 'tex') {$result.='\end{minipage}';} 
     } elsif ($target eq 'edit') {
-	$result=&Apache::edit::end_table();
+	$result.=&Apache::edit::end_table();
+    } elsif ($target eq 'modified') {
+	 $result .= $token->[2];
     }
     pop @Apache::inputtags::status;
     $Apache::inputtags::part='';
+    $Apache::lonhomework::type = $Apache::lonhomework::default_type;
     return $result;
 }
 
 sub start_preduedate {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
-	if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
-	    $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' &&
-	    $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
-	    &Apache::lonxml::get_all_text("/preduedate",$parser);
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    if ($target eq 'web' || $target eq 'grade'    || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'webgrade') {
+	&Apache::lonxml::debug("State in preduedate is ". $Apache::inputtags::status['-1']);
+	if (!$Apache::lonhomework::scantronmode &&
+	    $Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
+	    $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') {
+	    &Apache::lonxml::debug("Wha? ". ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER'));
+	    &Apache::lonxml::get_all_text("/preduedate",$parser,$style);
 	}
     }
     return '';
@@ -1003,14 +1835,21 @@ sub end_preduedate {
     return '';
 }
 
+# In all the modes where <postanswerdate> text is 
+# displayable,  all we do is eat up the text between the start/stop
+# tags if the conditions are not right to display it.
 sub start_postanswerdate {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') {
-	if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
-	    &Apache::lonxml::get_all_text("/postanswerdate",$parser);
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $pav = &Apache::lonnet::allowed('pav', $env{'request.course.id'}) ||
+	&Apache::lonnet::allowed('pav',
+			   $env{'request.course.id'}.'/'.$env{'request.course.sec'});
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'webgrade' ||
+	$target eq 'tex' ) {
+	if ($Apache::lonhomework::scantronmode ||
+	    $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER' ||
+	    (($target eq 'tex') && !$pav)) {
+	    &Apache::lonxml::get_all_text("/postanswerdate",$parser,$style);
 	}
-    } elsif ($target eq 'tex') {
-	return '\vskip 0 mm \noindent';
     }
     return '';
 }
@@ -1020,14 +1859,15 @@ sub end_postanswerdate {
 }
 
 sub start_notsolved {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
-	$target eq 'tex') {
+	$target eq 'tex' || $target eq 'webgrade') {
 	my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
 	&Apache::lonxml::debug("not solved has :$gradestatus:");
-	if ($gradestatus =~ /^correct/) {
+	if ($gradestatus =~ /^correct/ &&
+	    &Apache::response::show_answer()) {
 	    &Apache::lonxml::debug("skipping");
-	    &Apache::lonxml::get_all_text("/notsolved",$parser);
+	    &Apache::lonxml::get_all_text("/notsolved",$parser,$style);
 	}
     }
     return '';
@@ -1038,12 +1878,13 @@ sub end_notsolved {
 }
 
 sub start_solved {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
 	$target eq 'tex') {
 	my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
-	if ($gradestatus !~ /^correct/) {
-	    &Apache::lonxml::get_all_text("/solved",$parser);
+	if ($gradestatus !~ /^correct/ ||
+	    !&Apache::response::show_answer()) {
+	    &Apache::lonxml::get_all_text("/solved",$parser,$style);
 	}
     }
     return '';
@@ -1053,34 +1894,90 @@ sub end_solved {
     return '';
 }
 
+sub start_problemtype {
+    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' || $target eq 'webgrade') {
+	my $mode=lc(&Apache::lonxml::get_param('mode',$parstack,$safeeval));
+	if (!defined($mode)) { $mode='show'; }
+	my $for=&Apache::lonxml::get_param('for',$parstack,$safeeval);
+	my $found=0;
+	foreach my $type (split(',',$for)) {
+	    if ($Apache::lonhomework::type eq lc($type)) { $found=1; }
+	}
+	if ($mode eq 'show' && !$found) {
+	    &Apache::lonxml::get_all_text("/problemtype",$parser,$style);
+	}
+	if ($mode eq 'hide' && $found) {
+	    &Apache::lonxml::get_all_text("/problemtype",$parser,$style);
+	}
+    } elsif ($target eq 'edit') {
+	$result .=&Apache::edit::tag_start($target,$token);
+	$result.=&Apache::edit::select_arg('Mode:','mode',
+					   [['show','Show'],
+					    ['hide','Hide']]
+					   ,$token);
+	$result .=&Apache::edit::checked_arg('When used as type(s):','for',
+					     [ ['exam','Exam/Quiz Problem'],
+					       ['survey','Survey'],
+					       ['problem','Homework Problem'],
+                                               ['practice','Practice Problem'] ]
+					     ,$token);
+	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+    } elsif ($target eq 'modified') {
+	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+						     $safeeval,'mode','for');
+	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+    }
+    return $result;
+}
+
+sub end_problemtype {
+    return '';
+}
+
 sub start_startouttext {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my @result=(''.'');
     if ($target eq 'edit' || $target eq 'modified' ) { @result=('','no'); }
+    
+    my $nesting = 
+	&Apache::lonxml::set_state('outtext',
+				   &Apache::lonxml::get_state('outtext')+1);
+    if ($nesting > 1 && $env{'request.state'} eq 'construct') {
+	&Apache::lonxml::error("Nesting of &lt;startouttext /&gt; not allowed, on line ".$token->[5]);
+    }
     return (@result);
 }
 
 sub end_startouttext {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
     my $text='';
-
     if ($target eq 'edit') {
-	$text=&Apache::lonxml::get_all_text("endouttext",$parser);
-	$result.=&Apache::edit::start_table($token)."<tr><td>Text Block</td>
-<td>Delete:".
-                 &Apache::edit::deletelist($target,$token)
-		 ."</td>
-<td>".
-                 &Apache::edit::insertlist($target,$token).
+	my $areaid = 'homework_edit_'.$Apache::lonxml::curdepth;
+	$text=&Apache::lonxml::get_all_text("endouttext",$parser,$style);
+	$result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td>"
+                 .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
+                 .&Apache::edit::deletelist($target,$token)
+                 .'</span></td>';
+        unless ($env{'environment.wysiwygeditor'} eq 'on') {
+	    $result .= '<td align="left">'
+		.&Apache::lonhtmlcommon::dragmath_button($areaid,1)
+		.'</td>'
+		.'<td>'
+		.&Apache::edit::insertlist($target,$token)
+		.'</td>';
+	}
+	$result.='<td align="right" valign="top">' .
+	    &Apache::loncommon::helpLatexCheatsheet().
 		 &Apache::edit::end_row().
-                 &Apache::edit::start_spanning_row()."\n"
-		 . &Apache::loncommon::helpLatexCheatsheet () .
-		 &Apache::edit::editfield($token->[1],$text,"",80,4);
+                 &Apache::edit::start_spanning_row()."\n".
+		 &Apache::edit::editfield($token->[1],$text,"",80,8,1);
     }
     if ($target eq 'modified') {
-	$text=&Apache::lonxml::get_all_text("endouttext",$parser);
-	$result='<startouttext />'.&Apache::edit::modifiedfield();
+	$result='<startouttext />'.&Apache::edit::modifiedfield("endouttext",$parser);
     }
     if ($target eq 'tex') {
 	$result .= '\noindent ';
@@ -1094,7 +1991,16 @@ sub start_endouttext {
     if ($target eq "edit" ) { $result="</td></tr>".&Apache::edit::end_table()."\n"; }
     if ($target eq "modified") {
 	$result='<endouttext />'.
-	    &Apache::edit::handle_insertafter('startouttext'); }
+	    &Apache::edit::handle_insertafter('startouttext');
+    }
+
+    my $nesting = 
+	&Apache::lonxml::set_state('outtext',
+				   &Apache::lonxml::get_state('outtext')-1);
+    if ($nesting < 0 && $env{'request.state'} eq 'construct') {
+	&Apache::lonxml::error(" Extraneous &lt;endouttext /&gt; not allowed on line ".$token->[5]);
+	&Apache::lonxml::set_state('outtext', 0);
+    }
     return $result;
 }
 
@@ -1106,8 +2012,8 @@ sub end_endouttext {
 }
 
 sub delete_startouttext {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    #  my $text=&Apache::lonxml::get_all_text("endouttext",$parser);
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    #  my $text=&Apache::lonxml::get_all_text("endouttext",$parser,$style);
     my $text=$$parser['-1']->get_text("/endouttext");
     my $ntoken=$$parser['-1']->get_token();
     &Apache::lonxml::debug("Deleting :$text: and :$ntoken->[0]:$ntoken->[1]:$ntoken->[2]: for startouttext");
@@ -1122,12 +2028,14 @@ sub delete_startouttext {
 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'};
+    if (($env{'form.simple_edit_button'} ne 'off') &&
+	($target eq 'web') &&
+        (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
+        my $url=$env{'request.noversionuri'};
         $url=~s/\?.*$//;
+	my ($symb) = &Apache::lonnet::whichuser();
 	$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.'.
+                '<a href="'.$url.'/smpedit?symb='.&escape($symb).'">'.&mt('Edit').'</a> - '.&mt('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;
@@ -1137,5 +2045,17 @@ sub end_simpleeditbutton {
     return '';
 }
 
+sub practice_problem_header {
+    return '<span class="LC_info"><h3>'.&mt('Practice Problem').'</h3></span>'.
+           '<span class="LC_info">'.&mt('Submissions are not permanently recorded').
+           '</span>';
+}
+
 1;
 __END__
+
+=pod
+
+=back
+
+=cut