--- loncom/xml/londefdef.pm 2000/10/26 14:01:40 1.6 +++ loncom/xml/londefdef.pm 2001/11/06 00:02:25 1.33 @@ -2,6 +2,7 @@ # Tags Default Definition Module # # last modified 06/26/00 by Alexander Sakharuk +# 11/6,11/30,02/01/01,5/4 Gerd Kortemeyer package Apache::londefdef; @@ -9,46 +10,60 @@ use strict; use Apache::lonxml; sub BEGIN { - &Apache::lonxml::register('Apache::londefdef',('m','html','head','map','applet','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')); + + &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')); + } #===================================================================== TAG SUBROUTINES +#-- +sub start_output { + my ($target) = @_; + if ($target eq 'meta') { $Apache::lonxml::metamode--; } + return ''; +} +sub end_output { + my ($target) = @_; + if ($target eq 'meta') { $Apache::lonxml::metamode++; } + return ''; +} #-- tag - sub start_m { - my ($target,$token,$parstack,$parser) = @_; - my $currentstring = ''; - if ($target eq 'meta') { - my $inside = &Apache::lonxml::get_all_text("/m",$$parser[$#$parser]); - $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; } @@ -56,7 +71,7 @@ sub BEGIN { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring = $token->[2]; + $currentstring = &Apache::lonxml::xmlend(); } return $currentstring; } @@ -73,7 +88,8 @@ sub BEGIN { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring = $token->[2]; + $currentstring = &Apache::lonxml::registerurl(). + $token->[2]; } return $currentstring; } @@ -94,23 +110,7 @@ sub BEGIN { } return $currentstring; } -#------------------------------------------------------------------------ tag - sub start_applet { - my ($target,$token) = @_; - my $currentstring = ''; - if ($target eq 'web') { - $currentstring = $token->[4]; - } - return $currentstring; - } - sub end_applet { - my ($target,$token) = @_; - my $currentstring = ''; - if ($target eq 'web') { - $currentstring = $token->[2]; - } - return $currentstring; - } + #------------------------------------------------------------------------