--- loncom/homework/structuretags.pm	2008/08/13 16:56:15	1.427
+++ loncom/homework/structuretags.pm	2008/10/12 13:35:34	1.432
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.427 2008/08/13 16:56:15 bisitz Exp $
+# $Id: structuretags.pm,v 1.432 2008/10/12 13:35:34 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -74,7 +74,7 @@ sub start_tex {
     if ($target ne 'edit' && $target ne 'modified') {
 	my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style);
 	if ($target eq 'tex') {
-	    return $bodytext.' ';
+	    return $bodytext.'{}';
 	}
     } elsif ($target eq "edit" ) {
 	my $bodytext = 
@@ -416,8 +416,9 @@ sub problem_web_to_edit_header {
 <select name='problemtype'>
   <option value=''></option>
   ".&option('exam'   ,'problemtype').&mt("Exam Problem")."</option>
-  ".&option('problem','problemtype').&mt("Homework problem")."</option>
+  ".&option('problem','problemtype').&mt("Homework Problem")."</option>
   ".&option('survey' ,'problemtype').&mt("Survey Question")."</option>
+  ".&option('practice' ,'problemtype').&mt("Practice Problem")."</option>
 </select>
 </span>
 $show_all
@@ -865,8 +866,7 @@ sub start_problem {
 		    '</label>';
 	    }
             if ($Apache::lonhomework::type eq 'practice') {
-               $form_tag_start.='<span class="LC_info"><h3>'.&mt('Practice Problem').'</h3></span>'.
-                                '<span class="LC_info">'.&mt('Submissions are not permanently recorded').'</span>';
+                $form_tag_start.=&practice_problem_header();
             }
 	    $form_tag_start.='<hr />';
 	}
@@ -940,6 +940,11 @@ sub start_problem {
 	    # create a page header and exit
 	    if ($env{'request.state'} eq "construct") {
 		$result.= &problem_web_to_edit_header($env{'form.rndseed'});
+                if ($Apache::lonhomework::type eq 'practice') {
+                    $result.= '<input type="submit" name="resetdata" '.
+                              'value="'.&mt('New Problem Variation').'" />'.
+                              &practice_problem_header().'<hr />';
+                }
 	    }
 	    # if we are viewing someone else preserve that info
 	    if (defined $env{'form.grade_symb'}) {
@@ -1175,6 +1180,11 @@ sub start_library {
 	$result.=" \n $form_tag_start".	
 		  '<input type="hidden" name="submitted" value="yes" />';
 	$result.=&problem_web_to_edit_header($rndseed);
+        if ($Apache::lonhomework::type eq 'practice') {
+            $result.= '<input type="submit" name="resetdata" '.
+                      'value="'.&mt('New Problem Variation').'" />'.
+                      &practice_problem_header().'<hr />';
+        }
     }
     return $result;
 }
@@ -1382,9 +1392,15 @@ sub end_languageblock {
 	    my $result = &Apache::lonxml::endredirection();
 	    my $which = &Apache::lonxml::get_param('which',$parstack,
 						   $safeeval);
-            foreach my $language (split(/\s*\,\s*/,$which)) {
-               unless ($language=~/\w/) { next; }
-               $available_texts{$language} = $result;
+            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;
+                }
             }
 
 	}
@@ -1483,7 +1499,7 @@ sub end_while {
 	    $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>');
+	    &Apache::lonxml::error('<pre>'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occurred while running &lt;while&gt; on line').' '.$line.'</pre>');
 	}
     } elsif ($target eq "edit") {
 	$result.= &Apache::edit::tag_end($target,$token,'');
@@ -1843,7 +1859,8 @@ sub start_problemtype {
 	$result .=&Apache::edit::checked_arg('When used as type(s):','for',
 					     [ ['exam','Exam/Quiz Problem'],
 					       ['survey','Survey'],
-					       ['problem','Homework Problem'] ]
+					       ['problem','Homework Problem'],
+                                               ['practice','Practice Problem'] ]
 					     ,$token);
 	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
@@ -1876,7 +1893,6 @@ sub end_startouttext {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
     my $text='';
-
     if ($target eq 'edit') {
 	my $areaid = 'homework_edit_'.$Apache::lonxml::curdepth;
 	$text=&Apache::lonxml::get_all_text("endouttext",$parser,$style);
@@ -1887,7 +1903,10 @@ sub end_startouttext {
         unless ($env{'environment.wysiwygeditor'} eq 'on') {
             $result.='<td align="left">'
                      .&Apache::lonhtmlcommon::dragmath_button($areaid,1)
-                     .'</td>';
+		     .'</td>'
+                     .'<td>'
+                     .&Apache::edit::insertlist($target,$token)
+		     .'</td>';
         }
 	$result.='<td align="right" valign="top">' .
 		 &Apache::loncommon::helpLatexCheatsheet().
@@ -1964,5 +1983,11 @@ sub end_simpleeditbutton {
     return '';
 }
 
+sub practice_problem_header {
+    return '<span class="LC_info"><h3>'.&mt('Practice Problem').'</h3></span>'.
+           '<span class="LC_info">'.&mt('Submissions are not permanently recorded').
+           '</span>';
+}
+
 1;
 __END__