--- loncom/xml/londefdef.pm	2001/02/01 19:10:11	1.20
+++ loncom/xml/londefdef.pm	2001/08/06 20:41:22	1.32
@@ -2,7 +2,7 @@
 # Tags Default Definition Module 
 #
 # last modified 06/26/00 by Alexander Sakharuk
-# 11/6,11/30,02/01/01 Gerd Kortemeyer
+# 11/6,11/30,02/01/01,5/4 Gerd Kortemeyer
 
 package Apache::londefdef; 
 
@@ -11,27 +11,25 @@ use Apache::lonxml;
 
 sub BEGIN {
 
-    &Apache::lonxml::register('Apache::londefdef',('m','html','head','map','select','option','input','textarea','form','meta','title','body','center','b','strong','table','dt','h1','h2','h3','h4','h5','h6','cite','i','address','dd','dl','dir','ol','ul','menu','dfn','kbd','tt','code','em','q','p','br','big','small','basefont','font','s','sub','strike','sup','hr','a','li','u','output','param','applet','img','embed','tr','td','allow'));
+    &Apache::lonxml::register('Apache::londefdef',('m','html','head','map','select','option','input','textarea','form','meta','title','body','center','b','strong','table','dt','h1','h2','h3','h4','h5','h6','cite','i','address','dd','dl','dir','ol','ul','menu','dfn','kbd','tt','code','em','q','p','br','big','small','basefont','font','s','sub','strike','sup','hr','a','li','u','output','param','applet','img','embed','tr','td','allow','frameset'));
 
 }
 
 #===================================================================== TAG SUBROUTINES
 #-- <output>
-        sub start_output {
- 	    my ($target,$token) = @_;
-            $Apache::lonxml::textredirection = 1; 
-            my $result = '';
-            return $result;
-	}
-        sub end_output {
- 	    my ($target,$token) = @_;
-            $Apache::lonxml::textredirection = 0;             
-            my $result = '';
-            return $result;
-	}
+sub start_output {
+  my ($target) = @_;
+  if ($target eq 'meta') { $Apache::lonxml::metamode--; }
+  return '';
+}
+sub end_output {
+  my ($target) = @_;
+  if ($target eq 'meta') { $Apache::lonxml::metamode++; }
+  return '';
+}
 #-- <m> tag
         sub start_m {
-	    my ($target,$token,$parstack,$parser) = @_;
+	    my ($target,$token,$tagstack,$parstack,$parser) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
 		my $inside = &Apache::lonxml::get_all_text("/m",$$parser[$#$parser]); 
@@ -60,7 +58,8 @@ sub BEGIN {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = $token->[4];     
+              $currentstring = &Apache::lonxml::xmlbegin().
+                               &Apache::lonxml::fontsettings();     
 	    } 
 	   return $currentstring;
 	}
@@ -68,7 +67,7 @@ sub BEGIN {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = $token->[2];    
+		$currentstring = &Apache::lonxml::xmlend();
             } 
 	   return $currentstring;
 	}
@@ -85,7 +84,8 @@ sub BEGIN {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = $token->[2];    
+              $currentstring = &Apache::lonxml::registerurl().
+                               $token->[2];    
             } 
 	   return $currentstring;
 	}
@@ -219,10 +219,16 @@ sub BEGIN {
 	}
 #-------------------------------------------------------------------------- <meta> tag
       sub start_meta {
-	    my ($target,$token) = @_;
+	    my ($target,$token,$tagstack,$parstack,$parser) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = $token->[4];     
+	      my $args='';
+	      if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
+	      if ($args eq '') {
+		&Apache::lonxml::get_all_text("/meta",$$parser[$#$parser]);
+	      } else {
+		$currentstring = $token->[4];
+	      }
 	    }
             if ($target eq 'meta') {
 		unless ($token->[2]->{'http-equiv'}) {
@@ -238,21 +244,52 @@ sub BEGIN {
 	    }
 	   return $currentstring;
 	}
-        sub end_meta {
-	    my ($target,$token) = @_;
-            my $currentstring = '';
-            if ($target eq 'web') {
-              $currentstring = $token->[2];    
-            } 
-	   return $currentstring;
-	}
+      sub end_meta {
+	my ($target,$token,$tagstack,$parstack,$parser) = @_;
+	my $currentstring = '';
+	if ($target eq 'web') {
+	  my $args='';
+	  if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
+	  if ($args ne '') {
+	    $currentstring = $token->[4];
+	  }
+	} 
+	return $currentstring;
+      }
 #-------------------------------------------------------------------------- <body> tag
         sub start_body {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = $token->[4];     
-	    } elsif ($target eq 'tex') {
+	      if (!$Apache::lonxml::registered) {
+		$currentstring.='<head>'.&Apache::lonxml::registerurl().'</head>';
+	      }
+	      my $onLoad='';
+	      foreach my $key (keys(%{$token->[2]})) {
+		&Apache::lonxml::debug("testing $key");
+		if ($key =~ /^onload$/i) {
+		&Apache::lonxml::debug("I like $key");
+		  $onLoad.=$token->[2]->{$key}.';';
+		  delete($token->[2]->{$key});
+		}
+	      }
+	      $token->[2]->{'onLoad'}=$onLoad.&Apache::lonxml::loadevents();
+	      my $onUnload='';
+	      foreach my $key (keys(%{$token->[2]})) {
+		if ($key =~ /^onunload$/i) {
+		  $onUnload.=$token->[2]->{$key}.';';
+		  delete($token->[2]->{$key});
+		}
+	      }
+	      $token->[2]->{'onUnload'}=$onUnload.
+		&Apache::lonxml::unloadevents();
+
+	      $currentstring .= '<'.$token->[1];
+	      map {
+		$currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"';
+	      } keys %{$token->[2]};
+	      $currentstring.='>';
+       	    } elsif ($target eq 'tex') {
               $currentstring = " \\begin{document} ";  
 	    } 
 	   return $currentstring;
@@ -941,7 +978,7 @@ sub BEGIN {
            return $currentstring;
 	}
         sub end_a {
-	    my ($target,$token,$stackref) = @_;
+	    my ($target,$token,$tagstack,$stackref) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
 	       $currentstring .= $token->[2];
@@ -959,7 +996,7 @@ sub BEGIN {
 	}
 #---------------------------------------------------------------------------- <li> tag
         sub start_li {
-	    my ($target,$token,$stackref) = @_;
+	    my ($target,$token,$tagstack,$stackref) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
               $currentstring = $token->[4];     
@@ -1333,6 +1370,25 @@ sub BEGIN {
 	   return '';
 	}
 
-
+# ------------------------------------------------------------------------- Frames
+	sub start_frameset {
+	  my ($target,$token) = @_;
+	  my $currentstring = '';
+	  if ($target eq 'web') { 
+	    if (!$Apache::lonxml::registered) {
+	      $currentstring.='<head>'.&Apache::lonxml::registerurl().'</head>';
+	    }
+	    $currentstring .= $token->[4];
+	  }
+	  return $currentstring;
+	}
+        sub end_frameset {
+	  my ($target,$token) = @_;
+	  my $currentstring = '';
+	  if ($target eq 'web') {
+	    $currentstring = $token->[2];
+	  }
+	  return $currentstring;
+	}
 1;
 __END__