--- loncom/homework/structuretags.pm	2005/04/18 22:39:35	1.288
+++ loncom/homework/structuretags.pm	2023/06/02 01:20:27	1.575
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.288 2005/04/18 22:39:35 albertel Exp $
+# $Id: structuretags.pm,v 1.575 2023/06/02 01:20:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,6 +27,29 @@
 #
 ###
 
+=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,16 +59,133 @@ use Apache::File();
 use Apache::lonmenu;
 use Apache::lonlocal;
 use Apache::lonxml;
+use Apache::londefdef;
+use Apache::lonenc();
+use Apache::loncommon();
+use Apache::lonnavmaps;
 use Time::HiRes qw( gettimeofday tv_interval );
+use HTML::Entities();
+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','problemtype','startouttext','endouttext','simpleeditbutton','definetag'));
+    &Apache::lonxml::register('Apache::structuretags',('block','languageblock','translated','instructorcomment','while','randomlist','problem','library','web','print','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startpartmarker','startouttext','endpartmarker','endouttext','simpleeditbutton','definetag'));
+}
+
+
+#---------------------------------------------------------------------------------
+# 
+#  This section of code deals with hyphenation management.
+#  We must do three things:
+#  - keep track fo the desired languages to alter the header.
+#  - provide hyphenation selection as needed by each language that appears in the
+#    text.
+#  - Provide the header text needed to make available the desired hyphenations.
+#
+#
+
+# Hash whose keys are the languages encountered in the document/resource.
+#
+
+my %languages_required;
+##
+#   Given a language selection as input returns a chunk of LaTeX that
+#   selects the required hyphenator.
+#
+#  @param language - the language being selected.
+#  @return string
+#  @retval The LaTeX needed to select the hyphenation appropriate to the language. 
+#   
+sub select_hyphenation {
+    my $language  = shift;
+
+    $language = &Apache::loncommon::latexlanguage($language); # Translate -> latex language.
+
+    # If there is no latex language there's not much we can do:
+
+    if ($language) {
+	&require_language($language);
+	my $babel_hyphenation = "\\selectlanguage{$language}";
+	
+	return $babel_hyphenation;
+    } else {
+	return '';
+    }
+}
+##
+# Selects hyphenation based on the current problem metadata.
+# This requires that
+# - There is a language metadata item set for the problem.
+# - The language has a latex/babel hyphenation.
+#
+# @note: Uses &Apache::lonxml::request to locate the Uri associated with
+#        this problem.
+# @return string (possibly empty).
+# @retval If not empty an appropriate \selectlanguage{} directive.
+#
+sub select_metadata_hyphenation {
+    my $uri      = $Apache::lonxml::request->uri;
+    my $language = &Apache::lonnet::metadata($uri, 'language'); 
+    my $latex_language = &Apache::loncommon::latexhyphenation($language);
+    if ($latex_language) {
+	return '\selectlanguage{'.$latex_language."}\n";
+    }
+    return '';			# no latex hyphenation or no lang metadata.
+}
+
+
+##
+#  Clears the set of languages required by the document being rendered.
+#
+sub clear_required_languages {
+    %languages_required = ();
+}
+##
+# Allows an external client of this module to register a need for a language:
+#
+# @param LaTeX language required:
+#
+sub require_language {
+    my $language = shift;
+    $languages_required{$language} = 1;
+}
+
+##
+# Provides the header for babel that indicates the languages
+# the document requires.
+# @return string
+# @retval \usepackage[lang1,lang2...]{babel}
+# @retval ''   if there are no languages_required.
+sub languages_header {
+    my $header    ='';
+    my @languages = (keys(%languages_required));
+
+    # Only generate the header if there are languages:
+
+    if (scalar @languages) {
+	my $language_list = join(',', (@languages));
+	$header  = '\usepackage['.$language_list."]{babel}\n";
+    }
+    return $header;
 }
 
+#----------------------------------------------------------------------------------
+
 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 '';
 }
@@ -54,12 +194,51 @@ sub end_web {
     return '';
 }
 
+sub start_print {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    if ($target ne 'edit' && $target ne 'modified') {
+        if ($target ne 'tex') {
+            my $skip = &Apache::lonxml::get_all_text("/print",$parser,$style);
+            &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
+        }
+    } elsif ($target eq "edit") {
+        my $bodytext = &Apache::lonxml::get_all_text_unbalanced("/print",$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("/print",$parser);
+    }
+    return '';
+}
+
+sub end_print {
+    return '';
+}
+
 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;;
 }
@@ -68,8 +247,186 @@ sub end_tex {
     return '';
 }
 
+sub homework_js {
+    my ($postsubmit,$timeout);
+    if (($env{'request.course.id'}) && ($env{'request.state'} ne 'construct')) {
+        my $crstype = &Apache::loncommon::course_type();
+        if ($crstype eq 'Community') {
+            $crstype = 'community';
+        } elsif ($crstype eq 'Placement') {
+            $crstype = 'placement'; 
+        } else {
+            if ($env{'course.'.$env{'request.course.id'}.'.internal.coursecode'}) {
+                $crstype = 'official';
+            } elsif ($env{'course.'.$env{'request.course.id'}.'.internal.textbook'}) {
+                $crstype = 'textbook';
+            } else {
+                $crstype = 'unofficial';
+            }
+        }
+        $postsubmit = $env{'course.'.$env{'request.course.id'}.'.internal.postsubmit'};
+        if ($postsubmit eq '') {
+            my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'});
+            $postsubmit = $domdefs{'postsubmit'};
+            unless ($postsubmit eq 'off') {
+                $timeout = $domdefs{$crstype.'postsubtimeout'};
+            }
+        } elsif ($postsubmit eq '0') {
+            $postsubmit = 'off';
+        } elsif ($postsubmit eq '1') {
+            $postsubmit = 'on';
+            $timeout = $env{'course.'.$env{'request.course.id'}.'.internal.postsubtimeout'};
+            if ($timeout eq '') {
+                my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'});
+                $timeout = $domdefs{$crstype.'postsubtimeout'};
+            }
+        }
+        if ($timeout eq '') {
+            $timeout = 60;
+        }
+    } else {
+        my %domdefs = &Apache::lonnet::get_domain_defaults($env{'request.role.domain'});
+        $postsubmit = $domdefs{'postsubmit'};
+        unless ($postsubmit eq 'off') {
+            $timeout = 60;
+        }
+    }
+    my $jstimeout = 0;
+    if ($timeout) {
+        $jstimeout = 1000 * $timeout;
+    }
+    return &Apache::loncommon::resize_textarea_js().
+                &Apache::loncommon::colorfuleditor_js().
+           &setmode_javascript().
+	<<"JS";
+<script type="text/javascript">
+// <![CDATA[
+function setSubmittedPart (part,prefix) {
+    if (typeof(prefix) == 'undefined') {
+        this.document.lonhomework.submitted.value="part_"+part;
+    } else {
+        for (var i=0;i<this.document.lonhomework.elements.length;i++) {
+            if (this.document.lonhomework.elements[i].name == prefix+'submitted') {
+                this.document.lonhomework.elements[i].value="part_"+part;
+            }
+        }
+    }
+}
+
+function disableAutoComplete (id) {
+    var field = document.getElementById(id);
+    if (field != null && field != undefined){
+        if ('autocomplete' in field) {
+            field.autocomplete = "off";
+        } else {
+            field.setAttribute("autocomplete", "off");
+        }
+    }
+}
+
+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;
+}
+
+var submithandled = 0;
+var keypresshandled = 0;
+var postsubmit = '$postsubmit';
+
+\$(document).ready(function(){
+  if (postsubmit != 'off') {    
+    \$(document).keypress(function(event){
+        var keycode = (event.keyCode ? event.keyCode : event.which);
+        if ((keycode == '13') && (keypresshandled == 0)) {
+            if ( \$( document.activeElement ).hasClass("LC_textline") ) {
+                keypresshandled = 1;
+                var idsArray = \$( document.activeElement ).attr("id").split(/HWVAL_/);
+                if (idsArray.length) {
+                    event.preventDefault();
+                    var itemsArray = idsArray[1].split(/_/);
+                    var buttonId = idsArray[0]+'submit_'+itemsArray[0];
+                    \$("#"+buttonId).trigger("click");
+                }
+            }
+        }
+    });
+
+    \$(document).delegate('form :submit', 'click', function( event ) {
+        if ( \$( this ).hasClass( "LC_hwk_submit" ) ) {
+            var buttonId = this.id;
+            var timeout = $jstimeout;
+            if (submithandled == 0) {
+                submithandled = 1;
+                \$( "#msg_"+buttonId ).css({"display": "inline","background-color": "#87cefa",
+                                           "color": "black","padding": "2px"}) ;
+                if (( \$(this.form).attr("id") == "LC_page" ) && (\$('input[name="all_submit"]').length )) {
+                    if (buttonId != "all_submit") {
+                        \$( ".LC_status_"+buttonId ).hide();
+                    }
+                    if (( "#"+buttonId+"_pressed" ).length) {
+                        \$( "#"+buttonId+"_pressed" ).val( "1" );
+                    }
+                } else {
+                    \$( ".LC_status_"+buttonId ).hide();
+                }
+                \$(this.form).submit();
+                \$( ".LC_hwk_submit" ).prop( "disabled", true);
+                \$( ".LC_textline" ).prop( "readonly", "readonly");
+                event.preventDefault();
+
+                if (timeout > 0) {
+                    setTimeout(function(){
+                                       \$( "#msg_"+buttonId ).css({"display": "none"});
+                                       if (( \$(this.form).attr("id") == "LC_page" ) && (\$('input[name="all_submit"]').length )) {
+                                           if (( "#"+buttonId+"_pressed" ).length) {
+                                               \$( "#"+buttonId+"_pressed" ).val( "" );
+                                           }
+                                       }
+                                       \$( ".LC_hwk_submit" ).prop( "disabled", false);
+                                       \$( ".LC_textline" ).prop( "readonly", false);
+                                       submithandled = 0;
+                                       keypresshandled = 0;
+                                     }, timeout);
+                }
+                return true;
+            }
+        }
+    });
+  }
+});
+
+// ]]>
+</script>
+JS
+}
+
+sub setmode_javascript {
+    return <<"ENDSCRIPT";
+<script type="text/javascript">
+// <![CDATA[
+function setmode(form,probmode) {
+    var initial = form.problemmode.value;
+    form.problemmode.value = probmode;
+    form.submit();
+    form.problemmode.value = initial;
+}
+// ]]>
+</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') {
@@ -77,106 +434,308 @@ 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).
-	    &Apache::lonhtmlcommon::htmlareaheaders().
-	    &Apache::lonhtmlcommon::spellheader().
-	    &Apache::lonxml::fontsettings();     
-    }
-    my $body_tag_start;
-    if (!defined($found{'body'}) && $env{'request.state'} eq 'construct'
-	&& $env{'environment.remote'} eq 'off') {
-	$body_tag_start=&Apache::loncommon::bodytag();
-	$body_tag_start.=&Apache::lonxml::message_location();
+    if ($target eq 'tex') {
+	return
+	    &Apache::londefdef::start_html($target,$token,$tagstack,
+					   $parstack,$parser,$safeeval);
+    }
+
+    $extra_head .= &homework_js().
+                   &Apache::lonhtmlcommon::dragmath_js("EditMathPopup");
+    if (&Apache::lonhtmlcommon::htmlareabrowser()) {
+        my %textarea_args;
+        if (($env{'request.state'} ne 'construct') ||
+            ($env{'environment.nocodemirror'})) {
+            %textarea_args = (
+                                dragmath => 'math',
+                              );
+        }
+        $extra_head .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args);
+    }
+    my $is_task = ($env{'request.uri'} =~ /\.task$/);
+    my ($needs_upload,$partlist);
+    my ($symb)= &Apache::lonnet::whichuser();
+    my ($map,$resid,$resurl)=&Apache::lonnet::decode_symb($symb);
+    if ($is_task) {
+        $extra_head .= &Apache::lonhtmlcommon::file_submissionchk_js();
+    } else {
+        if (&Apache::lonnet::EXT("resource.$Apache::inputtags::part.uploadedfiletypes") ne '') {
+            unless ($env{'request.state'} eq 'construct') {
+                my $navmap = Apache::lonnavmaps::navmap->new();
+                if (ref($navmap)) {
+                    my $mapres = $navmap->getResourceByUrl($map);
+                    my $is_page;
+                    if (ref($mapres)) {
+                        $is_page = $mapres->is_page();
+                    }
+                    unless ($is_page) {
+                        $needs_upload = 1;
+                    }
+                    if ((ref($tagstack) eq 'ARRAY') && ($tagstack->[-1] eq 'problem')) {
+                        my $res = $navmap->getBySymb($symb);
+                        if (ref($res)) {
+                            $partlist = $res->parts();
+                        }
+                    }
+                }
+            }
+        } else {
+            unless ($env{'request.state'} eq 'construct') {
+                my $navmap = Apache::lonnavmaps::navmap->new();
+                if (ref($navmap)) {
+                    my $mapres = $navmap->getResourceByUrl($map);
+                    my $is_page;
+                    if (ref($mapres)) {
+                        $is_page = $mapres->is_page();
+                    }
+                    if ($is_page) {
+                        if ((ref($tagstack) eq 'ARRAY') && ($tagstack->[-1] eq 'problem')) {
+                            my $res = $navmap->getBySymb($symb);
+                            if (ref($res)) {
+                                $partlist = $res->parts();
+                            }
+                        }
+                    } else {
+                        my $res = $navmap->getBySymb($symb);
+                        if (ref($res)) {
+                            $partlist = $res->parts();
+                            if (ref($partlist) eq 'ARRAY') {
+                                foreach my $part (@{$partlist}) {
+                                    my @types = $res->responseType($part);
+                                    my @ids = $res->responseIds($part);
+                                    for (my $i=0; $i < scalar(@ids); $i++) {
+                                        if ($types[$i] eq 'essay') {
+                                            my $partid = $part.'_'.$ids[$i];
+                                            if (&Apache::lonnet::EXT("resource.$partid.uploadedfiletypes") ne '') {
+                                                $needs_upload = 1;
+                                                last;
+                                            }
+                                        }
+                                    }
+                                }
+                            } 
+                        }
+                    }
+                }
+            }
+        }
+        if ($needs_upload) {
+            $extra_head .= &Apache::lonhtmlcommon::file_submissionchk_js()
+                            .'<script type="text/javascript" 
+                                src="/res/adm/includes/file_upload.js"></script>';
+        }
+    }
+
+    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 ($target eq 'edit') {
+                $extra_head .= &Apache::edit::js_update_linknum();
+            }
+	}
+    }
+
+    my $pageheader = '';
+    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') {
+            unless ($env{'form.inhibitmenu'} eq 'yes') {
+                # Breadcrumbs for Authoring Space
+                &Apache::lonhtmlcommon::clear_breadcrumbs();
+                &Apache::lonhtmlcommon::add_breadcrumb({
+                    'text'  => 'Authoring Space',
+                    'href'  => &Apache::loncommon::authorspace($env{'request.uri'}),
+                });
+                # breadcrumbs (and tools) will be created 
+                # in start_page->bodytag->innerregister
+
+# FIXME Where are we?
+#                &Apache::lonhtmlcommon::add_breadcrumb({
+#                    'text'  => 'Problem Editing', # 'Problem Testing'
+#                    'href'  => '',
+#               });
+                $pageheader = &Apache::loncommon::head_subbox(
+                                 &Apache::loncommon::CSTR_pageheader());
+	    }
+        }
     } elsif (!defined($found{'body'})) {
-	$body_tag_start='<body onload="'.&Apache::lonmenu::loadevents().'" '.
-	    'onunload="'.&Apache::lonmenu::unloadevents().'" ';
+	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 ($env{'browser.fontenhance'} eq 'on') {
-	    $body_tag_start.=' style="font-size: x-large;" ';
-	}
-	$body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1);
-	if ($env{'environment.texengine'} eq 'jsMath') {
-	    $body_tag_start.='<script type="text/javascript">
-                     function NoFontMessage () {}
-                   </script>'."\n".
-		       '<script src="/adm/jsMath/jsMath.js"></script>'."\n";
-	}
-	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=&mt("Browsing resource, all submissions are temporary.")."<br />";
-		$body_tag_start.=$help;
-	    }
+	if ($background ne '' ) {
+	    $add_entries{'background'} = $background;
 	}
