--- loncom/homework/structuretags.pm	2009/12/06 21:18:24	1.461
+++ loncom/homework/structuretags.pm	2012/09/12 05:14:09	1.508
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.461 2009/12/06 21:18:24 raeburn Exp $
+# $Id: structuretags.pm,v 1.508 2012/09/12 05:14:09 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -61,14 +61,114 @@ use Apache::lonlocal;
 use Apache::lonxml;
 use Apache::londefdef;
 use Apache::lonenc();
+use Apache::loncommon();
 use Time::HiRes qw( gettimeofday tv_interval );
 use lib '/home/httpd/lib/perl/';
 use LONCAPA;
  
 BEGIN {
-    &Apache::lonxml::register('Apache::structuretags',('block','languageblock','translated','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag'));
+    &Apache::lonxml::register('Apache::structuretags',('block','languageblock','translated','instructorcomment','while','randomlist','problem','library','web','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,$style)=@_;
     if ($target ne 'edit' && $target ne 'modified') {
@@ -128,8 +228,17 @@ sub homework_js {
            &setmode_javascript().
 	<<'JS';
 <script type="text/javascript">
-function setSubmittedPart (part) {
-   this.document.lonhomework.submitted.value="part_"+part;
+// <![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 image_response_click (which, e) {
@@ -145,7 +254,7 @@ function image_response_click (which, e)
     input_element.value = click;
     img_element.src = '/adm/randomlabel.png?token='+token+'&clickdata='+click;
 }
-
+// ]]>
 </script>
 JS
 }
@@ -153,10 +262,12 @@ JS
 sub setmode_javascript {
     return <<"ENDSCRIPT";
 <script type="text/javascript">
+// <![CDATA[
 function setmode(form,probmode) {
     form.problemmode.value = probmode;
     form.submit();
 }
+// ]]>
 </script>
 ENDSCRIPT
 }
@@ -177,12 +288,71 @@ sub page_start {
 					   $parstack,$parser,$safeeval);
     }
 
-    $extra_head .= &homework_js();
-
-    if ($env{'environment.wysiwygeditor'} eq 'on') {
-	$extra_head .= &Apache::lonhtmlcommon::dragmath_js("FCKEditMathPopup");
+    $extra_head .= &homework_js().
+                   &Apache::lonhtmlcommon::dragmath_js("EditMathPopup");
+    if (&Apache::lonhtmlcommon::htmlareabrowser()) {
+        my %textarea_args = (
+                                dragmath => 'math',
+                              );
+        $extra_head .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args);
+    }
+    my $is_task = ($env{'request.uri'} =~ /\.task$/);
+    my $needs_upload;
+    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 {
-        $extra_head .= &Apache::lonhtmlcommon::dragmath_js("EditMathPopup");
+        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;
+                    }
+                }
+            }
+        } 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();
+                    }
+                    unless ($is_page) {
+                        my $res = $navmap->getBySymb($symb);
+                        if (ref($res)) {
+                            my $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();
+        }
     }
 
     my %body_args;
