--- loncom/xml/londefdef.pm 2003/10/24 21:48:17 1.189 +++ loncom/xml/londefdef.pm 2003/11/09 01:19:47 1.190 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.189 2003/10/24 21:48:17 albertel Exp $ +# $Id: londefdef.pm,v 1.190 2003/11/09 01:19:47 albertel Exp $ # # # Copyright Michigan State University Board of Trustees @@ -82,11 +82,12 @@ sub end_output { } #-- tag sub start_m { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; my $currentstring = ''; + my $inside = &Apache::lonxml::get_all_text("/m",$parser,$style); + $inside=~s---g; if ($target eq 'web') { $Apache::lonxml::prevent_entity_encode++; - my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser); $inside ='\\documentstyle{article}'.$inside; &Apache::lonxml::debug("M is starting with:$inside:"); my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval); @@ -103,15 +104,13 @@ sub start_m { #&Apache::lonxml::debug("M is ends with:$currentstring:"); $Apache::lonxml::post_evaluate=0; } elsif ($target eq 'tex') { - $currentstring = &Apache::lonxml::get_all_text_unbalanced("/m",$parser); + $currentstring = $inside; my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval); if ($eval eq 'on') { $currentstring=&Apache::run::evaluate($currentstring,$safeeval,$$parstack[-1]); } if ($currentstring=~/^(\s*\\\\\s*)*$/) {$currentstring = ' \vskip 0 mm ';} $Apache::lonxml::post_evaluate=0; - } else { - my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser); } return $currentstring; }