-	$body_tag_start.=&Apache::lonxml::message_location();
+
+	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{'request.state'} eq   'construct') {
+            $body_args{'only_body'}  = 1;
+        } elsif ($target eq 'web') {
+            $body_args{'print_suppress'} = 1;
+        }
+    }
+    $body_args{'no_auto_mt_title'} = 1;
+    my $page_start = &Apache::loncommon::start_page($name,$extra_head,
+						    \%body_args);
+    $page_start .= $pageheader;
+    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) {
+            $page_start .= '<p class="LC_info">'
+                          .&mt('Browsing resource, all submissions are temporary.')
+                          .'</p>';
+        }
+    }
+
+    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" enctype="multipart/form-data" method="POST" action="';
-	my $uri=$env{'request.uri'};
-	if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
-	$form_tag_start.=$uri.'">';
+	$form_tag_start='<form name="lonhomework" enctype="multipart/form-data" method="post" action="';
+	my $uri = &Apache::loncommon::inhibit_menu_check(
+                &Apache::lonenc::check_encrypt($env{'request.uri'}));
+        $uri = &HTML::Entities::encode($uri,'<>&"');
+	$form_tag_start.=$uri.'" ';
+	if ($target eq 'edit') {
+	    $form_tag_start.=&Apache::edit::form_change_detection();
+	}
+        my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::whichuser();
+        my ($path,$multiresp) = 
+            &Apache::loncommon::get_turnedin_filepath($symb,$uname,$udom);
+        if ($env{'request.user_in_effect'}) {
+            $form_tag_start .= ' onsubmit="preventDefault();"';
+        } elsif (($is_task) || ($needs_upload)) {
+            $form_tag_start .= ' onsubmit="return file_submission_check(this,'."'$path','$multiresp'".');"';
+        }
+	$form_tag_start.='>'."\n";
+
+	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,$partlist);
 }
 
 #use Time::HiRes();
 sub get_resource_name {
     my ($parstack,$safeeval)=@_;
+    my $name;
     if (defined($Apache::lonhomework::name)) {
-	return $Apache::lonhomework::name;
-    }
-    my ($symb)=&Apache::lonxml::whichuser();
-    my $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-;
+	$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 '' ||
-          $Apache::lonhomework::history{'resource.CODE'}) {
+    my ($safeeval,$target,$probpartlist,$prevparttype)=@_;
+    my ($symb)=&Apache::lonnet::whichuser();
+    my ($questiontype,$set_safespace,$rndseed,$numtries,$reqtries);
+    if ($target eq 'analyze') {
+        $questiontype = $env{'form.grade_questiontype'};
+    }
+    unless (defined($questiontype)) {
+        $questiontype = $Apache::lonhomework::type;
+    }
+    if ($Apache::lonhomework::type eq 'randomizetry') {
+        my $partfortries = $Apache::inputtags::part;
+#
+# Where question type is "randomizetry" for a problem containing
+# a single part (and unless type is explicitly set to not be
+# "randomizetry" for that part), the number of tries used to
+# determine randomization will be for that part, and randomization
+# from calls to &random() in a perl script block before the part tag,
+# will change based on the number of tries, and value of the
+# "randomizeontries" parameter in effect for the single part.
+#
+        if (ref($probpartlist) eq 'ARRAY') {
+            if ((@{$probpartlist} == 1) && ($probpartlist->[0] ne $partfortries)) {
+                if (&Apache::lonnet::EXT('resource.'.$probpartlist->[0].'.type') eq 'randomizetry') {
+                    $partfortries = $probpartlist->[0];
+                } else {
+                    $partfortries = '';
+                }
+            }
+        }
+        if ($partfortries ne '') {
+            $numtries = $Apache::lonhomework::history{"resource.$partfortries.tries"};
+            $reqtries = &Apache::lonnet::EXT("resource.$partfortries.randomizeontries");
+        }
+    }
+    if (($env{'request.state'} eq "construct")
+        || ($symb eq '')
+        || ($Apache::lonhomework::type eq 'practice')
+        || ($Apache::lonhomework::history{'resource.CODE'})
+        || (($env{'form.code_for_randomlist'}) && ($target eq 'analyze'))) {
+	&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;
+            unless ($env{'form.code_for_randomlist'}) {
+                $env{'form.rndseed'}=$rndseed;
+            }
 	}
-	if ($env{'form.resetdata'} eq &mt('New Problem Variation') ||
+        if ((($env{'request.state'} eq "construct") || ($symb eq '')) && 
+            ($Apache::lonhomework::type eq 'randomizetry')) {
+            if ($numtries) {
+                if (($reqtries =~ /^\d+$/) && ($reqtries > 1)) {
+                    my $inc = int($numtries/$reqtries);
+                    $rndseed += $inc;
+                } else {
+                    $rndseed += $numtries;
+                }
+            }
+            $env{'form.'.$Apache::inputtags::part.'.rndseed'}=$rndseed;
+        }
+	if ( ($env{'form.resetdata'} eq 'new_problem_variation'
+	      && $env{'form.submitted'} eq 'yes')  ||
 	    $env{'form.newrandomization'} eq &mt('New Randomization')) {
 	    srand(time);
 	    $rndseed=int(rand(2100000000));
@@ -184,16 +743,69 @@ sub setup_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=~s/\,/\:/g;
+        $rndseed=~s/[^\w\d\:\-]//g;
+	if (defined($rndseed)) {
+            my ($c1,$c2)=split(/\:/,$rndseed);
+            unless ($c2) { $c2=0; }
+            unless (($c1==int($c1)) && ($c2==int($c2))) {
+	       $rndseed=join(':',&Apache::lonnet::digest($rndseed));
+            }
         }
-        if ($Apache::lonhomework::history{'resource.CODE'}) {
+        if (($env{'form.code_for_randomlist'}) && ($target eq 'analyze')) {
+            $env{'form.CODE'} = $env{'form.code_for_randomlist'};
+            $rndseed=&Apache::lonnet::rndseed();
+            undef($env{'form.CODE'});
+        } elsif ($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);
-	}
+        $set_safespace = 1;
+    } elsif ($questiontype eq 'randomizetry') {
+        if ($target eq 'analyze') {
+            if (defined($env{'form.grade_rndseed'})) {
+                $rndseed = $env{'form.grade_rndseed'};
+            }
+        }
+        unless (($target eq 'analyze') && (defined($rndseed))) {
+            $rndseed=&Apache::lonnet::rndseed();
+            my $curr_try = $numtries;
+            if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+                $curr_try ++;
+            }
+            if ($rndseed =~/^(\d+)[,:](\d+)$/) {
+                $rndseed = $1;
+            }
+            if ($curr_try) {
+                if (($reqtries =~ /^\d+$/) && ($reqtries > 1)) {
+                    my $inc = int(($curr_try-1)/$reqtries);
+                    $rndseed += $inc;
+                } else {
+                    $rndseed += $curr_try;
+                }
+            }
+        }
+        $set_safespace = 1;
+        if ($target eq 'grade') {
+            $Apache::lonhomework::rawrndseed = $rndseed;
+        }
+    } elsif ($prevparttype eq 'randomizetry') {
+        if ($env{'form.0.rndseed'} ne '') {
+            $set_safespace = 1;
+            $rndseed = $env{'form.0.rndseed'};
+        }
+    }
+    if ($set_safespace) {
+        if ($safeeval) {
+            &Apache::lonxml::debug("Setting rndseed to $rndseed");
+            &Apache::run::run('$external::randomseed="'.$rndseed.'";',$safeeval);
+            if (($Apache::lonhomework::type eq 'randomizetry') || ($prevparttype eq 'randomizetry')) {
+                &Apache::lonxml::debug("Setting randomizetrypart to $Apache::inputtags::part");
+                &Apache::run::run('$external::randomizetrypart="'.$Apache::inputtags::part.'";',$safeeval);
+            }
+        }
+    }
+    unless (($env{'request.state'} eq "construct") || ($symb eq '')) {
+        $env{'form.'.$Apache::inputtags::part.'.rndseed'}=$rndseed;
     }
     return $rndseed;
 }
@@ -205,25 +817,93 @@ sub remember_problem_state {
        <input type="hidden" name="problemstatus" value="'.$env{'form.problemstatus'}.'" />';
 }
 