@@ -209,14 +379,11 @@ sub page_start {
     } elsif (!defined($found{'body'}) 
 	     && $env{'request.state'} eq 'construct') {
 	if ($target eq 'web' || $target eq 'edit') {
-	    if ($env{'environment.remote'} ne 'off') {
-		$body_args{'only_body'}  = 1;
-	    }
         # Breadcrumbs for Construction Space
         &Apache::lonhtmlcommon::clear_breadcrumbs();
         &Apache::lonhtmlcommon::add_breadcrumb({
             'text'  => 'Construction Space',
-            'href'  => &Apache::loncommon::authorspace(),
+            'href'  => &Apache::loncommon::authorspace($env{'request.uri'}),
         });
         # breadcrumbs (and tools) will be created 
         # in start_page->bodytag->innerregister
@@ -245,8 +412,7 @@ sub page_start {
         # $body_args{'no_title'}       = 1;
         $body_args{'force_register'} = 1;
         $body_args{'add_entries'}    = \%add_entries;
-        if ($env{'environment.remote'} eq 'off'
-            && $env{'request.state'} eq   'construct') {
+        if ( $env{'request.state'} eq   'construct') {
             $body_args{'only_body'}  = 1;
         }
     }
@@ -254,34 +420,37 @@ sub page_start {
     my $page_start = &Apache::loncommon::start_page($name,$extra_head,
 						    \%body_args);
     $page_start .= $pageheader;
-
-    unless ($env{'request.gcicontext'} eq 'buildtest') {
-        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'
+	&& ($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 = Apache::loncommon::inhibit_menu_check(
+	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 (($is_task) || ($needs_upload)) {
+            $form_tag_start .= ' onsubmit="return file_submission_check(this,'."'$path','$multiresp'".');"';
+        }
 	$form_tag_start.='>'."\n";
 
 	my $symb=&Apache::lonnet::symbread();
@@ -323,9 +492,15 @@ sub get_resource_name {
 }
 
 sub setup_rndseed {
-    my ($safeeval)=@_;
-    my $rndseed;
+    my ($safeeval,$target)=@_;
     my ($symb)=&Apache::lonnet::whichuser();
+    my ($questiontype,$set_safespace,$rndseed);
+    if ($target eq 'analyze') {
+        $questiontype = $env{'form.grade_questiontype'};
+    }
+    unless (defined($questiontype)) {
+        $questiontype = $Apache::lonhomework::type;
+    }
     if ($env{'request.state'} eq "construct" 
 	|| $symb eq '' 
 	|| $Apache::lonhomework::type eq 'practice'
@@ -340,6 +515,14 @@ sub setup_rndseed {
 	    }
 	    $env{'form.rndseed'}=$rndseed;
 	}
+        if (($env{'request.state'} eq "construct") && 
+            ($Apache::lonhomework::type eq 'randomizetry')) {
+            my $tries = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.tries"};
+            if ($tries) {
+                $rndseed += $tries;
+            }
+            $env{'form.'.$Apache::inputtags::part.'.rndseed'}=$rndseed;
+        }
 	if ( ($env{'form.resetdata'} eq &mt('New Problem Variation')
 	      && $env{'form.submitted'} eq 'yes')  ||
 	    $env{'form.newrandomization'} eq &mt('New Randomization')) {
@@ -349,16 +532,54 @@ sub setup_rndseed {
 	    delete($env{'form.resetdata'});
 	    delete($env{'form.newrandomization'});
 	}
-	if (defined($rndseed) && $rndseed ne int($rndseed)) {
-	    $rndseed=join(':',&Apache::lonnet::digest($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'}) {
 	   $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 = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.tries"};
+            if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+                $curr_try ++;
+            }
+            if ($rndseed =~/^(\d+)[,:](\d+)$/) {
+                $rndseed = $1;
+            }
+            if ($curr_try) {
+                my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
+                if (($reqtries =~ /^\d+$/) && ($reqtries > 1)) {
+                    my $inc = int(($curr_try-1)/$reqtries);
+                    $rndseed += $inc;
+                } else {
+                    $rndseed += $curr_try;
+                }
+            }
+        }
+        $set_safespace = 1;
+    }
+    if ($set_safespace) {
+        if ($safeeval) {
+            &Apache::lonxml::debug("Setting rndseed to $rndseed");
+            &Apache::run::run('$external::randomseed="'.$rndseed.'";',$safeeval);
+        }
+    }
+    unless (($env{'request.state'} eq "construct") || ($symb eq '')) {
+        $env{'form.'.$Apache::inputtags::part.'.rndseed'}=$rndseed;
     }
     return $rndseed;
 }
@@ -370,27 +591,48 @@ 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 {
-   return  '
-<div class="LC_edit_problem_discards">
-       <input type="button" name="submitmode" accesskey="d" value="'.&mt('Discard Edits and View').'" '.
-       ' onclick="javscript:setmode(this.form,'."'discard'".')"  />
-       <input '.&Apache::edit::submit_ask_anyway('setmode(this.form,'."'editxml'".')').' type="button" name="submitmode" accesskey="x" value="'.&mt('EditXML').'" />
-       <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" />
-</div>
-<div class="LC_edit_problem_saves">
-       <input type="submit" name="submitbutton" accesskey="s" value="'.&mt('Save and Edit').'" />
-       <input type="submit" name="submitbutton" accesskey="v" value="'.&mt('Save and View').'" />
-</div>';
+   my ($mode)=@_;
+# Buttons that do not save
+   my $result='<div class="LC_edit_problem_discards">'.
+              &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);
+       $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>";
+# Buttons that save
+   $result.='<div class="LC_edit_problem_saves">';
+   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";
+   return $result;
 }
 
 sub problem_edit_header {
-    return '<input type="hidden" name="submitted" value="edit" /><input type="hidden" name="problemmode" value="edit" />'.
-	&Apache::structuretags::remember_problem_state().'
+    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').&Apache::loncommon::help_open_menu('Problem Editing','Problem_Editor_XML_Index',5,'Authoring').'
 </div>'.
+'<input type="hidden" name="problemmode" value="saveedit" />'.
 &problem_edit_buttons().'
 <hr style="clear:both;" />
 '.&Apache::lonxml::message_location().'
@@ -407,8 +649,6 @@ sub problem_edit_footer {
   <hr style="clear:both;" />
 </div>
 '.
-
-    &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields()).
     "\n</form>\n".&Apache::loncommon::end_page();
 }
 
@@ -474,7 +714,11 @@ sub problem_web_to_edit_header {
   ".&option('exam'   ,'problemtype').&mt("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>
 </span>
 $show_all
@@ -525,7 +769,7 @@ $show_all
    <div class="LC_edit_problem_header_randomize_row">
      <input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" />
      <input type="submit" name="changerandseed" value="'.&mt('Change Random Seed To:').'" />
-     <input type="text" name="rndseed" size="10" value="'.
+     <input type="text" name="rndseed" size="24" value="'.
 	       $rndseed.'"
              onchange="javascript:document.lonhomework.changerandseed.click()" />';
 
@@ -632,9 +876,7 @@ sub finalize_storage {
 	    $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,
 					    $symb,$courseid,$domain,$name);
 	    &Apache::lonxml::debug('Store return message:'.$result);
-            if ($env{'request.role'} =~/^st/) {
-                &store_aggregates($symb,$courseid);
-            }
+            &store_aggregates($symb,$courseid);
 	}
     } else {
 	&Apache::lonxml::debug('Nothing to store');
@@ -654,7 +896,7 @@ item store_aggregates()
 
 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'};
@@ -664,28 +906,60 @@ 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;
-        } 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;
+        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;
     }
     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 checkout_msg {
@@ -716,19 +990,19 @@ sub firstaccess_msg {
 	my $foldertitle=&Apache::lonnet::gettitle($map);
     
 	&Apache::lonxml::debug("map is $map title is $foldertitle");
-	$result .= "<h2>".&mt('The resources in "[_1]" are open for a limited time.'
-                             .' Once you click the "Show Resource" button below you have [_2] to complete all resources "[_1]".'
-                             ,$foldertitle,$time)."</h2>";
+	$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.'
-                             .' Once you click the "Show Resource" button below you have [_2] to complete all resources "[_1]".'
-                             ,$course,$time)."</h2>";
+        $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.'
-                             .' Once you click the "Show Resource" button below you have [_2] to complete this resource "[_1]".'
-                             ,$title,$time)."</h2>";
+        $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');
@@ -766,6 +1040,7 @@ sub init_problem_globals {
 	&Apache::lonhomework::reset_show_problem_status();
 	$Apache::lonhomework::ignore_response_errors=1;
     }
+    @Apache::functionplotresponse::callscripts=();
     @Apache::inputtags::responselist = ();
     @Apache::inputtags::importlist = ();
     @Apache::inputtags::previous=();
@@ -785,6 +1060,9 @@ sub reset_problem_globals {
     undef(%Apache::lonhomework::history);
     undef(%Apache::lonhomework::results);
     undef($Apache::inputtags::part);
+    if ($type eq 'Task') {
+        undef($Apache::inputtags::slot_name);
+    }
 #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);
@@ -793,6 +1071,7 @@ sub reset_problem_globals {
     undef($Apache::lonhomework::type);
     undef($Apache::lonhomework::scantronmode);
     undef($Apache::lonhomework::ignore_response_errors);
+    undef(@Apache::functionplotresponse::callscripts);
     &Apache::lonhomework::reset_show_problem_status();
 }
 
@@ -881,9 +1160,23 @@ sub start_problem {
     &Apache::run::run($expression,$safeeval);
     my $status;
     my $accessmsg;
+    my $resource_due;
 
     my $name= &get_resource_name($parstack,$safeeval);
-    my ($result,$form_tag_start);
+    my ($result,$form_tag_start,$slot_name,$slot);
+
+    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");
+            &Apache::lonnet::set_first_access($interval[1]);
+        }
+
+        ($status,$accessmsg,$slot_name,$slot) =
+            &Apache::lonhomework::check_slot_access('0','problem');
+        push (@Apache::inputtags::status,$status);
+    }
+
     if ($target eq 'web' || $target eq 'webgrade' || $target eq 'tex'
 	|| $target eq 'edit') {
 	($result,$form_tag_start) =
@@ -893,63 +1186,46 @@ sub start_problem {
 
     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;
-	    }
-	    $result.=&Apache::lonxml::printtokenheader($target,$token);
-	}
-	if ($env{'form.markaccess'}) {
-	    my @interval=&Apache::lonnet::EXT("resource.0.interval");
-	    &Apache::lonnet::set_first_access($interval[1]);
-	}
+
 	#handle rand seed in construction space
-	my $rndseed=&setup_rndseed($safeeval);
+	my $rndseed=&setup_rndseed($safeeval,$target);
 	my ($symb)=&Apache::lonnet::whichuser();
+
 	if ($env{'request.state'} ne "construct" && 
 	    ($symb eq '' || $Apache::lonhomework::type eq 'practice')) {
 	    $form_tag_start.='<input type="hidden" name="rndseed" value="'.
-		$rndseed.'" />';
-            unless ($env{'request.gcicontext'} eq 'buildtest') {
-                $form_tag_start .= '<input type="submit" name="resetdata"'.
-                            ' value="'.&mt('New Problem Variation').'" />';
-            }
+		$rndseed.'" />'.
+		    '<input type="submit" name="resetdata"
+                             value="'.&mt('New Problem Variation').'" />';
 	    if (exists($env{'form.username'})) {
 		$form_tag_start.=
 		    '<input type="hidden" name="username"
                              value="'.$env{'form.username'}.'" />';
 	    }
-            unless ($env{'request.gcicontext'} eq 'buildtest') {
-	        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="checked"';
-		    }
-                    $form_tag_start.= ' /> '
-                                     .&mt('Show All Foils')
-                                     .'</label>';
-	        }
-            }
+	    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="checked"';
+		}
+                $form_tag_start.= ' /> '
+                                 .&mt('Show All Foils')
+                                 .'</label>';
+	    }
             if ($Apache::lonhomework::type eq 'practice') {
                 $form_tag_start.=&practice_problem_header();
             }
-            unless ($env{'request.gcicontext'} eq 'buildtest') {
-	        $form_tag_start.='<hr />';
-            }
-	}
-
-	($status,$accessmsg,my $slot_name,my $slot) = 
-	    &Apache::lonhomework::check_slot_access('0','problem');
-	push (@Apache::inputtags::status,$status);
+	    $form_tag_start.='<hr />';
+        } elsif (($env{'request.state'} ne "construct") &&
+                 ($Apache::lonhomework::type eq 'randomizetry') &&
+                 ($status eq 'CAN_ANSWER')) {
+            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);
+        }
 
 	my $expression='$external::datestatus="'.$status.'";';
 	$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';
