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

Diff for /loncom/xml/londefdef.pm between versions 1.239 and 1.259

version 1.239, 2004/08/30 18:25:55 version 1.259, 2005/03/01 03:21:58
Line 36 Line 36
 # The C source of the Code may not be distributed by the Licensee  # The C source of the Code may not be distributed by the Licensee
 # to any other parties under any circumstances.  # to any other parties under any circumstances.
 #  #
 #  
 # last modified 06/26/00 by Alexander Sakharuk  
 # 11/6,11/30,02/01/01,5/4 Gerd Kortemeyer  
 # 01/18 Alex Sakharuk  
   
 package Apache::londefdef;   package Apache::londefdef; 
   
Line 63  sub initialize_londefdef { Line 59  sub initialize_londefdef {
     $Apache::londefdef::TD_redirection=0;      $Apache::londefdef::TD_redirection=0;
     @Apache::londefdef::table = ();      @Apache::londefdef::table = ();
     $Apache::londefdef::select=0;      $Apache::londefdef::select=0;
     @Apache::londefdef::description=();      undef(@Apache::londefdef::description);
     $Apache::londefdef::DD_redirection=0;      @Apache::londefdef::DD=(0);
     $Apache::londefdef::DT_redirection=0;      @Apache::londefdef::DT=(0);
       @Apache::londefdef::seenDT=(0);
     $Apache::londefdef::list_index=0;      $Apache::londefdef::list_index=0;
 }  }
   