+sub problem_edit_action_button {
+    my ($name,$action,$accesskey,$text,$flag)=@_;
+    my $actionscript="setmode(this.form,'$action')";
+    return "\n<input type='button' name='$name' accesskey='$accesskey' value='".&mt($text)."'".
+           ($flag?&Apache::edit::submit_ask_anyway($actionscript):&Apache::edit::submit_dont_ask($actionscript))." />";
+}
+
+sub problem_edit_buttons {
+   my ($mode)=@_;
+# Buttons that save
+   my $result = '<div style="float:right">';
+   if ($mode eq 'editxml') {
+       $result.=&problem_edit_action_button('subsaveedit','saveeditxml','s','Save and EditXML');
+       $result.=&problem_edit_action_button('subsaveview','saveviewxml','v','Save and View');
+   } else {
+       $result.=&problem_edit_action_button('subsaveedit','saveedit','s','Save and Edit');
+       $result.=&problem_edit_action_button('subsaveview','saveview','v','Save and View');
+   }
+   $result.="\n</div>\n";
+# Buttons that do not save
+   $result .= '<div>'.
+              &problem_edit_action_button('subdiscview','discard','d','Discard Edits and View',1);
+   if ($mode eq 'editxml') {
+       $result.=&problem_edit_action_button('subedit','edit','e','Edit',1);
+       $result.=&problem_edit_action_button('subundo','undoxml','u','Undo',1);
+       if ($env{'environment.nocodemirror'}) {
+           $result.=&Apache::lonhtmlcommon::dragmath_button("LC_editxmltext",1);
+       }
+   } else {
+       $result.=&problem_edit_action_button('subeditxml','editxml','x','EditXML',1);
+       $result.=&problem_edit_action_button('subundo','undo','u','Undo',1);
+   }
+   $result.="\n</div>";
+   return $result;
+}
+
 sub problem_edit_header {
-    return '<input type="hidden" name="submitted" value="edit" />'.
-	&Apache::structuretags::remember_problem_state().'
-       <input type="hidden" name="problemmode" value="'.&mt('Edit').'" />
-       <input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" />
-       <input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />
-       <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" /> <hr />
-       <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes and Edit').'" />
-       <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" /><table><tr><td>'.
-       &Apache::loncommon::help_open_menu('','Problem Editing Help','Problem_Editor_XML_Index','',5,'Authoring',undef,undef,undef,'Problem Editing Help')
-       .'</td></tr></table>'.
-       '<table border="0" width="100%"><tr><td bgcolor="#DDDDDD">';
+    my ($mode)=@_;
+    my $return = '<input type="hidden" name="submitted" value="edit" />'.
+	&remember_problem_state('edit').'
+        <div class="LC_edit_problem_header">
+        <div class="LC_edit_problem_header_title">
+        '.&mt('Problem Editing').$mode.&Apache::loncommon::help_open_menu('Problem Editing','Problem_Editor_XML_Index',5,'Authoring').'
+        </div><div class="LC_edit_actionbar" id="actionbar">'.
+        '<input type="hidden" name="problemmode" value="saveedit" />'.
+        &problem_edit_buttons();
+
+    $return .= '</div></div>' . &Apache::lonxml::message_location();
+    $return .= '<link rel="stylesheet" href="/adm/codemirror/codemirror-combined.css" />
+    <script type="text/javascript" src="/adm/codemirror/codemirror-compressed-colorful.js"></script>';
+
+    $return .= '<script type="text/javascript" src="/adm/jQuery/addons/jquery-scrolltofixed.js"></script>
+        <script type="text/javascript">
+            // unless internet explorer
+            if (!(window.navigator.appName == "Microsoft Internet Explorer" && (document.documentMode || document.compatMode))){
+                $(document).ready(
+                    function() {
+                        $(\'.LC_edit_actionbar\').scrollToFixed(
+                            {
+                                fixed: function(){
+                                    //$(this).find(\'.LC_edit_actionbar\').css(\'height\', \'31px\');
+                                    $(this).find(\'.LC_edit_actionbar\');
+                                }
+                            }
+                        );
+                    }
+                );
+            }
+        </script>
+        <table id="LC_edit_problem_colorful" border="0" width="100%"><tr><td bgcolor="#F8F8F8">';
+    return $return;
 }
 
 sub problem_edit_footer {
-    return '</td></tr></table><br /><input type="submit" name="submit" value="'.&mt('Submit Changes and Edit').'" />
-    <input type="submit" name="submit" value="'.&mt('Submit Changes and View').'" />'.
-    &Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields).
-    "\n</form>\n".&Apache::loncommon::endbodytag()."\n</html>";
+    my $resource = $env{'request.ambiguous'};
+    return '</td></tr></table><br />
+<div class="LC_edit_problem_footer">
+  <hr />'.
+&problem_edit_buttons().'
+  <hr style="clear:both;" />
+  <script type="text/javascript">
+      restoreState("'.$resource.'");
+      restoreScrollPosition("'.$resource.'");
+  </script>
+</div>
+'.
+    "\n</form>\n".&Apache::loncommon::end_page();
 }
 
 sub option {
@@ -238,23 +918,40 @@ sub option {
 
 sub problem_web_to_edit_header {
     my ($rndseed)=@_;
-    my $result.='<input type="hidden" name="problemmode" value="'.&mt('View').'" />
-             <input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />
-             <input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />
-             <input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" />
-             <input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" />
-             <nobr><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>
-             <label><input type="checkbox" name="showallfoils" ';
-    if (defined($env{'form.showallfoils'})) { $result.='checked="on"'; }
-    $result.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils').
-	&Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems').
-	'</label><hr />';
-    $result.="
-<nobr>
-Problem Status:
+    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('Show All Instances')
+	: &mt('Show All Foils');
+
+    my $show_all= '<span class="LC_nobreak"><label for="showallfoils">'
+                 .'<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>
@@ -263,91 +960,560 @@ Problem Status:
   ".&option('CANNOT_ANSWER_correct','problemstate').&mt("Open and correct")."</option>
   ".&option('SHOW_ANSWER'          ,'problemstate').&mt("Show Answer")."</option>
 </select>
-</nobr>
-<nobr>
-Problem Type:
+</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('exam'   ,'problemtype').&mt("Bubblesheet Exam Problem")."</option>
+  ".&option('problem','problemtype').&mt("Homework Problem")."</option>
   ".&option('survey' ,'problemtype').&mt("Survey Question")."</option>
+  ".&option('surveycred' ,'problemtype').&mt("Survey Question (with credit)")."</option>
+  ".&option('anonsurvey' ,'problemtype').&mt("Anonymous Survey Question")."</option>
+  ".&option('anonsurveycred' ,'problemtype').&mt("Anonymous Survey Question (with credit)")."</option>
+  ".&option('practice' ,'problemtype').&mt("Practice Problem")."</option>
+  ".&option('randomizetry' ,'problemtype').&mt("New Randomization Each Try")."</option>
 </select>
-</nobr>
-<nobr>
-Feedback Mode:
+</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 Feedback")."</option>
+  ".&option('no', 'problemstatus').&mt("Don't Show Incorrect/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>
-</nobr>
-<input type='submit' name='changeproblemmode' value='".&mt("Change")."' />
-<hr />";
-    my $numtoanalyze=$env{'form.numtoanalyze'};
-    if (!$numtoanalyze) { $numtoanalyze=20; }
-    $result.= '<input type="submit" name="problemmode" value='.
-	&mt('"Calculate answers').'" /> for
-             <input type="text" name="numtoanalyze" value="'.
-	     $numtoanalyze.'" size="5" /> '.&mt('versions of this problem').
-	     '.'.&Apache::loncommon::help_open_topic("Analyze_Problem",
-						     '',undef,undef,300).
-						     '<hr />';
+</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').'" />
+     <button type="submit" name="resetdata" accesskey="r" value="reset_submissions">
+     '.&mt('Reset Submissions').'</button>
+   </div>
+   <hr />
+   <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="24" value="'.
+	       $rndseed.'"
+             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>
+   <hr />
+   <div>';
+    $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'".')" />';
+    if ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9) {
+        my $uri = $env{'request.uri'};
+        my $daxeurl = '/daxepage'.$uri;
+        $result .= '<input type="button" value="'.&mt('Edit with Daxe').'" '.
+                  'onclick="window.open(\''.$daxeurl.'\',\'_blank\');" />';
+    }
+    $result.='
+   </div>
+   <hr />
+   '.&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 'reset_submissions' ||
+	    ($env{'form.resetdata'} eq '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);
-	my ($temp)=keys %Apache::lonhomework::history ;
+	    &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 ;
+    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
-# Will increment totals for attempts, students, and corrects
-# if running user has student role.  
+=pod
+
+=item finalize_storage()
+
+	Stores away the result hash to a student's environment;
+	checks form.grade_ for specific values, otherwise stores
+	to the running user's environment.
+
+        &check_correctness_changes() is called in two circumstances
+        in which the results hash is to be stored permanently, for
+        grading triggered by a student's submission, where feedback on
+        correctness is to be provided to the student. 
+
+        1. Immediately prior to storing the results hash
+
+        To handle the case where a student's submission (and award) were 
+        stored after history was retrieved in &initialize_storage(), e.g.,
+        if a student submitted answers in quick succession (e.g., from 
+        multiple tabs).  &Apache::inputtags::hidealldata() is called for
+        any parts with out-of-order storage (i.e., correct then incorrect,
+        where awarded >= 1 when correct).
+
+        2. Immediately after storing the results hash
+
+        To handle the case where lond on the student's homeserver returns
+        delay:N -- where N is the number of transactions between the last
+        retrieved in &initialize_storage() and the last stored immediately
+        before permanent storage of the current transaction via 
+        lond::store_handler().  &Apache::grades::makehidden() is called  
+        for any parts with out-of-order storage (i.e., correct then incorrect,
+        where awarded >= 1 when correct).
+
+	Will call &store_aggregates() to 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 '') {
+    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);
+        my ($passback,$pbscope,$pbmap,$pbsymb,$pbtype,$crsdef,$ltinum,
+            $ltiref,$total,$possible,$dopassback);
+	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 {
+            my ($laststore,$checkedparts,@parts,%postcorrect,%record);
+            if (($env{'user.name'} eq $name) && ($env{'user.domain'} eq $domain) &&
+                (!$Apache::lonhomework::scantronmode) && (!defined($env{'form.grade_symb'})) &&
+                (!defined($env{'form.grade_courseid'}))) {
+                if (($env{'request.lti.login'}) || ($env{'request.deeplink.login'})) {
+                    my ($map)=&Apache::lonnet::decode_symb($symb);
+                    $map = &Apache::lonnet::clutter($map);
+                    if ($env{'request.lti.login'}) {
+                        ($passback,$pbscope,$pbmap,$pbsymb,$ltinum,$ltiref) = 
+                            &needs_lti_passback($courseid,$symb,$map);
+                    } elsif ($env{'request.deeplink.login'}) {
+                        ($passback,$pbscope,$pbmap,$pbsymb,$crsdef,$ltinum,$ltiref) =
+                            &needs_linkprot_passback($courseid,$symb,$map);
+                    }
+                }
+                if ($Apache::lonhomework::history{'version'}) {
+                    $laststore = $Apache::lonhomework::history{'version'}.'='.
+                                 $Apache::lonhomework::history{'timestamp'};
+                } else {
+                    $laststore = '0=0';
+                }
+                %record = &Apache::lonnet::restore($symb,$courseid,$domain,$name);
+                if ($record{'version'}) {
+                    my ($newversion,$oldversion,$oldtimestamp);
+                    if ($Apache::lonhomework::history{'version'}) {
+                        $oldversion = $Apache::lonhomework::history{'version'};
+                        $oldtimestamp = $Apache::lonhomework::history{'timestamp'};
+                    } else {
+                        $oldversion = 0;
+                        $oldtimestamp = 0;
+                    }
+                    if ($record{'version'} > $oldversion) {
+                        if ($record{'timestamp'} >= $oldtimestamp) {
+                            $laststore = $record{'version'}.'='.$record{'timestamp'};
+                            $newversion = $record{'version'} + 1;
+                            $checkedparts = 1;
+                            foreach my $key (keys(%Apache::lonhomework::results)) {
+                                if ($key =~ /^resource\.([^\.]+)\.solved$/) {
+                                    my $part = $1;
+                                    if ($Apache::lonhomework::results{$key} eq 'incorrect_attempted') {
+                                        push(@parts,$part);
+                                    }
+                                }
+                            }
+                            if (@parts) {
+                                my @parts_to_hide = &check_correctness_changes($symb,$courseid,$domain,$name,
+                                                                               \%record,\@parts,$newversion,
+                                                                               $oldversion);
+                                if (@parts_to_hide) {
+                                    foreach my $part (@parts_to_hide) {
+                                        $postcorrect{$part} = 1;
+                                        &Apache::inputtags::hidealldata($part);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
 	    $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,
-					    $symb,$courseid,$domain,$name);
+					    $symb,$courseid,$domain,$name,$laststore);
+            if ($result =~ /^delay\:(\d+)$/) {
+                my $numtrans = $1;
+                my ($oldversion) = split(/=/,$laststore);
+                if ($numtrans) {
+                    my $newversion = $oldversion + 1 + $numtrans;
+                    my @possparts;
+                    if ($checkedparts) {
+                        foreach my $part (@parts) {
+                            unless ($postcorrect{$part}) {
+                                push(@possparts,$part);
+                            }
+                        }
+                    } else {
+                        foreach my $key (keys(%Apache::lonhomework::results)) {
+                            if ($key =~ /^resource\.([^\.]+)\.solved$/) {
+                                my $part = $1;
+                                unless ($postcorrect{$part}) {
+                                    if ($Apache::lonhomework::results{$key} eq 'incorrect_attempted') {
+                                        push(@possparts,$part);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    if (@possparts) {
+                        my %newrecord = &Apache::lonnet::restore($symb,$courseid,$domain,$name);
+                        my @parts_to_hide = &check_correctness_changes($symb,$courseid,$domain,$name,
+                                                                       \%newrecord,\@possparts,$newversion,
+                                                                       $oldversion);
+                        if (@parts_to_hide) {
+                            my $partslist = join(',',@parts_to_hide);
+                            &Apache::grades::makehidden($newversion,$partslist,\%newrecord,$symb,$domain,$name,1);
+                        }
+                    }
+                }
+            }
+            if ($passback) {
+                foreach my $key (keys(%Apache::lonhomework::results)) {
+                    if ($key =~ /^resource\.([^\.]+)\.solved$/) {
+                        my $part = $1;
+                        if ((($Apache::lonhomework::results{$key} =~ /^correct_/) ||
+                            ($Apache::lonhomework::results{$key} eq 'incorrect_attempted')) &&
+                            ($Apache::lonhomework::results{"resource.$part.tries"})) {
+                            $dopassback = 1;
+                            last;
+                        }
+                    }
+                }
+            }
+            if (($dopassback) && ($pbscope eq 'resource') && ($pbsymb eq $symb)) {
+                $total = 0;
+                $possible = 0;
+                my $navmap = Apache::lonnavmaps::navmap->new();
+                if (ref($navmap)) {
+                    my $res = $navmap->getBySymb($symb);
+                    if (ref($res)) {
+                        my $partlist = $res->parts();
+                        if (ref($partlist) eq 'ARRAY') {
+                            foreach my $part (@{$partlist}) {
+                                unless (exists($Apache::lonhomework::results{"resource.$part.solved"})) {
+                                    next if ($Apache::lonhomework::record{"resource.$part.solved"} =~/^excused/);
+                                    my $weight = &Apache::lonnet::EXT("resource.$part.weight",$symb);
+                                    $possible += $weight;
+                                    if (($record{'version'}) && (exists($record{"resource.$part.awarded"}))) {
+                                        my $awarded = $record{"resource.$part.awarded"};
+                                        if ($awarded) {
+                                            $total += $weight * $awarded;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                foreach my $key (keys(%Apache::lonhomework::results)) {
+                    if ($key =~ /^resource\.([^\.]+)\.awarded$/) {
+                        my $part = $1;
+                        my $weight = &Apache::lonnet::EXT("resource.$part.weight",$symb);
+                        $possible += $weight;
+                        my $awarded = $Apache::lonhomework::results{$key};
+                        if ($awarded) {
+                            $total += $weight * $awarded;
+                        }
+                    }
+                }
+            }
 	    &Apache::lonxml::debug('Store return message:'.$result);
-            if ($env{'request.role'} =~/^st/) {
-                &store_aggregates($symb,$courseid);
+            &store_aggregates($symb,$courseid);
+            if ($dopassback) {
+                my $scoreformat = 'decimal';
+                if (($env{'request.lti.login'}) || ($env{'request.deeplink.login'})) {
+                    if (ref($ltiref) eq 'HASH') {
+                        if ($ltiref->{'scoreformat'} =~ /^(decimal|ratio|percentage)$/) {
+                            $scoreformat = $1;
+                        }
+                    }
+                }
+                my ($pbid,$pburl,$pbtype);
+                if ($env{'request.lti.login'}) {
+                    $pbid = $env{'request.lti.passbackid'};
+                    $pburl = $env{'request.lti.passbackurl'};
+                    $pbtype = 'lti';
+                } elsif ($env{'request.deeplink.login'}) {
+                    $pbid = $env{'request.linkprotpbid'};
+                    $pburl = $env{'request.linkprotpburl'};
+                    $pbtype = 'linkprot';
+                }
+                my $ltigrade = {
+                                 'ltinum'   => $ltinum,
+                                 'lti'      => $ltiref,
+                                 'crsdef'   => $crsdef,
+                                 'cid'      => $courseid,
+                                 'uname'    => $env{'user.name'},
+                                 'udom'     => $env{'user.domain'},
+                                 'pbid'     => $pbid,
+                                 'pburl'    => $pburl,
+                                 'pbtype'   => $pbtype,
+                                 'scope'    => $pbscope,
+                                 'pbmap'    => $pbmap,
+                                 'pbsymb'   => $pbsymb,
+                                 'format'   => $scoreformat,
+                               };
+                if ($pbscope eq 'resource') {
+                    $ltigrade->{'total'} = $total;
+                    $ltigrade->{'possible'} = $possible;
+                }
+                push(@Apache::lonhomework::ltipassback,$ltigrade);
             }
 	}
+    } else {
+	&Apache::lonxml::debug('Nothing to store');
     }
     return $result;
 }
 
-# -------------------------------------------------------------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.
+sub needs_lti_passback {
+    my ($courseid,$symb,$map) = @_;
+    if (($env{'request.lti.passbackid'}) && ($env{'request.lti.passbackurl'})) {
+        if ($courseid =~ /^($LONCAPA::match_domain)_($LONCAPA::match_courseid)$/) {
+            my ($cdom,$cnum) = ($1,$2);
+            my %lti = &Apache::lonnet::get_domain_lti($cdom,'provider');
+            if (ref($lti{$env{'request.lti.login'}}) eq 'HASH') {
+                if ($lti{$env{'request.lti.login'}}{'passback'}) {
+                    my $itemnum = $env{'request.lti.login'};
+                    my ($ltiscope,$ltiuri,$ltisymb) =
+                        &LONCAPA::ltiutils::lti_provider_scope($env{'request.lti.uri'},
+                                                               $cdom,$cnum,1);
+                    my ($passback,$ltimap);
+                    if ($ltiscope eq 'resource') {
+                        if ($ltisymb eq $symb) {
+                            $passback = 1;
+                        }
+                    } elsif ($ltiscope eq 'map') {
+                        if ($ltiuri eq $map) {
+                            $passback = 1;
+                            $ltimap = $map;
+                        }
+                    } elsif ($ltiscope eq 'course') {
+                        if (($env{'request.lti.uri'} eq "/$cdom/$cnum") || ($env{'request.lti.uri'} eq '')) {
+                            $passback = 1;
+                        }
+                    }
+                    return ($passback,$ltiscope,$ltimap,$ltisymb,$itemnum,$lti{$itemnum});
+                }
+            }
+        }
+    }
+    return;
+}
+
+sub needs_linkprot_passback {
+    my ($courseid,$symb,$map) = @_;
+    if (($env{'request.linkprotpbid'}) && ($env{'request.linkprotpburl'})) {
+        if ($courseid =~ /^($LONCAPA::match_domain)_($LONCAPA::match_courseid)$/) {
+            my ($cdom,$cnum) = ($1,$2);
+            my ($deeplink_symb,$deeplink_map,$deeplink,$passback);
+            $deeplink_symb = &Apache::loncommon::deeplink_login_symb($cnum,$cdom);
+            if ($deeplink_symb) {
+                if ($deeplink_symb =~ /\.(page|sequence)$/) {
+                    $deeplink_map = &Apache::lonnet::deversion((&Apache::lonnet::decode_symb($deeplink_symb))[2]);
+                    my $navmap = Apache::lonnavmaps::navmap->new();
+                    if (ref($navmap)) {
+                        $deeplink = $navmap->get_mapparam(undef,$deeplink_map,'0.deeplink');
+                    }
+                } else {
+                    $deeplink = &Apache::lonnet::EXT('resource.0.deeplink',$deeplink_symb);
+                    $deeplink_map = &Apache::lonnet::deversion((&Apache::lonnet::decode_symb($deeplink_symb))[0]);
+                }
+                if (($deeplink ne '') && ($env{'request.linkprot'} ne '')) {
+                    my ($itemid,$tinyurl) = split(/:/,$env{'request.linkprot'});
+                    if ($itemid =~ /^(\d+)(c|d)$/) {
+                        my ($itemnum,$itemtype) = ($1,$2);
+                        my ($crsdef,$lti_in_use);
+                        if ($itemtype eq 'c') {
+                            $crsdef = 1;
+                            my %crslti = &Apache::lonnet::get_course_lti($cnum,$cdom,'provider');
+                            $lti_in_use = $crslti{$itemnum};
+                        } else {
+                            my %domlti = &Apache::lonnet::get_domain_lti($cdom,'linkprot');
+                            $lti_in_use = $domlti{$itemnum};
+                        }
+                        my ($state,$others,$listed,$scope,$protect,$display,$target,$exit) = split(/,/,$deeplink);
+                        my $passback;
+                        if ($scope eq 'resource') {
+                            if ($deeplink_symb eq $symb) {
+                                $passback = 1;
+                            }
+                        } elsif ($scope eq 'map') {
+                            if (&Apache::lonnet::clutter($deeplink_map) eq $map) {
+                                $passback = 1;
+                            }
+                        } elsif ($scope eq 'recurse') {
+#FIXME check if $deeplink_map contains $map
+                            $passback = 1;
+                        }
+                        return ($passback,$scope,$deeplink_map,$deeplink_symb,$crsdef,$itemnum,$lti_in_use);
+                    }
+                }
+            }
+        }
+    }
+}
+
+=pod
+
+=item check_correctness_changes()
+
+        For all parts for which current results contain a solved status
+        of "incorrect_attempted", check if there was a transaction in which  
+        solved was set to "correct_by_student" in the time since the last 
+        transaction (retrieved when &initialize_storage() was called i.e., 
+        when &start_problem() was called), unless:
+        (a) questiontype parameter is set to survey or anonymous survey (+/- credit)
+        (b) problemstatus is set to no or no_feedback_ever
+        If such a transaction exists, and did not occur after "reset status" 
+        by a user with grading privileges, then the current transaction is an
+        example of an out-of-order transaction (i.e., incorrect occurring after
+        correct).  Accordingly, the current transaction should be hidden.
+
+=cut
+
+
+sub check_correctness_changes {
+    my ($symb,$courseid,$domain,$name,$record,$parts,$newversion,$oldversion) = @_;
+    my @parts_to_hide;
+    unless ((ref($record) eq 'HASH') && (ref($parts) eq 'ARRAY')) {
+        return @parts_to_hide;
+    }
+    if (@{$parts}) {
+        my $usec;
+        if (($env{'user.name'} eq $name) && ($env{'user.domain'} eq $domain) &&
+            ($env{'request.course.id'} eq $courseid)) {
+            $usec = $env{'request.course.sec'};
+        } else {
+            $usec = &Apache::lonnet::getsection($domain,$name,$courseid);
+        }
+        foreach my $id (@{$parts}) {
+            next if (($Apache::lonhomework::results{'resource.'.$id.'.type'} =~ /survey/) ||
+                     (&Apache::lonnet::EXT("resource.$id.problemstatus",$symb,
+                                           $domain,$name,$usec,undef,$courseid) =~ /^no/));
+            my $reset;
+            for (my $i=$newversion-1; $i>=$oldversion; $i--) {
+                if (($record->{$i.':resource.'.$id.'.regrader'}) &&
+                    ($record->{$i.':resource.'.$id.'.tries'} eq '') &&
+                    ($record->{$i.':resource.'.$id.'.award'} eq '')) {
+                    $reset = 1;
+                } elsif (($record->{$i.":resource.$id.solved"} eq 'correct_by_student') &&
+                         ($record->{$i.":resource.$id.awarded"} >= 1)) {
+                    unless ($reset) {
+                        push(@parts_to_hide,$id);
+                        last;
+                    }
+                }
+            }
+        }
+    }
+    return @parts_to_hide;
+}
+
+=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 (%aggregate,%anoncounter,%randtrycounter);
     my @parts;
     my $cdomain = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $cname = $env{'course.'.$env{'request.course.id'}.'.num'};
@@ -357,19 +1523,161 @@ sub store_aggregates {
         }
     }
     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 ($env{'request.role'} =~/^st/) {
+            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 ($Apache::lonhomework::results{'resource.'.$part.'.tries'} == 1) {
-            $aggregate{$symb."\0".$part."\0users"} = 1;
+        if (($Apache::lonhomework::results{'resource.'.$part.'.type'} eq 'anonsurvey') || 
+            ($Apache::lonhomework::results{'resource.'.$part.'.type'} eq 'anonsurveycred') ||
+            ($Apache::lonhomework::results{'resource.'.$part.'.type'} eq 'randomizetry')) {
+            if ($Apache::lonhomework::results{'resource.'.$part.'.type'} eq 'randomizetry') {
+                $randtrycounter{$symb."\0".$part} = 1;
+            } else {
+                $anoncounter{$symb."\0".$part} = 1;
+            }
+            my $needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$Apache::lonhomework::results{'resource.'.$part.'.type'}.'::'};
+            if ($needsrelease) {
+                my $curr_required = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'};
+                if ($curr_required eq '') {
+                    &Apache::lonnet::update_released_required($needsrelease);
+                } else {
+                    my ($currmajor,$currminor) = split(/\./,$curr_required);
+                    my ($needsmajor,$needsminor) = split(/\./,$needsrelease);
+                    if (($currmajor < $needsmajor) || ($currmajor == $needsmajor && $currminor < $needsminor)) {
+                        &Apache::lonnet::update_released_required($needsrelease);
+                    }
+                }
+            }
         }
-        $aggregate{$symb."\0".$part."\0attempts"} = 1;
     }
-    &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
-			  $cdomain,$cname); 
+    if (keys(%aggregate) > 0) {
+	&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
+                            $cdomain,$cname);
+    }
+    if (keys(%anoncounter) > 0) {
+        &Apache::lonnet::cput('nohist_anonsurveys',\%anoncounter,
+                              $cdomain,$cname);
+    }
+    if (keys(%randtrycounter) > 0) {
+        &Apache::lonnet::cput('nohist_randomizetry',\%randtrycounter,
+                              $cdomain,$cname);
+    }
+}
+
+sub access_status_msg {
+    my ($mode,$status,$symb,$target,$ipused,$accessmsg) = @_;
+    my $msg;
+    if ($target eq 'web') {
+        if ($status eq 'UNAVAILABLE') {
+            $msg.='<p class="LC_error">'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</p>';
+        } elsif ($status eq 'NOT_IN_A_SLOT') {
+            $msg.='<p class="LC_warning">'.&mt('You are not currently signed up to work at this time and/or place.').'</p>';
+        } elsif (($status eq 'RESERVABLE') || ($status eq 'RESERVABLE_LATER') ||
+                 ($status eq 'NOTRESERVABLE')) {
+            $msg.='<p class="LC_warning">'.&mt('Access requires reservation to work at specific time/place.').'</p>';
+        } elsif ($status ne 'NOT_YET_VIEWED') {
+            $msg.='<p class="LC_warning">'.&mt('Not open to be viewed').'</p>';
+        }
+        if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
+            $msg.=&mt('The problem ').$accessmsg;
+        } elsif ($status eq 'UNCHECKEDOUT') {
+            $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");
+        } elsif ($status eq 'RESERVABLE') {
+            $msg.=&mt('Available to make a reservation.').' '.&mt('Reservation window closes [_1].',
+                      &Apache::lonnavmaps::timeToHumanString($accessmsg,'end')).
+                      '<br />'.
+                      &Apache::bridgetask::add_request_another_attempt_button("Sign up for time to work");
+        } elsif ($status eq 'RESERVABLE_LATER') {
+            $msg.=&mt('Window to make a reservation will open [_1].',
+                      &Apache::lonnavmaps::timeToHumanString($accessmsg,'start'));
+        } elsif ($status eq 'NOTRESERVABLE') {
+            $msg.=&mt('Not available to make a reservation.');
+        } elsif ($status eq 'NEED_DIFFERENT_IP') {
+            if ($ipused) {
+                $msg.=&mt('You must use the same computer ([_1]) you used when you first accessed this resource using your time/place-based reservation.',"IP: $ipused");
+            } else {
+                $msg.=&mt('Each student must use a different computer to access this resource at this time and/or place.').'<br />'.
+                      &mt('Somebody else has already used this particular computer for that purpose.');
+            }
+        }
+        $msg.='<br />';
+    } elsif ($target eq 'tex') {
+        my $startminipage = ($env{'form.problem_split'}=~/yes/i)? ''
+                             : '\begin{minipage}{\textwidth}';
+
+        $msg ='\noindent \vskip 1 mm '.
+              $startminipage.'\vskip 0 mm';
+        if ($status eq 'UNAVAILABLE') {
+            $msg.=&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'\vskip 0 mm ';
+        } else {
+            $msg.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm ";
+        }
+    }
+    return $msg;
+}
+
+sub checkin_prompt {
+    my ($target,$slot_name,$slot,$type) = @_;
+    my $result; 
+    if ($target eq 'web') {
+        $result = &Apache::bridgetask::proctor_validation_screen($slot);
+    } elsif ($target eq 'grade') {
+        if (!&Apache::bridgetask::proctor_check_auth($slot_name,$slot,$type)) {
+            $result = &mt('An error occurred during check-in');
+        }
+    }
+    return $result;
+}
+
+sub selfcheckin_resource {
+    my ($resource_due,$slot_name,$slot,$symb) = @_;
+    if ($slot_name ne '') {
+        my $checked_in =
+            $Apache::lonhomework::history{'resource.0.checkedin'};
+        if ($checked_in eq '') {
+            # unproctored slot access, self checkin
+            my $needsiptied;
+            if (ref($slot)) {
+                $needsiptied = $slot->{'iptied'};
+            }
+            my $check = &Apache::bridgetask::check_in('problem',undef,undef,
+                                                      $slot_name,$needsiptied);
+            if ($check =~ /^error: /) {
+                &Apache::lonnet::logthis("Error during self-checkin of problem (symb: $symb) using slot: $slot_name");
+            } else {
+                $checked_in = $Apache::lonhomework::results{"resource.0.checkedin"};
+            }
+        }
+        if ((ref($slot) eq 'HASH') && ($checked_in ne '')) {
+            if ($slot->{'starttime'} < time()) {
+                if (!$resource_due) {
+                    $resource_due = $slot->{'endtime'};
+                } elsif ($slot->{'endtime'} < $resource_due) {
+                    $resource_due = $slot->{'endtime'};
+                }
+            }
+        }
+    }
+    return $resource_due;
 }
 
 sub checkout_msg {
@@ -377,60 +1685,96 @@ sub checkout_msg {
 		'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?');
+                'checkout'=>'Check out Bubblesheet Exam for Viewing',
+		'checkout?'=>'Check out Bubblesheet Exam?');
+    my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
     return (<<ENDCHECKOUT);
 <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'}">
+<p class="LC_warning">$lt{'warning'}</p>
+<form name="checkout" method="post" action="$uri">
 <input type="hidden" name="doescheckout" value="yes" />
-<input type="button" name="checkoutbutton" value="$lt{'checkout'}" onClick="javascript:if (confirm('$lt{'checkout?'}')) { document.checkout.submit(); }" />
+<input type="button" name="checkoutbutton" value="$lt{'checkout'}" onclick="javascript:if (confirm('$lt{'checkout?'}')) { document.checkout.submit(); }" />
 </form>
 ENDCHECKOUT
 }
 
 sub firstaccess_msg {
     my ($time,$symb)=@_;
-    my ($map)=&Apache::lonnet::decode_symb($symb);
-    my $foldertitle=&Apache::lonnet::gettitle($map);
-    &Apache::lonxml::debug("map is $map title is $foldertitle");
-    return (<<ENDCHECKOUT);
-<h2>The resources in "$foldertitle" are open for a limited time. Once you click the 'Show Resource' button below you have $time to complete all resources "$foldertitle".</h2>
-<form name="markaccess" method="POST" action="$env{'request.uri'}">
+    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.',$foldertitle)."</h2>"
+                             .'<p>'.&mt('Once you click the "Show Resource" button below you have [_2] to complete all resources "[_1]".'
+                             ,$foldertitle,$time)."</p>";
+    } 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.',$course)."</h2>"
+                             .'<p>'.&mt('Once you click the "Show Resource" button below you have [_2] to complete all resources "[_1]".'
+                             ,$course,$time)."</p>";
+    } else {
+	my $title=&Apache::lonnet::gettitle($symb);
+        $result .= "<h2>".&mt('This resource "[_1]" is open for a limited time.',$title)."</h2>"
+                             .'<p>'.&mt('Once you click the "Show Resource" button below you have [_2] to complete this resource "[_1]".'
+                             ,$title,$time)."</p>";
+    }
+    my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
+    my $buttontext = &mt('Show Resource');
+    my $timertext = &mt('Start Timer?');
+    my $shownsymb = &HTML::Entities::encode(&Apache::lonenc::check_encrypt($symb),'\'"<>&');
+    $result .= (<<ENDCHECKOUT);
+<form name="markaccess" method="post" action="$uri">
 <input type="hidden" name="markaccess" value="yes" />
-<input type="button" name="accessbutton" value="Show Resource" onClick="javascript:if (confirm('Start Timer?')) { document.markaccess.submit(); }" />
+<input type="hidden" name="symb" value="$shownsymb" />
+<input type="button" name="accessbutton" value="$buttontext" onclick="javascript:if (confirm('$timertext')) { document.markaccess.submit(); }" />
 </form>
 ENDCHECKOUT
+    return $result;
 }
 
 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::problemstatus=&get_problem_status('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::problemstatus='';	
+	&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::functionplotresponse::callscripts=();
     @Apache::inputtags::responselist = ();
     @Apache::inputtags::importlist = ();
     @Apache::inputtags::previous=();
     @Apache::inputtags::previous_version=();
+    $Apache::inputtags::leniency='';
     $Apache::structuretags::printanswer='No';
     @Apache::structuretags::whileconds=();
     @Apache::structuretags::whilebody=();
     @Apache::structuretags::whileline=();
     $Apache::lonhomework::scantronmode=0;
+    $Apache::lonhomework::randomizetrypart=0;
     undef($Apache::lonhomework::name);
-
+    undef($Apache::lonhomework::default_type);
+    undef($Apache::lonhomework::type);
 }
 
 sub reset_problem_globals {
@@ -438,10 +1782,23 @@ sub reset_problem_globals {
     undef(%Apache::lonhomework::history);
     undef(%Apache::lonhomework::results);
     undef($Apache::inputtags::part);
+    undef($Apache::inputtags::leniency);
+    if ($type eq 'Task') {
+        undef($Apache::inputtags::slot_name);
+    } elsif ($type eq 'problem') {
+        undef($Apache::lonhomework::rawrndseed);
+    }
 #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::inputtags::randomizetrypart);
+    undef($Apache::lonhomework::ignore_response_errors);
+    undef(@Apache::functionplotresponse::callscripts);
+    &Apache::lonhomework::reset_show_problem_status();
 }
 
 sub set_problem_state {
@@ -467,12 +1824,20 @@ sub get_problem_status {
 }
 
 sub start_problem {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+
+    # 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);
+	#my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,$style);
 	return '';
     }
 
@@ -483,18 +1848,14 @@ sub start_problem {
 	$Apache::lonhomework::scantronmode=1;
     }
 
-    &initialize_storage();
     if ($target ne 'analyze') {
-	if ($target eq 'web') {
-	    &Apache::lonhomework::showhash(%Apache::lonhomework::history);
-	}
-       	if ($env{'request.state'} eq 'construct') { &set_problem_state('0'); }
-	$Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
+        my $type = &Apache::lonnet::EXT('resource.0.type');
+	$Apache::lonhomework::type=$type;
 	if (($env{'request.state'} eq 'construct') &&
-	    defined($env{'form.problemtype'})) {
+	    $env{'form.problemtype'} =~ /\S/) {
 	    $Apache::lonhomework::type=$env{'form.problemtype'};
 	}
-	&Apache::lonxml::debug("Found this to be of type :$Apache::ltonhomework::type:");
+	&Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");
     }
     if ($Apache::lonhomework::type eq '' ) {
 	my $uri=$env{'request.uri'};
@@ -506,6 +1867,18 @@ 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.'\';';
@@ -513,94 +1886,193 @@ sub start_problem {
     &Apache::run::run($expression,$safeeval);
     my $status;
     my $accessmsg;
+    my $resource_due;
+    my $ipused;
+
+    my $name= &get_resource_name($parstack,$safeeval);
+    my ($result,$form_tag_start,$slot_name,$slot,$probpartlist,$firstaccres);
+
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+        $target eq 'tex') {
+        if ($env{'form.markaccess'}) {
+            my @interval=&Apache::lonnet::EXT("resource.0.interval");
+            my ($timelimit) = split(/_/,$interval[0]);
+            my $is_set = &Apache::lonnet::set_first_access($interval[1],$timelimit);
+            unless (($is_set eq 'ok') || ($is_set eq 'already_set')) {
+                $firstaccres = $is_set;
+            }
+        }
+    }
+
+    if ($target eq 'web' || $target eq 'webgrade' || $target eq 'tex'
+	|| $target eq 'edit') {
+	($result,$form_tag_start,$probpartlist) =
+	    &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
+			$name);
+    } elsif ((($target eq 'grade') && ($Apache::lonhomework::type eq 'randomizetry')) ||
+             ($target eq 'answer')) {
+        my ($symb)= &Apache::lonnet::whichuser();
+        if ($symb ne '') {
+            my $navmap = Apache::lonnavmaps::navmap->new();
+            if (ref($navmap)) {
+                my $res = $navmap->getBySymb($symb);
+                if (ref($res)) {
+                    $probpartlist = $res->parts();
+                }
+            }
+        }
+    }
+
+    if (($target eq 'web') && ($env{'request.user_in_effect'})) {
+        &Apache::lonxml::get_all_text("/problem",$parser,$style);
+        return $result;
+    }
+
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+        $target eq 'tex') {
+
+        my ($symb)= &Apache::lonnet::whichuser();
+        ($status,$accessmsg,$slot_name,$slot,$ipused) =
+            &Apache::lonhomework::check_slot_access('0','problem',$symb,$probpartlist);
+        push (@Apache::inputtags::status,$status);
+    }
 
-    #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='';}
 
-    if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval); }
+    if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval,$target); }
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
 	$target eq 'tex') {
-	#handle exam checkout
-	if ($Apache::lonhomework::type eq 'exam') {
-	    my $token=
-		$Apache::lonhomework::history{"resource.0.outtoken"};
-	    if (($env{'form.doescheckout'}) && (!$token)) {
-		$token=&Apache::lonxml::maketoken();
-		$Apache::lonhomework::history{"resource.0.outtoken"}=
-		    $token;
-	    }
-	    $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token);
-	}
-	if ($env{'form.markaccess'}) {
-	    &Apache::lonnet::set_first_access('map');
-	}
+
+        my ($symb) = &Apache::lonnet::whichuser();
 	#handle rand seed in construction space
-	my $rndseed=&setup_rndseed($safeeval);
-	my ($symb)=&Apache::lonxml::whichuser();
-	if ($env{'request.state'} ne "construct" && $symb eq '') {
+        if (($env{'request.state'} eq 'construct') || ($symb eq '')) {
+            my $partorder=&Apache::lonnet::metadata($env{'request.uri'},'partorder');
+            if ($partorder ne '') {
+                @{$probpartlist} = split(/,/,$partorder);
+            }
+        }
+	my $rndseed=&setup_rndseed($safeeval,$target,$probpartlist);
+        if (($target eq 'grade') && &Apache::response::submitted()) {
+            if ($Apache::lonhomework::type eq 'randomizetry') {
+                $Apache::lonhomework::results{'resource.0.rndseed'}=$rndseed;
+            } else {
+                my @parts;
+                if (ref($probpartlist) eq 'ARRAY') {
+                    @parts = @{$probpartlist};
+                }
+                unless (@parts) {
+                    $Apache::lonhomework::results{'resource.0.rndseed'}=$Apache::lonhomework::rawrndseed;
+                }
+            }
+        }
+
+	if ($env{'request.state'} ne "construct" && 
+	    ($symb eq '' || $Apache::lonhomework::type eq 'practice')) {
+            my $rndseedval = $rndseed;
+            if (($symb eq '') && ($Apache::lonhomework::type eq 'randomizetry')) {
+                $rndseedval = $env{'form.rndseed'};
+            }
 	    $form_tag_start.='<input type="hidden" name="rndseed" value="'.
-		$rndseed.'" />'.
-		    '<input type="submit" name="resetdata"
-                             value="'.&mt('New Problem Variation').'" />'.
+		$rndseedval.'" />'.
+		    '<button type="submit" name="resetdata"
+                        value="new_problem_variation">'.&mt('New Problem Variation').'</button>';
+	    if (exists($env{'form.username'})) {
+		$form_tag_start.=
 		    '<input type="hidden" name="username"
                              value="'.$env{'form.username'}.'" />';
-	    if ($env{'user.adv'}) {
-		$form_tag_start.=
-		    ' <input type="checkbox" name="showallfoils" ';
+	    }
+	    if ($env{'request.role.adv'}) {
+		$form_tag_start.= ' <label class="LC_nobreak">'
+                         .'<input type="checkbox" name="showallfoils"';
 		if (defined($env{'form.showallfoils'})) {
-		    $form_tag_start.='checked="on"';
+		    $form_tag_start.=' checked="checked"';
 		}
-		$form_tag_start.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils');
+                $form_tag_start.= ' /> '
+                                 .&mt('Show All 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');
-	push (@Apache::inputtags::status,$status);
+        }
+        if (($env{'request.state'} ne "construct") &&
+            ($Apache::lonhomework::type eq 'randomizetry') &&
+            ($status eq 'CAN_ANSWER') &&
+            ($env{'course.'.$env{'request.course.id'}.'.type'} ne 'Placement') &&
+            (!$env{'request.role.adv'})) {
+# "New Problem Variation Each Try" header suppressed for Placement Tests, unless course personnel. 
+            my @parts;
+            if (ref($probpartlist) eq 'ARRAY') {
+                @parts = @{$probpartlist};
+            }
+            unless (@parts) {
+                my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
+                my $problemstatus = &get_problem_status($Apache::inputtags::part);
+                $form_tag_start.=&randomizetry_problem_header($problemstatus,$reqtries,$symb);
+            }
+        }
+
 	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') ||
-	    ( $status eq 'INVALID_ACCESS')) {
-	    my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
-	    if ( $target eq "web" ) {
-		$result.= $head_tag_start.'</head>';
-		my $msg=$body_tag_start;
-		if ($status eq 'UNAVAILABLE') {
-		    $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
-		} elsif ($status ne 'NOT_YET_VIEWED') {
-		    $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
-		}
-		if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
-		    $msg.='The problem '.$accessmsg;
-		} elsif ($status eq 'UNCHECKEDOUT') {
-		    $msg.=&checkout_msg;
-		} elsif ($status eq 'NOT_YET_VIEWED') {
-		    $msg.=&firstaccess_msg($accessmsg,$symb);
-		}
-		$result.=$msg.'<br />';
-	    } elsif ($target eq 'tex') {
-		$result.='\begin{document}\noindent \vskip 1 mm  \begin{minipage}{\textwidth}\vskip 0 mm';
-		if ($status eq 'UNAVAILABLE') {
-		    $result.=&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'\vskip 0 mm ';
-		} else {
-		    $result.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm ";
-		}
-	    }
+	    ( $status eq 'NOT_IN_A_SLOT') ||
+            ( $status eq 'NOTRESERVABLE') ||
+            ( $status eq 'RESERVABLE') ||
+            ( $status eq 'RESERVABLE_LATER') ||
+	    ( $status eq 'INVALID_ACCESS') ||
+            ( $status eq 'NEED_DIFFERENT_IP')) {
+	    my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,
+						       $style);
+            if (($status eq 'NOT_YET_VIEWED') && ($firstaccres)) {
+                $result .= '<p class="LC_error">'.
+                           &mt('A problem occurred when trying to start the timer.').'</p>';
+            }
+            $result .= &access_status_msg('problem',$status,$symb,$target,$ipused,$accessmsg);
+	} elsif ($status eq 'NEEDS_CHECKIN') {
+	    my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,
+						       $style);
+            $result .= &checkin_prompt($target,$slot_name,$slot,'problem');
 	} elsif ($target eq 'web') {
-	    my $name= &get_resource_name($parstack,$safeeval);
-	    $result.="$head_tag_start<title>$name</title></head>
-              $body_tag_start \n $form_tag_start".	
+	    if ($status eq 'CAN_ANSWER') {
+                $resource_due = &Apache::lonhomework::due_date(0, $env{'request.symb'});
+                if ($slot_name ne '') {
+                    $resource_due = &selfcheckin_resource($resource_due,$slot_name,$slot,
+                                                          $env{'request.symb'});
+                }
+                if ($resource_due) {
+                    my $time_left = $resource_due - time();
+                    if ($resource_due && ($time_left > 0) && ($target eq 'web')) {
+                        $result .= &Apache::lonhtmlcommon::set_due_date($resource_due);
+                    }
+                }
+            }
+	    $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 ($env{'form.inhibitmenu'} eq 'yes') {
+                    # error messages can be useful in any case
+                    $result.= &Apache::lonxml::message_location();
+                } else {
+		    $result.= &problem_web_to_edit_header($env{'form.rndseed'});
+                }
+                if ($Apache::lonhomework::type eq 'practice') {
+                    $result.= '<button type="submit" name="resetdata" '.
+                        'value="new_problem_variation">'.&mt('New Problem Variation').'</button>'.
+                        &practice_problem_header().'<hr />';
+                } elsif ($Apache::lonhomework::type eq 'randomizetry') {
+                    my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
+                    my $problemstatus = &get_problem_status($Apache::inputtags::part);
+                    $result.=&randomizetry_problem_header($problemstatus,$reqtries);
+                }
 	    }
 	    # if we are viewing someone else preserve that info
 	    if (defined $env{'form.grade_symb'}) {
@@ -608,69 +2080,28 @@ sub start_problem {
 		    $result .= '<input type="hidden" name="grade_'.$field.
 			'" value="'.$env{"form.grade_$field"}.'" />'."\n";
 		}
+                foreach my $field ('trial','questiontype') {
+                    if ($env{"form.grade_$field"} ne '') {
+                        $result .= '<input type="hidden" name="grade_'.$field.
+                            '" value="'.$env{"form.grade_$field"}.'" />'."\n";
+                    }
+                }
 	    }
+            if ($env{'form.grade_imsexport'}) {
+                $result = '';
+            }
 	} elsif ($target eq 'tex') {
-	    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; }
-	    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);
-	    }
-	    my @due_file_content = <$temp_file>;
-	    my $due_file_content = $due_file_content[$#due_file_content];
-	    chomp $due_file_content;
-	    my $name_of_resourse= &Apache::lonxml::latex_special_symbols(&get_resource_name($parstack,$safeeval),'header');
-	    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.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';	
-		    } 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.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
-			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.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';	
-		    if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
-		} else {
-		    $result .= '\vskip 1mm \\\\\\\\';
-		}
-	    }
+	    $result .= 'INSERTTEXFRONTMATTERHERE';
+	    $result .= &select_metadata_hyphenation();
 	}
     } 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 = '';
