[BACK]Return to imageresponse.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/imageresponse.pm between versions 1.66 and 1.73

version 1.66, 2005/04/19 09:20:55 version 1.73, 2005/12/01 18:46:31
Line 343  sub insert_foil { Line 343  sub insert_foil {
 $Apache::imageresponse::curname='';  $Apache::imageresponse::curname='';
 sub start_foil {  sub start_foil {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       my $result;
     if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||      if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
  $target eq 'analyze') {   $target eq 'analyze') {
  my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);   my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
  if (!$name) {   if ($name eq "") {
     &Apache::lonxml::error("Foils without names exist. This can cause problems to malfunction.");      &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");
     $name=$Apache::lonxml::curdepth;      $name=$Apache::lonxml::curdepth;
  }   }
  if (defined($Apache::response::foilnames{$name})) {   if (defined($Apache::response::foilnames{$name})) {
Line 362  sub start_foil { Line 363  sub start_foil {
     push(@{ $Apache::response::foilgroup{'names'} }, $name);      push(@{ $Apache::response::foilgroup{'names'} }, $name);
  }   }
  $Apache::imageresponse::curname=$name;   $Apache::imageresponse::curname=$name;
     }      } elsif ($target eq 'edit') {
     return '';   $result  = &Apache::edit::tag_start($target,$token);
    $result .= &Apache::edit::text_arg('Name:','name',$token);
    $result .= &Apache::edit::end_row().
       &Apache::edit::start_spanning_row();
       } elsif ($target eq 'modified') {
    my $constructtag=&Apache::edit::get_new_args($token,$parstack,
        $safeeval,'name');
    if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
       } 
       return $result;;
 }  }
   
 sub end_foil {  sub end_foil {
Line 381  sub start_text { Line 391  sub start_text {
     if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {       if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { 
  &Apache::lonxml::startredirection;    &Apache::lonxml::startredirection; 
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  my $descr=&Apache::lonxml::get_all_text('/text',$parser);   my $descr=&Apache::lonxml::get_all_text('/text',$parser,$style);
  $result=&Apache::edit::tag_start($target,$token,'Task Description').   $result=&Apache::edit::tag_start($target,$token,'Task Description').
     &Apache::edit::editfield($token->[1],$descr,'Text',60,2).      &Apache::edit::editfield($token->[1],$descr,'Text',60,2).
     &Apache::edit::end_row();      &Apache::edit::end_row();
Line 415  sub start_image { Line 425  sub start_image {
     if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {       if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { 
  &Apache::lonxml::startredirection;    &Apache::lonxml::startredirection; 
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  my $bgimg=&Apache::lonxml::get_all_text('/image',$parser);   my $bgimg=&Apache::lonxml::get_all_text('/image',$parser,$style);
  $Apache::edit::bgimgsrc=$bgimg;   $Apache::edit::bgimgsrc=$bgimg;
  $Apache::edit::bgimgsrcdepth=$Apache::lonxml::curdepth;   $Apache::edit::bgimgsrcdepth=$Apache::lonxml::curdepth;
   
Line 457  sub end_image { Line 467  sub end_image {
  $result=&Apache::edit::end_table();   $result=&Apache::edit::end_table();
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $src = &Apache::lonxml::endredirection();   my $src = &Apache::lonxml::endredirection();
  my ($path,$file) = &Apache::londefdef::get_eps_image($src);  
  my ($height_param,$width_param)=   #  There may be all sorts of whitespace on fore and aft:
     &Apache::londefdef::image_size($src,0.3,$parstack,$safeeval);  
  $Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';   $src =~ s/\s+$//s;
    $src =~ s/^\s+//s;
   
    #
    #  Gnuplot e.g. just generates the latex to put inplace.
    #
    my $graphinclude;
    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)=
    &Apache::londefdef::image_size($src,0.3,$parstack,$safeeval);
       $graphinclude = '\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'}';
    }
    $Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent '.$graphinclude;
     }       } 
     return $result;      return $result;
 }  }
Line 472  sub start_rectangle { Line 502  sub start_rectangle {
  $target eq 'analyze') {    $target eq 'analyze') { 
  &Apache::lonxml::startredirection;    &Apache::lonxml::startredirection; 
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser);   my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser,$style);
  $result=&Apache::edit::tag_start($target,$token,'Rectangle').   $result=&Apache::edit::tag_start($target,$token,'Rectangle').
     &Apache::edit::editline($token->[1],$coords,'Coordinate Pairs',40).      &Apache::edit::editline($token->[1],$coords,'Coordinate Pairs',40).
     &Apache::edit::entercoord(undef,'textnode',undef,undef,'box').      &Apache::edit::entercoord(undef,'textnode',undef,undef,'box').
Line 526  sub start_polygon { Line 556  sub start_polygon {
  $target eq 'analyze') {    $target eq 'analyze') { 
  &Apache::lonxml::startredirection;    &Apache::lonxml::startredirection; 
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  my $coords=&Apache::lonxml::get_all_text('/polygon',$parser);   my $coords=&Apache::lonxml::get_all_text('/polygon',$parser,$style);
  $result=&Apache::edit::tag_start($target,$token,'Polygon').   $result=&Apache::edit::tag_start($target,$token,'Polygon').
     &Apache::edit::editline($token->[1],$coords,'Coordinate list',40).      &Apache::edit::editline($token->[1],$coords,'Coordinate list',40).
     &Apache::edit::entercoord(undef,'textnode',undef,undef,'polygon').      &Apache::edit::entercoord(undef,'textnode',undef,undef,'polygon').
Removed from v.1.66  
changed lines
  Added in v.1.73

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>