--- loncom/xml/londefdef.pm 2002/02/26 21:44:45 1.44 +++ loncom/xml/londefdef.pm 2002/02/26 22:27:22 1.46 @@ -2,7 +2,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.44 2002/02/26 21:44:45 sakharuk Exp $ +# $Id: londefdef.pm,v 1.46 2002/02/26 22:27:22 sakharuk Exp $ # # # Copyright Michigan State University Board of Trustees @@ -1337,14 +1337,6 @@ EDITBUTTON if ($target eq 'web') { $currentstring = $token->[4]; } elsif ($target eq 'tex') { -#<<<<<<< londefdef.pm -# my $durty = $token->[2]->{'src'}; -# $durty =~ s!(^.*)/(.*)$!$1/!; -# my $durtytwo = $2; -# $currentstring = '\graphicspath{{/home/httpd/html'.$durty.'}}\fbox{\includegraphics{'.$durtytwo.'}}'; -# } -# return $currentstring; -#======= my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval); my $file; my $path; @@ -1371,7 +1363,6 @@ EDITBUTTON } } return $currentstring; -#>>>>>>> 1.43 } sub end_img { my ($target,$token) = @_; @@ -1412,8 +1403,7 @@ sub end_applet { #-- tag -sub start_embed { - +sub start_embed { my ($target,$token) = @_; $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= $token->[2]->{'src'}; @@ -1521,10 +1511,11 @@ sub start_embed { } #-- sub start_insert { - my ($target,$token) = @_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring .= ''.$token->[2]->{'display'}.'';; + my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval); + $currentstring .= ''.$display.'';; } return $currentstring; }