--- loncom/xml/londefdef.pm 2001/05/04 17:38:22 1.29 +++ loncom/xml/londefdef.pm 2001/07/03 20:58:27 1.31 @@ -11,7 +11,7 @@ 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')); } @@ -29,7 +29,7 @@ sub end_output { } #-- 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]); @@ -219,7 +219,7 @@ sub end_output { } #-------------------------------------------------------------------------- tag sub start_meta { - my ($target,$token,$parstack,$parser) = @_; + my ($target,$token,$tagstack,$parstack,$parser) = @_; my $currentstring = ''; if ($target eq 'web') { my $args=''; @@ -245,7 +245,7 @@ sub end_output { return $currentstring; } sub end_meta { - my ($target,$token,$parstack,$parser) = @_; + my ($target,$token,$tagstack,$parstack,$parser) = @_; my $currentstring = ''; if ($target eq 'web') { my $args=''; @@ -261,14 +261,17 @@ sub end_output { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web') { - $token->[2]->{'onLoad'}.=&Apache::lonxml::loadevents(); - $token->[2]->{'onUnload'}.=&Apache::lonxml::unloadevents(); - - $currentstring = '<'.$token->[1]; - map { - $currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"'; - } keys %{$token->[2]}; - $currentstring.='>'; + if (!$Apache::lonxml::registered) { + $currentstring.=''.&Apache::lonxml::registerurl().''; + } + $token->[2]->{'onLoad'}.=&Apache::lonxml::loadevents(); + $token->[2]->{'onUnload'}.=&Apache::lonxml::unloadevents(); + + $currentstring .= '<'.$token->[1]; + map { + $currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"'; + } keys %{$token->[2]}; + $currentstring.='>'; } elsif ($target eq 'tex') { $currentstring = " \\begin{document} "; } @@ -958,7 +961,7 @@ sub end_output { return $currentstring; } sub end_a { - my ($target,$token,$stackref) = @_; + my ($target,$token,$tagstack,$stackref) = @_; my $currentstring = ''; if ($target eq 'web') { $currentstring .= $token->[2]; @@ -976,7 +979,7 @@ sub end_output { } #----------------------------------------------------------------------------
  • tag sub start_li { - my ($target,$token,$stackref) = @_; + my ($target,$token,$tagstack,$stackref) = @_; my $currentstring = ''; if ($target eq 'web') { $currentstring = $token->[4]; @@ -1350,6 +1353,25 @@ sub end_output { return ''; } - +# ------------------------------------------------------------------------- Frames + sub start_frameset { + my ($target,$token) = @_; + my $currentstring = ''; + if ($target eq 'web') { + if (!$Apache::lonxml::registered) { + $currentstring.=''.&Apache::lonxml::registerurl().''; + } + $currentstring .= $token->[4]; + } + return $currentstring; + } + sub end_frameset { + my ($target,$token) = @_; + my $currentstring = ''; + if ($target eq 'web') { + $currentstring = $token->[2]; + } + return $currentstring; + } 1; __END__