--- loncom/homework/structuretags.pm	2002/01/23 14:36:19	1.77
+++ 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.77 2002/01/23 14:36:19 sakharuk Exp $
+# $Id: structuretags.pm,v 1.82 2002/02/20 22:17:18 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,7 +34,7 @@ package Apache::structuretags;
 use strict;
 use Apache::lonnet;
 
-sub BEGIN {
+BEGIN {
   &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
 #  &Apache::lonxml::register_insert('problem','',('part','postanswerdate','preduedate'))
 }
@@ -67,24 +67,39 @@ sub end_tex {
 
 sub page_start {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-  my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval);
-  my $head_tag_start='<head>'.&Apache::lonxml::registerurl();
-  my $body_tag_start='<body onLoad="'.&Apache::lonxml::loadevents().'" '.
-	  'onUnload="'.&Apache::lonxml::unloadevents().'" ';
-  my $background=&Apache::lonxml::get_param('background',$parstack,$safeeval);
-  if ($background) {
-    $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
-                                        $background;
-    $body_tag_start.='background="'.$background.'" ';
-  } else {
-    my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,$safeeval);
-    if ($bgcolor) {
-      $body_tag_start.='bgcolor="'.$bgcolor.'" ';
+  my %found;
+  foreach my $taginside ($tagstack) {
+    foreach my $taglookedfor ('html','body','form') {
+      if ($taginside =~ /^$taglookedfor$/i) { $found{$taglookedfor} = 1; }
+    }
+  }
+
+  my $result;
+  my $head_tag_start;
+  if (!defined($found{'html'})) {
+    $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,
+					   $parser,$safeeval);
+    $head_tag_start='<head>'.&Apache::lonxml::registerurl();
+  }
+  my $body_tag_start;
+  if (!defined($found{'body'})) {
+    $body_tag_start='<body onLoad="'.&Apache::lonxml::loadevents().'" '.
+      'onUnload="'.&Apache::lonxml::unloadevents().'" ';
+    my $background=&Apache::lonxml::get_param('background',$parstack,$safeeval);
+    if ($background) {
+      $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
+	$background;
+      $body_tag_start.='background="'.$background.'" ';
     } else {
-      $body_tag_start.='bgcolor="#ffffff"';
+      my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,$safeeval);
+      if ($bgcolor) {
+	$body_tag_start.='bgcolor="'.$bgcolor.'" ';
+      } else {
+	$body_tag_start.='bgcolor="#ffffff"';
+      }
     }
+    $body_tag_start.='>';
   }
-  $body_tag_start.='>';
   return ($result,$head_tag_start,$body_tag_start);
 }
 
@@ -147,6 +162,14 @@ ENDCHECKOUT
 sub start_problem {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 
+  # 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 '';
+  }
 #intialize globals
   $Apache::inputtags::part='0';
   @Apache::inputtags::responselist = ();
@@ -585,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']);
