--- loncom/homework/imageresponse.pm	2003/05/05 22:36:54	1.26
+++ loncom/homework/imageresponse.pm	2003/05/06 15:48:55	1.28
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # image click response style
 #
-# $Id: imageresponse.pm,v 1.26 2003/05/05 22:36:54 albertel Exp $
+# $Id: imageresponse.pm,v 1.28 2003/05/06 15:48:55 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -103,8 +103,10 @@ sub displayfoils {
   my $temp=1;
   foreach $name (@whichopt) {
     $result.=$Apache::response::foilgroup{"$name.text"};
+    &Apache::lonxml::debug("Text is $result");
     if ($target eq 'tex') {$result.="\\vskip 0 mm \n";} else {$result.="<br />\n";}
     my $image=$Apache::response::foilgroup{"$name.image"};
+    &Apache::lonxml::debug("image is $image");
     if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {
       if ($target eq 'tex') {
 	$result.=$Apache::response::foilgroup{"$name.image"}."\\vskip 0 mm \n";
@@ -170,12 +172,11 @@ sub end_foilgroup {
     if ($count>$max) { $count=$max }
     &Apache::lonxml::debug("Count is $count from $max");
     @whichopt = &whichfoils($max);
-  } elsif ($target eq 'web' || $target eq 'tex') {
-    $result=&displayfoils($target,@whichopt);
-  } elsif ($target eq 'grade') {
-    if ( defined $ENV{'form.submitted'}) {
-      &gradefoils(@whichopt);
-    }
+    if ($target eq 'web' || $target eq 'tex') {
+	$result=&displayfoils($target,@whichopt);
+    } elsif ($target eq 'grade') {
+	if ( defined $ENV{'form.submitted'}) { &gradefoils(@whichopt); }
+    } 
   } elsif ($target eq 'edit') {
       $result=&Apache::edit::end_table();
   }
@@ -281,6 +282,9 @@ sub start_image {
       &Apache::lonxml::startredirection; 
   } elsif ($target eq 'edit') {
     my $bgimg=&Apache::lonxml::get_all_text('/image',$parser);
+    $Apache::edit::bgimgsrc=$bgimg;
+    $Apache::edit::bgimgsrcdepth=$Apache::lonxml::curdepth;
+
     $result=&Apache::edit::tag_start($target,$token,'Clickable Image').
 	&Apache::edit::editline($token->[1],$bgimg,'Image Source File',40);
     $result.=&Apache::edit::browse(undef,'textnode').' ';
@@ -356,8 +360,8 @@ sub end_image {
 	$path = $1.'/'; 
     }
     my $newsrc = $src;
-    $newsrc =~ s/(\.gif|\.jpg)$/\.eps/i;
-    $file=~s/(\.gif|\.jpg)$/\.eps/i;
+    $newsrc =~ s/(\.gif|\.jpg|\.jpeg)$/\.eps/i;
+    $file=~s/(\.gif|\.jpg|\.jpeg)$/\.eps/i;
     #do we have any specified size of the picture?
     my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval); 
     my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval); 
@@ -394,6 +398,7 @@ sub start_rectangle {
     my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser);
     $result=&Apache::edit::tag_start($target,$token,'Rectangle').
 	&Apache::edit::editline($token->[1],$coords,'Coordinate Pairs',40).
+        &Apache::edit::entercoordpair(undef,'textnode').
         &Apache::edit::end_row();
   } elsif ($target eq "modified") {
     my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser);