--- loncom/xml/londefdef.pm 2001/03/26 15:42:05 1.22 +++ loncom/xml/londefdef.pm 2001/03/27 17:50:38 1.26 @@ -217,10 +217,16 @@ sub end_output { } #-------------------------------------------------------------------------- tag sub start_meta { - my ($target,$token) = @_; + my ($target,$token,$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'}) { @@ -236,20 +242,24 @@ sub end_output { } 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) = @_; + my $currentstring = ''; + if ($target eq 'web') { + my $args=''; + if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } + if ($args ne '') { + $currentstring = $token->[4]; + } + } + return $currentstring; + } #-------------------------------------------------------------------------- tag sub start_body { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring = $token->[4]; + $currentstring = $token->[4]; } elsif ($target eq 'tex') { $currentstring = " \\begin{document} "; }