@@ -962,18 +1238,24 @@ sub start_problem {
 	    ( $status eq 'BANNED') ||
 	    ( $status eq 'UNAVAILABLE') ||
 	    ( $status eq 'NOT_IN_A_SLOT') ||
+            ( $status eq 'NOTRESERVABLE') ||
+            ( $status eq 'RESERVABLE') ||
+            ( $status eq 'RESERVABLE_LATER') ||
 	    ( $status eq 'INVALID_ACCESS')) {
 	    my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,
 						       $style);
 	    if ( $target eq "web" ) {
 		my $msg;
 		if ($status eq 'UNAVAILABLE') {
-		    $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
+		    $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.='<h1>'.&mt('You are not currently signed up to work at this time and/or place.').'</h1>';
+                    $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.='<h1>'.&mt('Not open to be viewed').'</h1>';
-		}
+		    $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') {
@@ -982,6 +1264,16 @@ sub start_problem {
 		    $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.');  
 		}
 		$result.=$msg.'<br />';
 	    } elsif ($target eq 'tex') {
@@ -1006,13 +1298,35 @@ sub start_problem {
 							'problem');
 	    }
 	} elsif ($target eq 'web') {
-	    if ($status eq 'CAN_ANSWER' 
-		&& $slot_name ne ''
-		&& $Apache::lonhomework::history{'resource.0.checkedin'} eq '') {
-		# unproctored slot access, self checkin
-		&Apache::bridgetask::check_in('problem',undef,undef,
-					      $slot_name);
-	    }
+	    if ($status eq 'CAN_ANSWER') {
+                $resource_due = &Apache::lonhomework::due_date(0, $env{'request.symb'});
+                if ($slot_name ne '') {
+                    my $checked_in =
+                        $Apache::lonhomework::history{'resource.0.checkedin'};
+                    if ($checked_in eq '') {
+                        # unproctored slot access, self checkin
+                        &Apache::bridgetask::check_in('problem',undef,undef,
+                                                      $slot_name);
+                        $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'};
+                            }
+                        }
+                    }
+                }
+                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
@@ -1030,9 +1344,20 @@ 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') {
 	    $result .= 'INSERTTEXFRONTMATTERHERE';