@@ -680,7 +2111,115 @@ 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=' \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$env{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent ';
+	&clear_required_languages();
+	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 $duedate_text = &mt('Due date: [_1]'
+                              ,&Apache::lonlocal::locallocaltime($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{'.$duedate_text.'} '.$toc_line;
+		} else {
+		    $frontmatter.= $begin_doc.$toc_line;
+		    if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { 
+			$frontmatter .= '\fbox{\textit{'.&mt('[quant,_1,pt,pt]',$weight ).'}}';
+		    }
+		}
+	    } else {
+		$frontmatter .= '\vskip 1mm\textit{'.$duedate_text.'} \\\\\\\\'.$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{'.&mt('[quant,_1,pt,pt]',$weight ).'}}';
+		}
+	    } else {
+		$frontmatter .= '\vskip 1mm \\\\\\\\'.$startminipage;
+	    }
+	}
+	$result =~ s/INSERTTEXFRONTMATTERHERE/$frontmatter/;
+    } elsif ($target eq 'web') {
+        if ($env{'request.user_in_effect'}) {
+            &reset_problem_globals('problem');
+            $result .= &Apache::lonhtmlcommon::set_compute_end_time();
+            return $result;
+        }
+    }
+
     my $status=$Apache::inputtags::status['-1'];
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
 	$target eq 'tex') {
@@ -688,13 +2227,16 @@ sub end_problem {
 	    # if part is zero, no <part>s existed, so we need to the grading
 	    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 'NOT_YET_VIEWED') {
+		  $status ne 'UNCHECKEDOUT' && $status ne 'NOT_YET_VIEWED'
+                  && !$env{'form.grade_imsexport'}) {
 	    # 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);
@@ -704,13 +2246,51 @@ sub end_problem {
 	    (($target eq 'web') && ($env{'request.state'} ne 'construct')) ||
 	    ($target eq 'answer') || ($target eq 'tex')
 	   ) {
-	    if ($target ne 'tex' &&
-		$env{'form.answer_output_mode'} ne 'tex') {
+	    if (($target ne 'tex') &&
+		($env{'form.answer_output_mode'} ne 'tex') && 
+                (!$env{'form.grade_imsexport'})) {
 		$result.="</form>";
-		$result.=&Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields);
 	    }
 	    if ($target eq 'web') {
-		$result.=&Apache::lonxml::xmlend().'</html>';
+                #
+                # Closing </body></html> not added by end_page().
+                # Added separately at end of this routine, after added
+                # <script></script> so document will be valid xhtml.
+                #
+                my $showdisc = 1;
+                if (($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') &&
+                    (!$env{'request.role.adv'})) { 
+# For Placement Tests footer with "Post Discussion" and "Send Feedback" links is suppressed.
+                    $showdisc = 0;
+                    my ($symb)= &Apache::lonnet::whichuser();
+                    if ($symb) {
+                        my $navmap = Apache::lonnavmaps::navmap->new();
+                        if (ref($navmap)) {
+                            my $hastries = &Apache::lonplacementtest::has_tries($symb,$navmap);  
+# For Placement Tests test status is displayed if this is the last resource in the course
+# and there are no tries left
+                            unless ($hastries) {
+                                if (&Apache::lonplacementtest::is_lastres($symb,$navmap)) {
+                                    my ($score,$incomplete) = 
+                                        &Apache::lonplacementtest::check_completion(undef,undef,1);
+                                    if (!$incomplete) {
+                                        $result .= &Apache::lonplacementtest::showresult(1,1);
+                                    } elsif ($incomplete < 100) { 
+                                        $result.= &Apache::lonplacementtest::showincomplete($incomplete,1);
+                                    }
+                                } else {
+# For Placement Tests score is displayed if test has just been completed
+                                    my ($score,$incomplete) = &Apache::lonplacementtest::check_completion(undef,undef,1);
+                                    if (!$incomplete) {
+                                        $result.= &Apache::lonplacementtest::showresult(1,1);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+		$result.= &Apache::loncommon::end_page({'discussion' => $showdisc,
+							'notbody'    => 1});
 	    } elsif ($target eq 'tex') {
 		my $endminipage = '';
 		if (not $env{'form.problem_split'}=~/yes/) {
@@ -718,24 +2298,44 @@ sub end_problem {
 		}
                 if ($env{'form.print_discussions'} eq 'yes') {
 		    $result.=&Apache::lonxml::xmlend($target,$parser);
-		    $result=~s/<\/html>//;
 		} else {
 		    $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 .= '';
+			$result .= $endminipage;
 		    }
 		}
 	    }
 	}
+        if ($target eq 'web') {
+            $result.=&Apache::functionplotresponse::init_script();
+            if ($Apache::lonhomework::default_type eq 'randomizetry') {
+                my ($symb) = &Apache::lonnet::whichuser();
+                if ((($env{'request.state'} eq 'construct') || ($symb eq '')) &&
+                    ($status eq 'CAN_ANSWER')) {
+                    unless (@Apache::inputtags::partlist > 1) {
+                        $result.= <<"ENDJS";
+<script type="text/javascript">
+// <![CDATA[
+    \$(document).ready(function() {
+         \$('#LC_randomizetry_header').css('display','block');
+    });
+// ]]>
+</script>
+ENDJS
+                    }
+                }
+            }
+        }
 	if ($target eq 'grade') {
 	    &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
+	    $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') {
@@ -743,11 +2343,13 @@ sub end_problem {
 	    @Apache::inputtags::response=();
 	    $result=&Apache::response::mandatory_part_meta;
 	}
-	$result.=&Apache::response::meta_part_order();
+	$result.=&Apache::response::meta_part_order('problem');
 	$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') {
@@ -756,37 +2358,55 @@ sub end_problem {
 
     &reset_problem_globals('problem');
 
+    #
+    # This shouild be just above the return so that the
+    # time put in the javascript is as late as possible in the
+    # computation:
+    #
+    if ($target eq 'web') {
+        $result .= &Apache::lonhtmlcommon::set_compute_end_time();
+        #
+        # Closing tags delayed so any <script></script> tags 
+        # not in head can appear inside body, for valid xhtml.
+        # 
+        $result .= "</body>\n</html>";
+    }
     return $result;
 }
 
 
 sub start_library {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    my ($result,$head_tag_start,$body_tag_start,$form_tag_start);
-    if ($$tagstack[0] eq 'library') {
+    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);
-	my $rndseed=&setup_rndseed($safeeval);
-	$result.="$head_tag_start<title>$name</title></head>
-              $body_tag_start \n $form_tag_start".	
+	($result,$form_tag_start)=
+	    &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
+			$name);
+	my $rndseed=&setup_rndseed($safeeval,$target);
+	$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.= '<button type="submit" name="resetdata" '.
+                'value="new_problem_variation">'.&mt('New Problem Variation').'</button>'.
+                &practice_problem_header().'<hr />';
+        }
     }
     return $result;
 }
@@ -796,32 +2416,40 @@ 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>'.&Apache::loncommon::endbodytag().
-	    &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});
+    } elsif ($target eq 'meta') {
+        $result.=&Apache::response::meta_part_order('library');
+        $result.=&Apache::response::meta_response_order();
+    }
+    if ( $#$tagstack eq 0 && $$tagstack[0] eq 'library') {
+	&reset_problem_globals('library');
     }
-    if ($$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;
 }
 
@@ -834,10 +2462,10 @@ sub start_block {
 
     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 (defined($code)) {
+	if (defined($code) && $code ne '') {
 	    if (!$Apache::lonxml::default_homework_loaded) {
 		&Apache::lonxml::default_homework_load($safeeval);
 	    }
@@ -872,35 +2500,101 @@ sub end_block {
     }
     return $result;
 }
-
+#
+#  <languageblock [include='lang1,lang2...'] [exclude='lang1,lang2...']>
+#  ...
+#  </languageblock>
+#
+#   This declares the intent to provide content that can be rendered in the
+#   set of languages in the include specificatino but not in the exclude
+#   specification.  If a currently preferred language is in the include list
+#   the content in the <languageblock>...</languageblock> is rendered
+#   If the currently preferred language is in the exclude list,
+#   the content in the <languageblock>..></languageblock is not rendered.
+#
+#   Pathalogical case handling:
+#     - Include specified, without the preferred language but exclude  specified
+#       also without the preferred langauge results in rendering the block.
+#     - Exclude specified without include and excluden not containing a 
+#       preferred language renders the block.
+#     - Include and exclude both specifying the preferred language does not
+#       render the block.
+#     - If neither include/exclude is specified, the block gets rendered.
+#
+#  This tag has no effect when target is in {edit, modified}
+#
 sub start_languageblock {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
 
-    my $result;
+    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 $include = $token->[2]->{'include'};
 	my $exclude = $token->[2]->{'exclude'};
-        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 @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'; 
 	}
-	if ( ! $result ) {
+
+        # Now loop over all languages in order of preference
+
+	my $render;
+        foreach my $preferred_language (@preferred_languages) {
+
+	    # If neither include/nor exlude is present the block is going
+	    # to get rendered.
+
+           my $found=0;
+           $render=1;
+
+	   #  If include is specified,  don't render the block
+	   #  unless the preferred language is included in the set.
+
+	   if ($include) {
+              $render=0;
+              foreach my $included_language (split(/\,/,$include)) {
+                 if ($included_language eq $preferred_language) {
+                    $render=1; 
+                    $found=1; 
+		    last;	# Only need to find the first.
+                 }
+              }
+	   }
+           # Do we have an exclude argument?
+	   # If so, and one of the languages matches a preferred language
+	   # inhibit rendering the block.  Note that in the pathalogical case the
+	   # author has specified a preferred language in both the include and exclude
+	   # attribte exclude is preferred.  
+
+           if ($exclude) {
+              $render=1;
+              foreach my $excluded_language (split(/\,/,$exclude)) {
+                 if ($excluded_language eq $preferred_language) {
+                    $render=0;
+                    $found=1;
+		    last;	# Only need to find the first.
+                 }
+              }
+	   }
+           if ($found) { 
+	       last; 		# Done on any match of include or exclude.
+	   }
+        }
+	# If $render not true skip the entire block until </languageblock>
+	#
+
+	if ( ! $render ) {
 	    my $skip=&Apache::lonxml::get_all_text("/languageblock",$parser,
 						   $style);
 	    &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
 	}
-	$result='';
+	# If $render is true, we've not skipped the contents of the <languageglock>
+	# and the normal loncapa processing flow will render it as a matter of course.
+
     } elsif ($target eq 'edit') {
 	$result .=&Apache::edit::tag_start($target,$token);
 	$result .=&Apache::edit::text_arg(&mt('Include Language:'),'include',
@@ -925,15 +2619,155 @@ sub end_languageblock {
     }
     return $result;
 }
+#  languagblock specific tags:
+{
+    # For chunks of a resource that has translations, this hash contains
+    # the translations available indexed by language name.
+    #
+
+    my %available_texts;       
+
+    # <translated> starts a block of a resource that has multiple translations.
+    # See the <lang> tag as well.
+    # When </translated> is encountered if there is a translation for the 
+    # currently preferred language, that is rendered inthe web/tex/webgrade
+    # targets.  Otherwise, the default text is rendered.
+    #
+    # Note that <lang> is only registered for the duration of the 
+    #  <translated>...</translated> block 
+    #
+    # Pathalogical case handling:
+    #   - If there is no <lang> that specifies a 'default' and there is no
+    #     translation that matches a preferred language, nothing is rendered.
+    #   - Nested <translated>...</translated> might be linguistically supported by
+    #     XML due to the stack nature of tag registration(?) however the rendered
+    #     output will be incorrect because there is only one %available_texts
+    #     has and end_translated clears it.
+    #   - Material outside of a <lang>...</lang> block within the
+    #     <translated>...<translated> block won't render either e.g.:
+    #    <translated>
+    #      The following will be in your preferred langauge:
+    #      <lang which='en'>
+    #         This section in english
+    #      </lang>
+    #      <lang which='sgeiso'>
+    #         Hier es ist auf Deutsch.
+    #      </lang>
+    #      <lang which='sfriso'>
+    #         En Francais
+    #      </lang>
+    #    </translated>
+    #
+    #    The introductory text prior to the first <lang> tag is not rendered.
+    #
+    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';
+	    if ($target eq 'tex') {
+		$result = &select_hyphenation($which);
+	    }
+	    $result .= $available_texts{$which};
+	    if ($target eq 'tex') {
+		$result .= &select_metadata_hyphenation(); # Restore original language.
+	    }
+	}
+	undef(%available_texts);
+	&Apache::lonxml::deregister('Apache::structuretags',('lang'));
+	return $result;
+    }
+
+    # <lang [which='language-name'] [other='lang1,lang2...']>  
+    #  Specifies that the block contained within it is a translation 
+    #  for a specific language specified by the 'which' attribute. The
+    #   'other' attribute can be used by itself or in conjunction with
+    #   which to specify this tag _may_ be used as a translation for some
+    #   list of languages. e.g.:  <lang which='senisoUS' other='senisoCA,senisoAU,seniso'>
+    #   specifying that the block provides a translation for US (primary)
+    #   Canadian, Australian and UK Englush.
+    #   
+    # Comment: this seems a bit silly why not just support a list of languages
+    #           e.g. <lang which='l1,l2...'> and ditch the other attribute?
+    #
+    #  Effect:
+    #    The material within the <lang>..</lang> block is stored in the
+    #    specified set of $available_texts hash entries, the appropriate one
+    #    is selected at </translated> time.
+    #
+    #  Pathalogical case handling:
+    #    If a language occurs multiple times within a <translated> block,
+    #    only the last one is rendered e.g.:
+    #
+    #    <translated>
+    #       <lang which='senisoUS', other='senisoCA,senisoAU,seniso'>
+    #          Red green color blindness is quite common affecting about 7.8% of 
+    #          the male population, but onloy about .65% of the female population.
+    #       </lang>
+    #          Red green colour blindness is quite common affecting about 7.8% of 
+    #          the male population, but onloy about .65% of the female population.
+    #       <lang which='seniso', other='senisoCA,senisoAU'>
+    #     </translated>
+    #
+    #    renders the correct spelling of color (colour) for people who have specified
+    #    a preferred language that is one of the British Commonwealth languages
+    #    even though those are also listed as valid selections for the US english
+    #    <lang> block.
+    #
+    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();
+	}
+	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;
+                }
+            }
+
+	}
+	return '';
+    }
+}				# end langauge block specific tags.
+
 
 sub start_instructorcomment {
     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 ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
+	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
+        $result=($env{'request.role'}=~/^(in|cc|co|au|ca|li)/);
 	if ( (! $result) or ($env{'form.instructor_comments'} eq 'hide')) {
 	    my $skip=&Apache::lonxml::get_all_text("/instructorcomment",
 						   $parser,$style);
@@ -957,11 +2791,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);
@@ -969,7 +2803,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-");
@@ -993,8 +2827,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);
@@ -1004,14 +2838,27 @@ sub end_while {
 	while ($return) {
 	    if (time-$starttime >
 		$Apache::lonnet::perlvar{'lonScriptTimeout'}) {
-		#$return = 0; $error=1; next;
+		$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>'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occured while running &lt;while&gt; on line').' '.$line.'</pre>');
-	}
+        if ($error) {
+            &Apache::lonxml::error(
+                '<pre>'
+               .&mt('Code ran too long. It ran for more than [_1] seconds.',
+                        $Apache::lonnet::perlvar{'lonScriptTimeout'})
+               .&mt('This occurred while running &lt;while&gt; on line [_1].',
+                        $line)
+               .'</pre>');
+        }
     } elsif ($target eq "edit") {
 	$result.= &Apache::edit::tag_end($target,$token,'');
     }
