--- loncom/homework/structuretags.pm	2008/07/08 09:54:30	1.424
+++ loncom/homework/structuretags.pm	2008/08/13 16:56:15	1.427
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.424 2008/07/08 09:54:30 foxr Exp $
+# $Id: structuretags.pm,v 1.427 2008/08/13 16:56:15 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -148,6 +148,10 @@ sub page_start {
 
     $extra_head .= &homework_js();
 
+    unless ($env{'environment.wysiwygeditor'} eq 'on') {
+        $extra_head .= &Apache::lonhtmlcommon::dragmath_js();
+    }
+
     my %body_args;
     if (defined($found{'html'})) {
 	$body_args{'skip_phases'}{'head'}=1;
@@ -1378,7 +1382,11 @@ sub end_languageblock {
 	    my $result = &Apache::lonxml::endredirection();
 	    my $which = &Apache::lonxml::get_param('which',$parstack,
 						   $safeeval);
-	    $available_texts{$which} = $result;
+            foreach my $language (split(/\s*\,\s*/,$which)) {
+               unless ($language=~/\w/) { next; }
+               $available_texts{$language} = $result;
+            }
+
 	}
 	return '';
     }
@@ -1875,12 +1883,13 @@ sub end_startouttext {
 	$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).
-		 '</td><td>'.
-		 &Apache::lonhtmlcommon::dragmath($areaid).'</td>'.
-		 '<td align="right" valign="top">' .
+		 ."</td>";
+        unless ($env{'environment.wysiwygeditor'} eq 'on') {
+            $result.='<td align="left">'
+                     .&Apache::lonhtmlcommon::dragmath_button($areaid,1)
+                     .'</td>';
+        }
+	$result.='<td align="right" valign="top">' .
 		 &Apache::loncommon::helpLatexCheatsheet().
 		 &Apache::edit::end_row().
                  &Apache::edit::start_spanning_row()."\n".