--- loncom/lonmaxima 2007/08/02 13:04:55 1.31 +++ loncom/lonmaxima 2007/08/03 18:18:05 1.32 @@ -3,7 +3,7 @@ # The LearningOnline Network with CAPA # Connect to MAXIMA CAS # -# $Id: lonmaxima,v 1.31 2007/08/02 13:04:55 bisitz Exp $ +# $Id: lonmaxima,v 1.32 2007/08/03 18:18:05 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -341,18 +341,22 @@ sub getmaximaoutput { } $output =~ s/\r+//g; # Remove Windows-style linebreaks my $foundoutput=0; + my $found_label=0; my $realoutput=''; foreach my $line (split(/\n/,$output)) { if ($line=~/\;/) { $foundoutput=1; next; } if (!$foundoutput) { next; } if ($line=~/^Incorrect syntax:/) { $syntaxerr = 1; next; } - if ( $line=~ /^(\(\%o\d+\))(.+)$/){ + if ($line=~ /^(\(\%o\d+\))(.+)$/){ my $label = $1; $line = $2; $label =~s/\S/ /g; $line=$label.$line; + $found_label=1; + } + if ($found_label) { + $realoutput.=$line."\n"; } - $realoutput.=$line."\n"; } if (wantarray) { return ($realoutput,$syntaxerr);