+	    $result .= &select_metadata_hyphenation();
+	    
 
 	}
     } elsif ($target eq 'edit') {
@@ -1089,6 +1414,7 @@ sub end_problem {
 	}
 	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.'}';
 	
@@ -1134,7 +1460,9 @@ sub end_problem {
 			'\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{'.$weight.' pt}}';}
+		    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;
@@ -1142,7 +1470,9 @@ sub end_problem {
 	} else {
 	    if (not $env{'request.symb'} =~ m/\.page_/) {
 		$frontmatter .= $begin_doc.$toc_line;
-		if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}
+		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;
 	    }
@@ -1165,7 +1495,8 @@ sub end_problem {
 	    }
 	} 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);
@@ -1175,13 +1506,19 @@ 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::lonhtmlcommon::get_htmlareafields());
 	    }
 	    if ($target eq 'web') {
-		$result.= &Apache::loncommon::end_page({'discussion' => 1});
+                #
+                # 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.
+                #
+		$result.= &Apache::loncommon::end_page({'discussion' => 1,
+							'notbody'    => 1});
 	    } elsif ($target eq 'tex') {
 		my $endminipage = '';
 		if (not $env{'form.problem_split'}=~/yes/) {
@@ -1199,6 +1536,9 @@ sub end_problem {
 		}
 	    }
 	}
