--- loncom/homework/imageresponse.pm 2005/05/10 11:24:01 1.68 +++ loncom/homework/imageresponse.pm 2005/06/22 12:03:23 1.72 @@ -2,7 +2,7 @@ # The LearningOnline Network with CAPA # image click response style # -# $Id: imageresponse.pm,v 1.68 2005/05/10 11:24:01 foxr Exp $ +# $Id: imageresponse.pm,v 1.72 2005/06/22 12:03:23 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -347,8 +347,8 @@ sub start_foil { if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' || $target eq 'analyze') { my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); - if (!$name) { - &Apache::lonxml::error("Foils without names exist. This can cause problems to malfunction."); + if ($name eq "") { + &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction."); $name=$Apache::lonxml::curdepth; } if (defined($Apache::response::foilnames{$name})) { @@ -470,15 +470,20 @@ sub end_image { # There may be all sorts of whitespace on fore and aft: - $src =~ s/\s+$//; - $src =~ s/^\s+//; + $src =~ s/\s+$//s; + $src =~ s/^\s+//s; # # Gnuplot e.g. just generates the latex to put inplace. # my $graphinclude; - if ($src =~ /^\\graphicspath/) { + if ($src =~ /^%DYNAMICIMAGE/) { + # This is needed because the newline is not always passed -> tex. + # At present we don't care about the sizing info. + + my ($commentline, $restofstuff) = split(/\n/, $src); $graphinclude = $src; + $graphinclude =~ s/^$commentline//; } else { my ($path,$file) = &Apache::londefdef::get_eps_image($src); my ($height_param,$width_param)=