--- loncom/xml/londefdef.pm 2001/03/26 20:36:10 1.23 +++ loncom/xml/londefdef.pm 2001/11/06 00:02:25 1.33 @@ -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')); } @@ -28,37 +28,42 @@ sub end_output { return ''; } #-- tag - sub start_m { - my ($target,$token,$parstack,$parser) = @_; - my $currentstring = ''; - if ($target eq 'web') { - my $inside = &Apache::lonxml::get_all_text("/m",$$parser[$#$parser]); - $inside ='\\documentstyle{article}'.$inside; -# &Apache::lonxml::debug($inside); - $currentstring = &Apache::lontexconvert::converted(\$inside); -# &Apache::lonxml::debug($currentstring); - - } elsif ($target eq 'tex') { - $currentstring = ""; - } - return $currentstring; - } - sub end_m { - my ($target,$token) = @_; - my $currentstring = ''; - if ($target eq 'web') { - } elsif ($target eq 'tex') { - $currentstring = ""; - } elsif ($target eq 'meta') { - } - return $currentstring; - } +sub start_m { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; + my $currentstring = ''; + if ($target eq 'web') { + my $inside = &Apache::lonxml::get_all_text("/m",$$parser[-1]); + $inside ='\\documentstyle{article}'.$inside; + #&Apache::lonxml::debug("M is starting with:$inside:"); + my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval); + if ($eval eq 'on') { + $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); + #&Apache::lonxml::debug("M is evaulated to:$inside:"); + } + $currentstring = &Apache::lontexconvert::converted(\$inside); + #&Apache::lonxml::debug("M is ends with:$currentstring:"); + } elsif ($target eq 'tex') { + $currentstring = ""; + } + return $currentstring; +} +sub end_m { + my ($target,$token) = @_; + my $currentstring = ''; + if ($target eq 'web') { + } elsif ($target eq 'tex') { + $currentstring = ""; + } elsif ($target eq 'meta') { + } + return $currentstring; +} #-------------------------------------------------------------------------- tag sub start_html { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring = $token->[4]; + $currentstring = &Apache::lonxml::xmlbegin(). + &Apache::lonxml::fontsettings(); } return $currentstring; } @@ -66,7 +71,7 @@ sub end_output { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring = $token->[2]; + $currentstring = &Apache::lonxml::xmlend(); } return $currentstring; } @@ -83,7 +88,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,11 +223,16 @@ sub end_output { } #-------------------------------------------------------------------------- tag sub start_meta { - my ($target,$token,$parstack,$parser) = @_; + my ($target,$token,$tagstack,$parstack,$parser) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring = &Apache::lonxml::get_all_text("/meta",$$parser[$#$parser]); - $currentstring = ''; + 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'}) { @@ -237,21 +248,50 @@ 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,$tagstack,$parstack,$parser) = @_; + 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]; - } elsif ($target eq 'tex') { + if (!$Apache::lonxml::registered) { + $currentstring.=''.&Apache::lonxml::registerurl().''; + } + my $onLoad=''; + foreach my $key (keys(%{$token->[2]})) { + if ($key =~ /^onload$/i) { + $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; @@ -940,7 +980,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]; @@ -958,7 +998,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]; @@ -1332,6 +1372,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__