+        if ($target eq 'web') {
+           $result.=&Apache::functionplotresponse::init_script();
+        }
 	if ($target eq 'grade') {
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
 	    &finalize_storage();
@@ -1229,6 +1569,19 @@ 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;
 }
 
@@ -1256,7 +1609,7 @@ sub start_library {
 	($result,$form_tag_start)=
 	    &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
 			$name);
-	my $rndseed=&setup_rndseed($safeeval);
+	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);
@@ -1355,54 +1708,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' || $target eq 'webgrade') {
 	my $include = $token->[2]->{'include'};
 	my $exclude = $token->[2]->{'exclude'};
         my @preferred_languages=&Apache::lonlocal::preferred_languages();
-# This should not even happen, since we should at least have the server language
-        if (!$preferred_languages[0]) { $preferred_languages[0]='en'; }
-# Now loop over all languages in order of preference
+
+        # This should not even happen, since we should at least have the server language
+
+        if (!$preferred_languages[0]) { 
+	    $preferred_languages[0]='en'; 
+	}
+
+        # Now loop over all languages in order of preference
+
+	my $render;
         foreach my $preferred_language (@preferred_languages) {
-# If the languageblock has no arguments, show the contents
-           $result=1;
+
+	    # If neither include/nor exlude is present the block is going
+	    # to get rendered.
+
            my $found=0;
-# Do we have an include argument?
+           $render=1;
+
+	   #  If include is specified,  don't render the block
+	   #  unless the preferred language is included in the set.
+
 	   if ($include) {
-# If include is specified, by default, don't render the block
-              $result=0;
+              $render=0;
               foreach my $included_language (split(/\,/,$include)) {
-# ... but if my preferred language is included, render it
                  if ($included_language eq $preferred_language) {
-                    $result=1; 
+                    $render=1; 
                     $found=1; 
+		    last;	# Only need to find the first.
                  }
               }
 	   }
-# Do we have an exclude argument?
+           # 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) {
-              $result=1;
+              $render=1;
               foreach my $excluded_language (split(/\,/,$exclude)) {
                  if ($excluded_language eq $preferred_language) {
-                    $result=0;
+                    $render=0;
                     $found=1;
+		    last;	# Only need to find the first.
                  }
               }
 	   }
