--- loncom/xml/londefdef.pm 2001/06/02 03:59:59 1.30 +++ loncom/xml/londefdef.pm 2001/11/06 00:02:25 1.33 @@ -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,31 +28,35 @@ sub end_output { return ''; } #-- tag - sub start_m { - my ($target,$token,$tagstack,$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) = @_; @@ -261,14 +265,32 @@ 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().''; + } + 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} "; } @@ -1350,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__