--- loncom/xml/scripttag.pm 2001/01/10 14:12:03 1.30 +++ loncom/xml/scripttag.pm 2001/01/10 16:53:07 1.31 @@ -10,8 +10,7 @@ use Apache::lonnet; sub BEGIN { &Apache::lonxml::register('Apache::scripttag',('script','scriptlib', 'parserlib','import', - 'window','meta')); - 'footnote','display')); + 'window','meta','display')); } sub start_script { @@ -130,34 +129,29 @@ sub end_parserlib { sub start_window { my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; my $result = ''; - if ($target eq 'web') { - $Apache::lonxml::redirection = 0; - } elsif ($target eq 'tex') { - $result = '\footnote{'; - } + if ($target eq 'web') { + $Apache::lonxml::redirection = 0; + } return $result; } sub end_window { my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; my $result; - if ($target eq 'web') { - $Apache::lonxml::outputstack =~ s/\"/\"\;/g; - $result = "newwindow $Apache::lonxml::outputstack \');newWindow.document.close();void(0);\">*"; - $Apache::lonxml::outputstack = ""; - $Apache::lonxml::redirection = 1; - } elsif ($target eq 'tex') { - $result = '}'; + if ($target eq 'web') { + $Apache::lonxml::outputstack =~ s/\"/\"\;/g; + $result = "newwindow $Apache::lonxml::outputstack \');newWindow.document.close();void(0);\">*"; + $Apache::lonxml::outputstack = ""; + $Apache::lonxml::redirection = 1; } else { - $result = ''; + $result = ''; } return $result; } sub start_import { my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; - my $bodytext=&Apache::lonxml::get_all_text("/import",$$parser[$#$parser]); -# my $bodytext=$$parser[$#$parser]->get_text("/import"); + my $bodytext=$$parser[$#$parser]->get_text("/import"); my $result =""; $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);