Line 87  sub start_m { Line 84  sub start_m {
     my $currentstring = '';      my $currentstring = '';
     my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);      my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
     if ($target eq 'web' || $target eq 'analyze') {      if ($target eq 'web' || $target eq 'analyze') {
  $inside ='\\documentstyle{article}'.$inside;  
  &Apache::lonxml::debug("M is starting with:$inside:");   &Apache::lonxml::debug("M is starting with:$inside:");
  my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);   my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
  if ($eval eq 'on') {   if ($eval eq 'on') {
Line 109  sub start_m { Line 105  sub start_m {
     $currentstring=&Apache::run::evaluate($currentstring,$safeeval,$$parstack[-1]);      $currentstring=&Apache::run::evaluate($currentstring,$safeeval,$$parstack[-1]);
  }   }
  if ($currentstring=~/^(\s*\\\\\s*)*$/) {$currentstring = ' \vskip 0 mm ';}   if ($currentstring=~/^(\s*\\\\\s*)*$/) {$currentstring = ' \vskip 0 mm ';}
    # detect simple math mode entry exits, and convert them
           # to use \ensuremath
    if ($currentstring=~/^\s*\$[^\$].*[^\$]\$\s*$/) {
       $currentstring=~s/^\$//;
       $currentstring=~s/\$$//;
       $currentstring='\ensuremath{'.$currentstring.'}';
    }
  $Apache::lonxml::post_evaluate=0;   $Apache::lonxml::post_evaluate=0;
     }      }
     return $currentstring;      return $currentstring;
Line 151  sub start_html { Line 154  sub start_html {
     my $options=$ENV{'course.'.$ENV{'request.course.id'}.'.tthoptions'};      my $options=$ENV{'course.'.$ENV{'request.course.id'}.'.tthoptions'};
     &Apache::lontexconvert::init_tth();      &Apache::lontexconvert::init_tth();
     if ($target eq 'web' || $target eq 'edit') {      if ($target eq 'web' || $target eq 'edit') {
  $currentstring = &Apache::lonxml::xmlbegin().   $currentstring = &Apache::lonxml::xmlbegin();
     &Apache::lonxml::fontsettings();       
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  @Apache::londefdef::table = ();   @Apache::londefdef::table = ();
  $currentstring .= '\documentclass[letterpaper]{book}';   $currentstring .= '\documentclass[letterpaper]{article}';
  if ($ENV{'form.latex_type'}=~'batchmode') {$currentstring .='\batchmode';}    if (($ENV{'form.latex_type'}=~'batchmode') ||
               (!$ENV{'request.role.adv'})) {$currentstring .='\batchmode';} 
  $currentstring .= '\newcommand{\keephidden}[1]{}'.   $currentstring .= '\newcommand{\keephidden}[1]{}'.
                           '\renewcommand{\deg}{$^{\circ}$}'.                            '\renewcommand{\deg}{$^{\circ}$}'.
                           '\usepackage{longtable}'.                            '\usepackage{longtable}'.
                           '\usepackage{textcomp}'.                            '\usepackage{textcomp}'.
                           '\usepackage{makeidx}'.                            '\usepackage{makeidx}'.
                           '\usepackage[dvips]{graphicx}'.                            '\usepackage[dvips]{graphicx}'.
     '\usepackage{picins}'.
                           '\usepackage{epsfig}'.                            '\usepackage{epsfig}'.
                           '\usepackage{calc}'.                            '\usepackage{calc}'.
                           '\usepackage{amsmath}'.                            '\usepackage{amsmath}'.
Line 180  sub end_html { Line 184  sub end_html {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = &Apache::lonxml::xmlend($target,$parser);   $currentstring = '</html>';
     }      }
     return $currentstring;      return $currentstring;
 }  }
Line 190  sub start_head { Line 194  sub start_head {
     my ($target,$token) = @_;      my ($target,$token) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[4];        $currentstring = $token->[4].&Apache::lonxml::fontsettings();
     }       } 
     return $currentstring;      return $currentstring;
 }  }
Line 479  sub end_accessrule { Line 483  sub end_accessrule {
 sub start_body {  sub start_body {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
   
     if ($target eq 'web') {      if ($target eq 'web') {
  if ($Apache::lonhomework::parsing_a_problem) {   if ($Apache::lonhomework::parsing_a_problem) {
     &Apache::lonxml::warning("<body> tag found inside of <problem> tag this can cause problems.");      &Apache::lonxml::warning("<body> tag found inside of <problem> tag this can cause problems.");
Line 530  sub start_body { Line 535  sub start_body {
  $token->[2]->{'onunload'}=&Apache::lonmenu::unloadevents().   $token->[2]->{'onunload'}=&Apache::lonmenu::unloadevents().
     ';'.$onUnload;      ';'.$onUnload;
   
  $currentstring .= '<'.$token->[1];   if ($ENV{'request.state'} ne 'construct') {
       $currentstring .= '<'.$token->[1];
    }
  foreach (keys %{$token->[2]}) {   foreach (keys %{$token->[2]}) {
     $currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"';      $currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"';
  }   }
  $currentstring.='>';   if ($ENV{'request.state'} ne 'construct') {
       $currentstring.='>';
    }
  if ($ENV{'request.state'} ne 'published') {   if ($ENV{'request.state'} ne 'published') {
       my $remote=($ENV{'environment.remote'} ne 'off');
       $currentstring=&Apache::loncommon::bodytag(undef,undef,
          $currentstring,$remote);
     $currentstring.=(<<EDITBUTTON);      $currentstring.=(<<EDITBUTTON);
  <form method="post">   <form method="post">
  <input type="submit" name="editmode" accesskey="e" value="Edit" />   <input type="submit" name="editmode" accesskey="e" value="Edit" />
Line 552  EDITBUTTON Line 564  EDITBUTTON
 }  }
   
 sub end_body {  sub end_body {
     my ($target,$token) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[2];        $currentstring = &Apache::lonxml::xmlend($target,$parser);
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring = '\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent \end{document}';     $currentstring = '\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent \end{document}';  
     }       } 
Line 1454  sub start_a { Line 1466  sub start_a {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring .= $token->[4];   my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,
       undef,1);
    $currentstring=&Apache::lonenc::encrypt_ref($token,{'href'=>$href});
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $a=&Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1);   my $a=&Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1);
  my $b=&Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1);   my $b=&Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1);
Line 1698  sub start_dl { Line 1712  sub start_dl {
  $currentstring = $token->[4];        $currentstring = $token->[4];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring = '\begin{description}';   $currentstring = '\begin{description}';
  @Apache::londefdef::description=();   $Apache::londefdef::DL++;
  $Apache::londefdef::DD_redirection=0;   push(@Apache::londefdef::description,[]);
  $Apache::londefdef::DT_redirection=0;   $Apache::londefdef::DD[$Apache::londefdef::DL]=0;
    $Apache::londefdef::DT[$Apache::londefdef::DL]=0;
    $Apache::londefdef::seenDT[$Apache::londefdef::DL]=0;
     }       } 
     return $currentstring;      return $currentstring;
 }  }
Line 1711  sub end_dl { Line 1727  sub end_dl {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[2];        $currentstring = $token->[2];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  if ($Apache::londefdef::DT_redirection) {   if ($Apache::londefdef::DT[-1]) { &end_dt(@_); }
     my $data=&item_cleanup;   if ($Apache::londefdef::DD[-1]) { &end_dd(@_); }
     push @Apache::londefdef::description,'\item['.$data.']';   foreach my $element (@{$Apache::londefdef::description[-1]}) {
     $Apache::londefdef::DT_redirection=0;  
  } elsif ($Apache::londefdef::DD_redirection) {  
     $Apache::londefdef::description[-1].=&Apache::lonxml::endredirection();  
  }  
  foreach my $element (@Apache::londefdef::description) {  
     $currentstring.=' '.$element.' ';      $currentstring.=' '.$element.' ';
  }   }
  @Apache::londefdef::description=();   pop(@Apache::londefdef::description);
  $currentstring.='\end{description}';     $currentstring.='\end{description}';  
    delete($Apache::londefdef::DD[$Apache::londefdef::DL]);
    delete($Apache::londefdef::DT[$Apache::londefdef::DL]);
    delete($Apache::londefdef::seenDT[$Apache::londefdef::DL]);
    $Apache::londefdef::DL--;
     }       } 
     return $currentstring;      return $currentstring;
 }  }
Line 1734  sub start_dt { Line 1749  sub start_dt {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[4];        $currentstring = $token->[4];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  if ($Apache::londefdef::DT_redirection) {   if ($Apache::londefdef::DT[-1]) { &end_dt(@_); }
     my $data=&item_cleanup;   if ($Apache::londefdef::DD[-1]) { &end_dd(@_); }
     push @Apache::londefdef::description,'\item['.$data.']';  
     $Apache::londefdef::DT_redirection=0;  
  } elsif ($Apache::londefdef::DD_redirection) {  
     $Apache::londefdef::description[-1].=&Apache::lonxml::endredirection();  
     $Apache::londefdef::DD_redirection=0;  
  }  
  &Apache::lonxml::startredirection();   &Apache::lonxml::startredirection();
  $Apache::londefdef::DT_redirection=1;   $Apache::londefdef::DT[-1]++;
    $Apache::londefdef::seenDT[-1]=1;
     }       } 
     return $currentstring;      return $currentstring;
 }  }
Line 1754  sub end_dt { Line 1764  sub end_dt {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[2];       $currentstring = $token->[2];    
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $data=&item_cleanup;   if ($Apache::londefdef::DT[-1]) {
  push @Apache::londefdef::description,'\item['.$data.']';      my $data=&item_cleanup();
  $Apache::londefdef::DT_redirection=0;      push(@{$Apache::londefdef::description[-1]},'\item['.$data.'] \strut \vskip 0mm');
       $Apache::londefdef::DT[-1]--;
    }
     }       } 
     return $currentstring;      return $currentstring;
 }  }
Line 1775  sub start_dd { Line 1787  sub start_dd {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[4];        $currentstring = $token->[4];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  if ($Apache::londefdef::DT_redirection) {   if ($Apache::londefdef::DT[-1]) { &end_dt(@_); }
     my $data=&item_cleanup;   if ($Apache::londefdef::DD[-1]) { &end_dd(@_);}
     push @Apache::londefdef::description,'\item['.$data.']';   if (!$Apache::londefdef::seenDT[-1]) {
     $Apache::londefdef::DT_redirection=0;      push(@{$Apache::londefdef::description[-1]},'\item[\strut] \strut \vskip 0mm ');
  }   }
  $Apache::londefdef::DD_redirection=1;   push(@{$Apache::londefdef::description[-1]},'');
    $Apache::londefdef::description[-1]->[-1].=' \strut ';
    $Apache::londefdef::DD[-1]++;
  &Apache::lonxml::startredirection();   &Apache::lonxml::startredirection();
     }       } 
     return $currentstring;      return $currentstring;
Line 1792  sub end_dd { Line 1806  sub end_dd {
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[2];       $currentstring = $token->[2];    
     }  elsif ($target eq 'tex') {      }  elsif ($target eq 'tex') {
  $Apache::londefdef::description[-1].=&Apache::lonxml::endredirection();   $Apache::londefdef::description[-1]->[-1].=
  $Apache::londefdef::DD_redirection=0;      &Apache::lonxml::endredirection().' \vskip 0mm ';
    $Apache::londefdef::DD[-1]--;
     }      }
     return $currentstring;      return $currentstring;
 }  }
