--- loncom/xml/londefdef.pm 2001/03/27 17:50:38 1.26 +++ 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,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]); @@ -58,7 +58,8 @@ sub end_output { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring = $token->[4]; + $currentstring = &Apache::lonxml::xmlbegin(). + &Apache::lonxml::fontsettings(); } return $currentstring; } @@ -66,7 +67,7 @@ sub end_output { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring = $token->[2]; + $currentstring = &Apache::lonxml::xmlend(); } return $currentstring; } @@ -83,7 +84,8 @@ sub end_output { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring = $token->[2]; + $currentstring = &Apache::lonxml::registerurl(). + $token->[2]; } return $currentstring; } @@ -217,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=''; @@ -243,7 +245,7 @@ sub end_output { return $currentstring; } sub end_meta { - my ($target,$token) = @_; + my ($target,$token,$tagstack,$parstack,$parser) = @_; my $currentstring = ''; if ($target eq 'web') { my $args=''; @@ -259,8 +261,35 @@ sub end_output { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring = $token->[4]; - } elsif ($target eq 'tex') { + if (!$Apache::lonxml::registered) { + $currentstring.=''.&Apache::lonxml::registerurl().''; + } + 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; @@ -949,7 +978,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]; @@ -967,7 +996,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]; @@ -1341,6 +1370,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__