@@ -1025,12 +2872,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;
@@ -1054,17 +2903,38 @@ 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);
+            if ($env{'form.code_for_randomlist'}) {
+                &Apache::structuretags::shuffle(\@idx_arr,$target);
+                undef($env{'form.code_for_randomlist'});
+            } else {
+                &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 my $i (0 .. $show) {
+		$bodytext .= "$randomlist[ $idx_arr[$i] ]";
+	    }
+	    &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',
@@ -1079,10 +2949,10 @@ sub start_randomlist {
 }
 
 sub shuffle {
-    my $a=shift;
+    my ($a,$target) = @_;
     my $i;
-    if (defined(@$a)) {
-	&Apache::response::pushrandomnumber();
+    if (ref($a) eq 'ARRAY' && @$a) {
+	&Apache::response::pushrandomnumber(undef,$target);
 	for($i=@$a;--$i;) {
 	    my $j=int(&Math::Random::random_uniform() * ($i+1));
 	    next if $i == $j;
@@ -1113,20 +2983,85 @@ sub ordered_show_check {
     return $in_order_show;
 }
 
-sub start_part {
+
+sub start_startpartmarker {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $result='';
+    if ($target eq 'edit') {
+        $result=&Apache::edit::tag_start($target,$token);
+        $result.=&mt('Marker for the start of a part. Place end marker below to wrap in-between tags into a new part.').'</td></tr>';
+        $result.=&Apache::edit::end_table();
+
+    } 
+    return $result;
+}
+
+sub end_startpartmarker {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my @result;
+    if ($target eq 'edit') { $result[1]='no'; }
+    return @result;
+}
+
+sub start_endpartmarker {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';
-    my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
-    if ($id eq '') { $id = $Apache::lonxml::curdepth; }
+    if ($target eq 'edit') {
+        $result=&Apache::edit::tag_start($target,$token);
+        $result.=&mt('Marker for the end of a part. Place start marker above to wrap in-between tags into a new part.').'</td></tr>';
+        $result.=&Apache::edit::end_table();
+
+    }
+    return $result;
+}
+
+sub end_endpartmarker {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my @result;
+    if ($target eq 'edit') { $result[1]='no'; }
+    return @result;
+}
+
+
+
+
+
+sub start_part {
+    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_id($parstack,$safeeval);
     $Apache::inputtags::part=$id;
     push(@Apache::inputtags::partlist,$id);
+    $Apache::inputtags::leniency='';
     @Apache::inputtags::response=();
     @Apache::inputtags::previous=();
     @Apache::inputtags::previous_version=();
-    $Apache::lonhomework::problemstatus=&get_problem_status($id);
+    &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; }
+    if ($Apache::lonhomework::type eq 'randomizetry') {
+        my $rndseed=&setup_rndseed($safeeval,$target);
+        if (($target eq 'grade') && &Apache::response::submitted()) {
+            $Apache::lonhomework::results{"resource.$id.rndseed"}=$rndseed;
+        }
+    } elsif (@Apache::inputtags::partlist > 1) {
+        my $prevparttype = &Apache::lonnet::EXT("resource.$Apache::inputtags::partlist[-2].type");
+        if ($prevparttype eq 'randomizetry') {
+            my $rndseed=&setup_rndseed($safeeval,$target,'',$prevparttype);
+            if (($target eq 'grade') && &Apache::response::submitted()) {
+                $Apache::lonhomework::results{"resource.$id.rndseed"}=$rndseed;
+            }
+        }
+    } elsif (($target eq 'grade') && &Apache::response::submitted()) {
+        $Apache::lonhomework::results{"resource.$id.rndseed"}=$Apache::lonhomework::rawrndseed;
+    }
     my $in_order_show=&ordered_show_check();
     my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
     $expression.='$external::type=\''.$Apache::lonhomework::type.'\';';
@@ -1139,7 +3074,7 @@ sub start_part {
     } elsif ($target eq 'web' || $target eq 'grade' ||
 	     $target eq 'answer' || $target eq 'tex') {
 	if ($hidden || !$in_order_show) {
-	    my $bodytext=&Apache::lonxml::get_all_text("/part",$parser);
+	    my $bodytext=&Apache::lonxml::get_all_text("/part",$parser,$style);
 	} else {
 	    my ($status,$accessmsg) = &Apache::lonhomework::check_access($id);
 	    push (@Apache::inputtags::status,$status);
@@ -1155,7 +3090,8 @@ sub start_part {
 		( $status eq 'BANNED') ||
 		( $status eq 'UNAVAILABLE') ||
 		( $status eq 'INVALID_ACCESS')) {
-		my $bodytext=&Apache::lonxml::get_all_text("/part",$parser);
+		my $bodytext=&Apache::lonxml::get_all_text("/part",$parser,
+							   $style);
 		if ( $target eq "web" ) {
 		    $result="<br />".&mt('Part is not open to be viewed. It')." $accessmsg<br />";
 		} elsif ( $target eq 'tex' ) {
@@ -1169,14 +3105,14 @@ sub start_part {
 		if ($target eq 'tex') {
 		    if (not $env{'form.problem_split'}=~/yes/) {
 			if ($$tagstack[-2] eq 'td') {
-			    $result.='\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
+			    $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");
 		    my $allkeys=&Apache::lonnet::metadata($env{'request.uri'},'packages');
-		    my @allkeys = split /,/,$allkeys;
+		    my @allkeys = split(/,/,$allkeys);
 		    my $allow_print_points = 0;
 		    foreach my $partial_key (@allkeys) {
 			if ($partial_key=~m/^part_(.*)$/) {
@@ -1187,9 +3123,29 @@ sub start_part {
 		    if (defined($maxtries) && $maxtries < 0) {
 			$allow_print_points=0;
 		    }
-		    if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
+		    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 .= '\vskip 10mm\fbox{\textit{'.&mt('[quant,_1,pt,pt]',$weight ).'}}';
+
+		    }
 		} elsif ($target eq 'web') {
-		    $result.='<a name="'.&Apache::lonnet::escape($Apache::inputtags::part).'" />';
+                    if ($status eq 'CAN_ANSWER') {
+                        my $problemstatus = &get_problem_status($Apache::inputtags::part); 
+                        my $num = scalar(@Apache::inputtags::partlist)-1;
+                        if ((($Apache::lonhomework::default_type eq 'randomizetry') || 
+                            ($Apache::lonhomework::randomizetrypart)) &&
+                            ($Apache::lonhomework::type ne 'randomizetry')) {
+                            $result .= &randomizetry_part_header($problemstatus,'none',$num);
+                        } elsif ($Apache::lonhomework::type eq 'randomizetry') {
+                            $Apache::lonhomework::randomizetrypart = 1;
+                            my $reqtries = &Apache::lonnet::EXT("resource.$id.randomizeontries");
+                            $result .= &randomizetry_part_header($problemstatus,$reqtries,$num);
+                        }
+                    }
+		    $result.='<a name="'.&escape($Apache::inputtags::part).'" ></a>';
 		}
 	    }
 	}
@@ -1207,7 +3163,6 @@ sub start_part {
 	    #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;
@@ -1219,13 +3174,15 @@ sub end_part {
     my $status=$Apache::inputtags::status['-1'];
     my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
     my $in_order_show=&ordered_show_check();
-    my $result='';
-    if ( $target eq 'meta' ) {
-	$result='';
-    } elsif ($target eq 'grade') {
+    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;
+	    $result.=&Apache::inputtags::grade;
 	} else {
 	    # move any submission data to .hidden
 	    &Apache::inputtags::hidealldata($Apache::inputtags::part);
@@ -1234,27 +3191,38 @@ sub end_part {
 	     !$hidden && $in_order_show) {
 	my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,
 							$target);
-	if ($Apache::lonhomework::type eq 'exam' && $target eq 'tex') {
+	if (($Apache::lonhomework::type eq 'exam' && $target eq 'tex') ||
+             ($env{'form.grade_imsexport'})) {
 	    $gradestatus='';
 	}
-	$result=$gradestatus;
-	if ($$tagstack[-2] eq 'td' and $target eq 'tex') {$result.='\end{minipage}';} 
+	$result.=$gradestatus;
+	if ($$tagstack[-2] eq 'td' and $target eq 'tex') {
+            if (not $env{'form.problem_split'}=~/yes/) {
+                $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::inputtags::leniency='';
+    $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') {
+    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::inputtags::status['-1'] ne 'CAN_ANSWER' &&
+	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);
+	    &Apache::lonxml::get_all_text("/preduedate",$parser,$style);
 	}
     }
     return '';
@@ -1264,14 +3232,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') {
-	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') {
-	&Apache::lonxml::get_all_text("/postanswerdate",$parser);
     }
     return '';
 }
@@ -1281,15 +3256,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/ &&
 	    &Apache::response::show_answer()) {
 	    &Apache::lonxml::debug("skipping");
-	    &Apache::lonxml::get_all_text("/notsolved",$parser);
+	    &Apache::lonxml::get_all_text("/notsolved",$parser,$style);
 	}
     }
     return '';
@@ -1300,13 +3275,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::response::show_answer()) {
-	    &Apache::lonxml::get_all_text("/solved",$parser);
+	    &Apache::lonxml::get_all_text("/solved",$parser,$style);
 	}
     }
     return '';
@@ -1317,10 +3292,10 @@ sub end_solved {
 }
 
 sub start_problemtype {
-    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 $mode=lc(&Apache::lonxml::get_param('mode',$parstack,$safeeval));
 	if (!defined($mode)) { $mode='show'; }
 	my $for=&Apache::lonxml::get_param('for',$parstack,$safeeval);
@@ -1329,10 +3304,10 @@ sub start_problemtype {
 	    if ($Apache::lonhomework::type eq lc($type)) { $found=1; }
 	}
 	if ($mode eq 'show' && !$found) {
-	    &Apache::lonxml::get_all_text("/problemtype",$parser);
+	    &Apache::lonxml::get_all_text("/problemtype",$parser,$style);
 	}
 	if ($mode eq 'hide' && $found) {
-	    &Apache::lonxml::get_all_text("/problemtype",$parser);
+	    &Apache::lonxml::get_all_text("/problemtype",$parser,$style);
 	}
     } elsif ($target eq 'edit') {
 	$result .=&Apache::edit::tag_start($target,$token);
@@ -1341,9 +3316,14 @@ sub start_problemtype {
 					    ['hide','Hide']]
 					   ,$token);
 	$result .=&Apache::edit::checked_arg('When used as type(s):','for',
-					     [ ['exam','Exam/Quiz Problem'],
+					     [ ['exam','Bubblesheet Exam/Quiz Problem'],
 					       ['survey','Survey'],
-					       ['problem','Homework Problem'] ]
+                                               ['surveycred','Survey (with credit)'],
+                                               ['anonsurvey','Anonymous Survey'],
+                                               ['anonsurveycred','Anonymous Survey (with credit)'],
+					       ['problem','Homework Problem'],
+                                               ['practice','Practice Problem'],
+                                               ['randomizetry','New Randomization Each Try'] ]
 					     ,$token);
 	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
@@ -1362,25 +3342,42 @@ 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>".&mt('Text Block')."</td>
-<td>".&mt('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>".&Apache::loncommon::insert_folding_button()
+                 ." ".&mt('Text Block')."</td>"
+                 .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
+                 .&Apache::edit::deletelist($target,$token)
+                 .'</span></td>'
+	         .'<td><span id="math_'.$areaid.'">';
+	if ($env{'environment.nocodemirror'}) {
+	    $result.=&Apache::lonhtmlcommon::dragmath_button($areaid,1);
+	} else {
+	    $result.='&nbsp;';
+	}
+	$result.='</span></td>'
+		 .'<td>'
+		 .&Apache::edit::insertlist($target,$token)
+		 .'</td>'
+	         .'<td class="LC_edit_problem_latexhelper">' .
+	         &Apache::loncommon::helpLatexCheatsheet().
 		 &Apache::edit::end_row().
-                 &Apache::edit::start_spanning_row()."\n"
-		 . &Apache::loncommon::helpLatexCheatsheet () .
+                 &Apache::edit::start_spanning_row()."\n".
 		 &Apache::edit::editfield($token->[1],$text,"",80,8,1);
     }
     if ($target eq 'modified') {
@@ -1398,7 +3395,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;
 }
 
@@ -1410,8 +3416,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");
@@ -1428,13 +3434,22 @@ sub start_simpleeditbutton {
     my $result='';
     if (($env{'form.simple_edit_button'} ne 'off') &&
 	($target eq 'web') &&
-        (&Apache::lonnet::allowed('srm',$env{'request.course.id'}))) {
+        (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
         my $url=$env{'request.noversionuri'};
         $url=~s/\?.*$//;
-	my ($symb) = &Apache::lonxml::whichuser();
-	$result='<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'.
-                '<a href="'.$url.'/smpedit?symb='.&Apache::lonnet::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 />';
+	my ($symb) = &Apache::lonnet::whichuser();
+#       Warning makes more sense and is more important on edit screen
+#       $result='<p class="LC_warning">'
+#              .&mt('Note: it can take up to 10 minutes for changes to take effect for all users.')
+#              .&Apache::loncommon::help_open_topic('Caching')
+#              .'</p>';
+        $result.=&Apache::loncommon::head_subbox(
+                 &Apache::lonhtmlcommon::start_funclist()
+                .&Apache::lonhtmlcommon::add_item_funclist(
+                     '<a href="'.$url.'/smpedit?symb='.&escape($symb).'">'
+                    .&mt('Edit').'</a>')
+                .&Apache::lonhtmlcommon::end_funclist());
+
     }
     return $result;
 }
@@ -1443,5 +3458,79 @@ sub end_simpleeditbutton {
     return '';
 }
 
+sub practice_problem_header {
+    return '<h3 class="LC_info">'.&mt('Practice Problem').'</h3>'.
+           '<span class="LC_info">'.&mt('Submissions are not permanently recorded').
+           '</span>';
+}
+
+sub randomizetry_problem_header {
+    my ($problemstatus,$reqtries,$symb) = @_;
+    my ($header,$text);
+    if ($reqtries > 1) {
+        $header = &mt('New Problem Variation After Every [quant,_1,Try,Tries]',$reqtries);
+        if (($problemstatus eq 'no') ||
+            ($problemstatus eq 'no_feedback_ever')) {
+            $text = &mt('A new variation will be generated after every [quant,_1,try,tries], until the tries limit is reached.',$reqtries);
+        } else {
+            $text = &mt('A new variation will be generated after every [quant,_1,try,tries], until correct or tries limit is reached.',$reqtries);
+        }
+    } else {
+        $header = &mt('New Problem Variation Each Try');
+        if (($problemstatus eq 'no') ||
+            ($problemstatus eq 'no_feedback_ever')) {
+            $text = &mt('A new variation will be generated after each try until the tries limit is reached.');
+
+        } else {
+            $text = &mt('A new variation will be generated after each try until correct or tries limit is reached.');
+        }
+    }
+    if (($env{'request.state'} eq "construct") || ($symb eq '')) {
+        return '<div class="LC_info" id="LC_randomizetry_header" style="display:none">'.
+               '<h3>'.$header.'</h3><span class="LC_info">'.$text.'</span><hr /></div>';
+    } else {
+        return '<h3 class="LC_info">'.$header.'</h3>'.
+               '<span class="LC_info">'.$text.'</span><hr />';
+    }
+}
+
+sub randomizetry_part_header {
+    my ($problemstatus,$reqtries,$num) = @_;
+    my ($header,$text);
+    if ($reqtries eq 'none') {
+        $header = &mt('No Question Variation');
+        $text = &mt('For this question there will be no new variation after a try.');
+    } elsif ($reqtries > 1) {
+        $header = &mt('New Question Variation After Every [quant,_1,Try,Tries]',$reqtries);
+        if (($problemstatus eq 'no') ||
+            ($problemstatus eq 'no_feedback_ever')) {
+            $text = &mt('For this question a new variation will be generated after every [quant,_1,try,tries], until the tries limit is reached.',$reqtries);
+        } else {
+            $text = &mt('For this question a new variation will be generated after every [quant,_1,try,tries], until correct or tries limit is reached.',$reqtries);
+        }
+    } else {
+        $header = &mt('New Question Variation For Each Try');
+        if (($problemstatus eq 'no') ||
+            ($problemstatus eq 'no_feedback_ever')) {
+            $text =  &mt('For this question a new variation will be generated after each try until the tries limit is reached.');
+        } else {
+            $text = &mt('For this question a new variation will be generated after each try until correct or tries limit is reached.');
+        }
+    }
+    my $output;
+    if ($num > 1) {
+        $output .= '<hr />';
+    }
+    $output .=  '<h4 class="LC_info">'.$header.'</h4>'.
+                  '<span class="LC_info">'.$text.'</span><br /><br />';
+    return $output;
+}
+
 1;
 __END__
+
+=pod
+
+=back
+
+=cut