-           if ($found) { last; }
+           if ($found) { 
+	       last; 		# Done on any match of include or exclude.
+	   }
         }
-	if ( ! $result ) {
+	# 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',
@@ -1427,9 +1827,47 @@ sub end_languageblock {
     }
     return $result;
 }
-
+#  languagblock specific tags:
 {
-    my %available_texts;
+    # 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'));
@@ -1448,14 +1886,55 @@ sub end_languageblock {
 	    my @possibilities = keys(%available_texts);
 	    my $which = 
 		&Apache::loncommon::languages(\@possibilities) || 'default';
-	    $result = $available_texts{$which};
+	    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' ||
@@ -1486,7 +1965,8 @@ sub end_languageblock {
 	}
 	return '';
     }
-}
+}				# end langauge block specific tags.
+
 
 sub start_instructorcomment {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
@@ -1495,7 +1975,7 @@ sub start_instructorcomment {
 
     if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
 	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
-        $result=($env{'request.role'}=~/^(in|cc|au|ca|li)/);
+        $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);
@@ -1700,6 +2180,49 @@ sub ordered_show_check {
     return $in_order_show;
 }
 
+
+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='';
+    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) {
@@ -1784,9 +2307,31 @@ sub start_part {
 				    '.disableexampointprint'}) eq 'yes') {
 			$allow_print_points=0;
 		    }
