--- loncom/xml/londefdef.pm	2001/02/01 18:50:43	1.19
+++ loncom/xml/londefdef.pm	2001/03/26 20:36:10	1.23
@@ -11,24 +11,22 @@ use Apache::lonxml;
 
 sub BEGIN {
 
-    &Apache::lonxml::register('Apache::londefdef',('m','html','head','map','applet','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'));
 
 }
 
 #===================================================================== 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) = @_;
@@ -219,10 +217,11 @@ sub BEGIN {
 	}
 #-------------------------------------------------------------------------- <meta> tag
       sub start_meta {
-	    my ($target,$token) = @_;
+	    my ($target,$token,$parstack,$parser) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = $token->[4];     
+              $currentstring = &Apache::lonxml::get_all_text("/meta",$$parser[$#$parser]);     
+              $currentstring = '';
 	    }
             if ($target eq 'meta') {
 		unless ($token->[2]->{'http-equiv'}) {
@@ -242,7 +241,7 @@ sub BEGIN {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = $token->[2];    
+#              $currentstring = $token->[2];    
             } 
 	   return $currentstring;
 	}
@@ -251,7 +250,7 @@ sub BEGIN {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = $token->[4];     
+#              $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
               $currentstring = " \\begin{document} ";  
 	    } 
@@ -1298,7 +1297,7 @@ sub BEGIN {
                       $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
 					     $token->[2]->{'value'};
             }   
-            $Apache::lonxml::extlinks[$Apache::lonxml::extlinks+1]=   
+            $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=   
                                         $token->[2]->{'src'};
             my $currentstring = '';
             if ($target eq 'web') {
@@ -1324,7 +1323,7 @@ sub BEGIN {
         sub start_allow {
 	    my ($target,$token) = @_;
 
-            $Apache::lonxml::extlinks[$Apache::lonxml::extlinks+1]=   
+            $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=   
                                         $token->[2]->{'src'};
 
 	   return '';