Line 2410  sub end_th { Line 2425  sub end_th {
 }  }
             
 #-- <img> tag (end tag forbidden)  #-- <img> tag (end tag forbidden)
   #
   #  Render the <IMG> tag.
   #     <IMG> has the following attributes (in addition to the 
   #     standard HTML ones:
   #      TeXwrap   - Governs how the tex target will try to wrap text around
   #                  horizontally aligned images.
   #      TeXwidth  - The width of the image when rendered for print (mm).
   #      TeXheight - The height of the image when rendered for print (mm)
   #         (Note there seems to also be support for this as a % of page size)
   #      
 sub start_img {  sub start_img {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,      my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,
Line 2421  sub start_img { Line 2446  sub start_img {
     $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src;      $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src;
     my $currentstring = '';      my $currentstring = '';
     my $scaling = .3;      my $scaling = .3;
   
      # Render unto browsers that which are the browser's...
   
     if ($target eq 'web') {      if ($target eq 'web') {
  if ($ENV{'browser.imagesuppress'} ne 'on') {   if ($ENV{'browser.imagesuppress'} ne 'on') {
     $currentstring.= $token->[4];      $currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src});
  } else {   } else {
     my $alttag= &Apache::lonxml::get_param      my $alttag= &Apache::lonxml::get_param
  ('alt',$parstack,$safeeval,undef,1);   ('alt',$parstack,$safeeval,undef,1);
Line 2433  sub start_img { Line 2461  sub start_img {
     }      }
     $currentstring.='[IMAGE: '.$alttag.']';      $currentstring.='[IMAGE: '.$alttag.']';
  }   }
   
    # and render unto TeX that which is LaTeX
   
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $oldSRC=$src;   #
         $oldSRC=~s/\.(gif|jpg|png)$/\.eps/;   #  The alignment will require some superstructure to be put around
  $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);   #  the \includegraphics stuff.  At present we can only partially
    #  simulate the alignments offered by html.
    #
    #
    my $align = lc(&Apache::lonxml::get_param('align', 
     $parstack,
     $safeeval,
     undef,1));
    if(!$align) {
       $align = "bottom"; # This is html's default so it's ours too.
    }
    #
    &Apache::lonxml::debug("Alignemnt = $align");
    #  LaTeX's image/text wrapping is really bad since it wants to
    #  make figures float.  
           #   The user has the optional parameter (applicable only to l/r
    # alignment to use the picins/parpic directive to get wrapped text
    # this is also imperfect.. that's why we give them a choice...
    # so they can't yell at us for our choice.
    #
    my $latex_rendering = &Apache::lonxml::get_param('TeXwrap',
       $parstack,
       $safeeval,
       undef,0);
    &Apache::lonxml::debug("LaTeX rendering = $latex_rendering");
    if(!$latex_rendering) {
       $latex_rendering = "parbox";
    }
    &Apache::lonxml::debug("LaTeX rendering = $latex_rendering");
   
  #if original gif/jpg/png file exist do following:   #if original gif/jpg/png file exist do following:
    my ($path,$file) = &get_eps_image($src);
    $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
  if (-e $src) {   if (-e $src) {
     #what is the image size?      my ($height_param,$width_param)=
     my $width_param=&image_size($src,$scaling,$parstack,$safeeval);   &image_size($src,0.3,$parstack,$safeeval);
             my ($file,$path)=&file_path($src);       $currentstring .= '\graphicspath{{'.$path.'}}'
     my $newsrc = $src;   .'\includegraphics[width='.$width_param.' mm,height='.$height_param.'mm]{'.$file.'} ';
     $newsrc =~ s/\.(gif|jpg|png)$/.eps/i;  
     my $dummy_content=&Apache::lonnet::getfile($oldSRC);      #    If there's an alignment specification we need to honor it here.
     $file=~s/\.(gif|jpg|png)$/.eps/i;      #    For the horizontal alignments, we will also honor the
     #where can we find the picture?      #    value of the latex specfication.  The default is parbox,
     if (-e $newsrc) {      #    and that's used for illegal values too.  
  #eps counterpart for image exist       #    
  if ($path) {      #    Even though we set a default alignment value, the user
     $currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';      #    could have given us an illegal value.  In that case we
       #    just use the default alignment of bottom..
       if      ($align eq "top")    {
    $currentstring = '\raisebox{-'.$height_param.'mm}{'.$currentstring.'}';
       } elsif (($align eq "center") || ($align eq "middle")) { # Being kind
    my $offset = $height_param/2;
    $currentstring = '\raisebox{-'.$offset.'mm}{'.$currentstring.'}';
       } elsif ($align eq "left")   { 
    if ($latex_rendering eq "parpic") { 
       $currentstring = '\parpic[l]{'.$currentstring.'}';
    } else {                                     # parbox rendering
       $currentstring = "\\strut\\newline\n".
    '\parbox{'.$width_param.'mm}{'.$currentstring.'}';
  }   }
     } else {      } elsif ($align eq "right")  {   
  #there is no eps counterpart for image - check for ps one   if ($latex_rendering eq "parpic") {
  $newsrc =~ s/\.eps$/\.ps/;      $currentstring = '\parpic[r]{'.$currentstring.'}';
  if (-e $newsrc) {   } else {                                 # parbox rendering. 
     #ps counterpart for image exist       $currentstring = '\parbox{'.$width_param.'mm}{\begin{flushright}'
     $file =~ s/\.eps$/\.ps/;               .$currentstring.'\end{flushright}} \newline'."\n";
     if ($path) {  
  $currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';  
     }  
  } else {  
     #care about eps dynamical generation  
     $currentstring.='\vskip 1 mm '.&eps_generation($src,$file,$width_param);  
  }   }
       } else { # Bottom is also default.
    # $currentstring = '\raisebox{'.$height_param.'mm}{'.$currentstring.'}';
     }      }
  } else {   } else {
     #original image file doesn't exist so check the alt attribute      #original image file doesn't exist so check the alt attribute
Line 2474  sub start_img { Line 2544  sub start_img {
  $alt=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],$src);   $alt=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],$src);
     }      }
   
     if ($alt) {      if ($alt) { $currentstring .= ' '.$alt.' '; }
  $currentstring .= ' '.$alt.' ';  
     } else {  
  #<allow> tag will care about replication   
     }  
  }   }
   
    # And here's where the semi-quote breaks down: allow the user
           # to edit the beast as well by rendering the problem for edit:
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $currentstring .=&Apache::edit::tag_start($target,$token);   $currentstring .=&Apache::edit::tag_start($target,$token);
  $currentstring .=&Apache::edit::text_arg('Image Url:','src',$token,70).   $currentstring .=&Apache::edit::text_arg('Image Url:','src',$token,70).
