--- loncom/homework/structuretags.pm	2002/01/30 17:37:21	1.79
+++ loncom/homework/structuretags.pm	2002/02/20 22:17:18	1.82
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.79 2002/01/30 17:37:21 albertel Exp $
+# $Id: structuretags.pm,v 1.82 2002/02/20 22:17:18 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -83,7 +83,7 @@ sub page_start {
   }
   my $body_tag_start;
   if (!defined($found{'body'})) {
-    my $body_tag_start='<body onLoad="'.&Apache::lonxml::loadevents().'" '.
+    $body_tag_start='<body onLoad="'.&Apache::lonxml::loadevents().'" '.
       'onUnload="'.&Apache::lonxml::unloadevents().'" ';
     my $background=&Apache::lonxml::get_param('background',$parstack,$safeeval);
     if ($background) {
@@ -162,7 +162,10 @@ ENDCHECKOUT
 sub start_problem {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 
-  if ( $Apache::inputtags::part ne '' ) {
+  # meta is called from lonpublisher, which doesn't uses the normal
+  # lonhomework method of parsing the file which means that inputtags 
+  # won't get reset
+  if ( $Apache::inputtags::part ne '' && $target != 'meta' ) {
     &Apache::lonxml::error('Only one problem allowed in a .problem file');
     my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[-1]);
     return '';
@@ -605,12 +608,11 @@ sub end_startouttext {
     $result.=&Apache::edit::start_table($token)."<tr><td>Text Block</td>
 <td>Delete:".
   &Apache::edit::deletelist($target,$token)
-  ."</td>
+    ."</td>
 <td>".
   &Apache::edit::insertlist($target,$token).
-    "</td>
-</tr><tr><td colspan=\"3\">\n".
-	&Apache::edit::editfield($token->[1],$text,"",50,4);
+    &Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n".
+      &Apache::edit::editfield($token->[1],$text,"",50,4);
   }
   if ($target eq 'modified') {
     $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);