-		    if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
+		    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="'.&escape($Apache::inputtags::part).'" />';
+                    if ($status eq 'CAN_ANSWER') {
+                        my $problemstatus = &get_problem_status($Apache::inputtags::part); 
+                        my $probrandomize = &Apache::lonnet::EXT("resource.$Apache::inputtags::partlist[0].type");
+                        my $probrandtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::partlist[0].randomizeontries");
+                        my $num = scalar(@Apache::inputtags::partlist)-1;
+                        if ($probrandomize eq 'randomizetry') {
+                            if (&Apache::lonnet::EXT("resource.$Apache::inputtags::part.type") ne 'randomizetry') {
+                                $result .= &randomizetry_part_header($problemstatus,'none',$num);
+                            } else {
+                                my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
+                                if ($probrandtries ne $reqtries) {
+                                    $result .= &randomizetry_part_header($problemstatus,$reqtries,$num);
+                                }
+                            }
+                        } elsif (&Apache::lonnet::EXT("resource.$Apache::inputtags::part.type") eq 'randomizetry') {
+                            my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
+                            $result .= &randomizetry_part_header($problemstatus,$reqtries,$num);
+                        }
+                    }
+		    $result.='<a name="'.&escape($Apache::inputtags::part).'" ></a>';
 		}
 	    }
 	}
@@ -1832,7 +2377,8 @@ 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;
@@ -1953,8 +2499,12 @@ sub start_problemtype {
 	$result .=&Apache::edit::checked_arg('When used as type(s):','for',
 					     [ ['exam','Exam/Quiz Problem'],
 					       ['survey','Survey'],
+                                               ['surveycred','Survey (with credit)'],
+                                               ['anonsurvey','Anonymous Survey'],
+                                               ['anonsurveycred','Anonymous Survey (with credit)'],
 					       ['problem','Homework Problem'],
-                                               ['practice','Practice Problem'] ]
+                                               ['practice','Practice Problem'],
+                                               ['randomizetry','New Randomization Each Try'] ]
 					     ,$token);
 	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
@@ -1993,17 +2543,15 @@ sub end_startouttext {
 	$result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td>"
                  .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
                  .&Apache::edit::deletelist($target,$token)
-                 .'</span></td>';
-        unless ($env{'environment.wysiwygeditor'} eq 'on') {
-	    $result .= '<td align="left">'
-		.&Apache::lonhtmlcommon::dragmath_button($areaid,1)
-		.'</td>'
-		.'<td>'
-		.&Apache::edit::insertlist($target,$token)
-		.'</td>';
-	}
-	$result.='<td align="right" valign="top">' .
-	    &Apache::loncommon::helpLatexCheatsheet().
+                 .'</span></td>'
+	         .'<td align="left"><span id="math_'.$areaid.'" />'
+		 .&Apache::lonhtmlcommon::dragmath_button($areaid,1)
+		 .'<span></td>'
+		 .'<td>'
+		 .&Apache::edit::insertlist($target,$token)
+		 .'</td>'
+	         .'<td align="right" valign="top">' .
+	         &Apache::loncommon::helpLatexCheatsheet().
 		 &Apache::edit::end_row().
                  &Apache::edit::start_spanning_row()."\n".
 		 &Apache::edit::editfield($token->[1],$text,"",80,8,1);
@@ -2071,11 +2619,12 @@ sub start_simpleeditbutton {
 #              .&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::lonhtmlcommon::start_funclist()
+        $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();
+                .&Apache::lonhtmlcommon::end_funclist());
 
     }
     return $result;
@@ -2091,6 +2640,63 @@ sub practice_problem_header {
            '</span>';
 }
 
+sub randomizetry_problem_header {
+    my ($problemstatus,$reqtries) = @_;
+    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.');
+        }
+    }
+    return '<span class="LC_info"><h3>'.$header.'</h3></span>'.
+           '<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 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 .=  '<span class="LC_info"><h4>'.$header.'</h4></span>'.
+                  '<span class="LC_info">'.$text.'</span><br /><br />';
+    return $output;
+}
+
 1;
 __END__