Line 2492  sub start_img { Line 2561  sub start_img {
  $currentstring .=&Apache::edit::text_arg('TeXheight (mm):','TeXheight',$token,5);   $currentstring .=&Apache::edit::text_arg('TeXheight (mm):','TeXheight',$token,5);
  $currentstring .=&Apache::edit::select_arg('Alignment:','align',   $currentstring .=&Apache::edit::select_arg('Alignment:','align',
    ['','bottom','middle','top','left','right'],$token,5);     ['','bottom','middle','top','left','right'],$token,5);
    $currentstring .=&Apache::edit::select_arg('TeXwrap:', 'TeXwrap',
      ['', 'parbox', 'parpic'], $token, 2);
  $currentstring .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();   $currentstring .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
  my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval);   my $src=    &Apache::lonxml::get_param('src',$parstack,$safeeval);
  my $alt=&Apache::lonxml::get_param('alt',$parstack,$safeeval);   my $alt=    &Apache::lonxml::get_param('alt',$parstack,$safeeval);
  my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);   my $width=  &Apache::lonxml::get_param('width',$parstack,$safeeval);
  my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval);   my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
   
   
  $currentstring .= '<img src="'.$src.'" alt="'.$alt.'" ';   $currentstring .= '<img src="'.$src.'" alt="'.$alt.'" ';
  if ($width) { $currentstring.=' width="'.$width.'" '; }   if ($width) { $currentstring.=' width="'.$width.'" '; }
  if ($height) { $currentstring.=' height="'.$height.'" '; }   if ($height) { $currentstring.=' height="'.$height.'" '; }
