--- loncom/homework/structuretags.pm	2004/06/29 22:32:12	1.258
+++ loncom/homework/structuretags.pm	2004/08/13 18:51:33	1.260.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.258 2004/06/29 22:32:12 albertel Exp $
+# $Id: structuretags.pm,v 1.260.2.1 2004/08/13 18:51:33 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -58,10 +58,11 @@ sub start_tex {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';
     my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
+    &Apache::lonnet::logthis("Hrrm? $bodytext --");
     if ($target eq 'tex') {
 	return $bodytext.' ';
     }
-    return $result;;
+    return $result;
 }
 
 sub end_tex {
@@ -191,10 +192,8 @@ sub problem_edit_header {
        <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_topic('Problem_Editor_XML_Index',
-					   'Problem Editing Help').'</td><td>'.
-       &Apache::loncommon::help_open_faq(5).
-       &Apache::loncommon::help_open_bug('Authoring').'</td></tr></table>'.
+       &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"><tr><td bgcolor="#DDDDDD">';
 }
 
@@ -1042,7 +1041,11 @@ sub start_part {
     @Apache::inputtags::previous_version=();
     $Apache::lonhomework::problemstatus=&get_problem_status($id);
     my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
+    my $newtype=&Apache::lonnet::EXT("resource.$id.type");
+    if ($newtype) { $Apache::lonhomework::type=$newtype; }
+
     my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
+    $expression.='$external::type=\''.$Apache::lonhomework::type.'\';';
     &Apache::run::run($expression,$safeeval);
 
     if ($target eq 'meta') {
@@ -1081,7 +1084,11 @@ sub start_part {
 	    } else {
 		if ($target eq 'tex') {
 		    if (not $ENV{'form.problem_split'}=~/yes/) {
-			$result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
+			if ($$tagstack[-2] eq 'td') {
+			    $result.='\vskip 0 mm \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');
@@ -1141,6 +1148,7 @@ sub end_part {
 	    $gradestatus='';
 	}
 	$result=$gradestatus;
+	if ($$tagstack[-2] eq 'td') {$result.='\end{minipage}';} 
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::end_table();
     }