Line 2506  sub start_img { Line 2579  sub start_img {
     ($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'});      ($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'});
  my $ctag=&Apache::edit::get_new_args($token,$parstack,   my $ctag=&Apache::edit::get_new_args($token,$parstack,
      $safeeval,'src','alt','align',       $safeeval,'src','alt','align',
      'TeXwidth','TeXheight',       'TeXwidth','TeXheight', 'TeXwrap',
      'width','height');       'width','height');
  my ($nsrc,$nwidth,$nheight)=   my ($nsrc,$nwidth,$nheight)=
     ($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'});      ($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'});
Line 2570  sub start_applet { Line 2643  sub start_applet {
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  if ($ENV{'browser.appletsuppress'} ne 'on') {   if ($ENV{'browser.appletsuppress'} ne 'on') {
     $currentstring = $token->[4];      $currentstring = &Apache::lonenc::encrypt_ref($token,
     {'code'=>$code,
      'archive'=>$archive}
     );
  } else {   } else {
     my $alttag= &Apache::lonxml::get_param('alt',$parstack,      my $alttag= &Apache::lonxml::get_param('alt',$parstack,
    $safeeval,undef,1);     $safeeval,undef,1);
Line 2613  sub start_embed { Line 2689  sub start_embed {
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  if ($ENV{'browser.embedsuppress'} ne 'on') {   if ($ENV{'browser.embedsuppress'} ne 'on') {
     $currentstring = $token->[4];      $currentstring=&Apache::lonenc::encrypt_ref($token,{'src'=>$src});
  } else {   } else {
     my $alttag=&Apache::lonxml::get_param      my $alttag=&Apache::lonxml::get_param
  ('alt',$parstack,$safeeval,undef,1);   ('alt',$parstack,$safeeval,undef,1);
Line 2649  sub start_param { Line 2725  sub start_param {
  &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);   &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
     my $currentstring = '';      my $currentstring = '';
     if ($target eq 'web') {      if ($target eq 'web') {
  $currentstring = $token->[4];        my %toconvert;
    my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
    if ($src) { $toconvert{'src'}= $src; }
    my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval,
       undef,1);
    if ($name=~/^cabbase$/i) {
       $toconvert{'value'}=&Apache::lonxml::get_param('value',$parstack,
      $safeeval,undef,1);
    }
    $currentstring = &Apache::lonenc::encrypt_ref($token,\%toconvert);
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
     }       } 
     return $currentstring;      return $currentstring;
Line 2672  sub start_allow { Line 2757  sub start_allow {
     $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);      $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
     $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=      $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
  &Apache::lonnet::clutter($src);   &Apache::lonnet::clutter($src);
     &image_replication($src);      if ($target eq 'tex') { &image_replication($src); }
     my $result;      my $result;
     if ($target eq 'edit') {      if ($target eq 'edit') {
  $result .=&Apache::edit::tag_start($target,$token);   $result .=&Apache::edit::tag_start($target,$token);
Line 3670  sub image_replication { Line 3755  sub image_replication {
 }  }
   
 sub image_size {  sub image_size {
     my ($src,$scaling,$parstack,$safeeval)=@_;      my ($src,$scaling,$parstack,$safeeval,$depth,$cis)=@_;
     #size of image from gif/jpg/jpeg/png       #size of image from gif/jpg/jpeg/png 
       $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
     my $image = Image::Magick->new;      my $image = Image::Magick->new;
     my $current_figure = $image->Read($src);      my $current_figure = $image->Read($src);
     my $width_param = $image->Get('width') * $scaling;;      my $width_param = $image->Get('width') * $scaling;;
     my $height_param = $image->Get('height') * $scaling;;      my $height_param = $image->Get('height') * $scaling;;
     undef $image;      undef($image);
     #do we have any specified LaTeX size of the picture?      #do we have any specified LaTeX size of the picture?
     my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval);      my $toget='TeXwidth'; if ($cis) { $toget=lc($toget); }
     my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval);      my $TeXwidth = &Apache::lonxml::get_param($toget,$parstack,
         $safeeval,$depth,$cis);
       $toget='TeXheight'; if ($cis) { $toget=lc($toget); }
       my $TeXheight = &Apache::lonxml::get_param($toget,$parstack,
          $safeeval,$depth,$cis);
     #do we have any specified web size of the picture?      #do we have any specified web size of the picture?
     my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval,      my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval,
    undef,1);     $depth,1);
     if ($TeXwidth ne '') {        if ($TeXwidth) { 
    my $old_width_param=$width_param;
  if ($TeXwidth=~/(\d+)\s*\%/) {   if ($TeXwidth=~/(\d+)\s*\%/) {
     $width_param = $1*$ENV{'form.textwidth'}/100;      $width_param = $1*$ENV{'form.textwidth'}/100;
  } else {    } else { 
     $width_param = $TeXwidth;      $width_param = $TeXwidth;
  }   }
     } elsif ($TeXheight ne '') {   $height_param=$TeXwidth/$old_width_param*$height_param;
  $width_param = $TeXheight/$height_param*$width_param;      } elsif ($TeXheight) {
     } elsif ($width ne '') {   $height_param = $TeXheight;
  $width_param = $width*$scaling;         $width_param  = $TeXheight/$height_param*$width_param;
       } elsif ($width) {
    my $old_width_param=$width_param;
    $width_param = $width*$scaling;
           $height_param=$width_param/$old_width_param*$height_param;
       }
       if ($width_param > $ENV{'form.textwidth'}) {
           my $old_width_param=$width_param;
    $width_param =0.95*$ENV{'form.textwidth'};
           $height_param=$width_param/$old_width_param*$height_param;
       }
       return ($height_param, $width_param);
   }
   
   sub image_width {
       my ($height, $width) = &image_size(@_);
       return $width;
   }
   #  Not yet 100% sure this is correct in all circumstances..
   #  due to my uncertainty about mods to image_size.
   #
   sub image_height {
       my ($height, $width) = &image_size(@_);
       return $height;
   }
   
   sub get_eps_image {
       my ($src)=@_;
       my $orig_src=$src;
       $src=~s/\.(gif|png|jpg|jpeg)$/\.eps/i;
       $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
       if (! -e $src) {
    if (&Apache::lonnet::repcopy($src) ne OK ) {
       #if replication failed try to find ps file
       $src=~s/\.eps$/\.ps/;
       #if no ps file try to replicate it
       if (not -e $src &&
    &Apache::lonnet::repcopy($src) ne OK) {
    #if replication failed try to produce eps file dynamically
    $src=~s/\.ps$/\.eps/;
    my $temp_file;
    open(FILE,">>/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat");
    my $newsrc=$orig_src;
    $newsrc =~ s|(.*)/res/|/home/httpd/html/res/|;
    print FILE "$newsrc\n";
    $src=~s|/home/httpd/html/res|/home/httpd/prtspool|;
    $src=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|;
       }
    }
     }      }
     if ($width_param > $ENV{'form.textwidth'}) {$width_param =0.95*$ENV{'form.textwidth'}}      my ($path,$file)=($src=~m|(.*)/([^/]*)$|);
     return $width_param;      return ($path.'/',$file);
 }  }
   
 sub eps_generation {  sub eps_generation {
Removed from v.1.239  
changed lines
  Added in v.1.259

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