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

Diff for /loncom/xml/londefdef.pm between versions 1.251 and 1.254

version 1.251, 2005/01/19 18:20:12 version 1.254, 2005/02/09 15:56:45
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 156  sub start_html { Line 152  sub start_html {
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  @Apache::londefdef::table = ();   @Apache::londefdef::table = ();
  $currentstring .= '\documentclass[letterpaper]{article}';   $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}'.
Line 2545  sub start_img { Line 2542  sub start_img {
  if ($latex_rendering eq "parpic") {    if ($latex_rendering eq "parpic") { 
     $currentstring = '\parpic[l]{'.$currentstring.'}';      $currentstring = '\parpic[l]{'.$currentstring.'}';
  } else {                                     # parbox rendering   } else {                                     # parbox rendering
     $currentstring = '\newline'."\n".'\parbox{'.$width_param.'mm}{'.$currentstring.'}';      $currentstring = "\n".'\parbox{'.$width_param.'mm}{'.$currentstring.'}';
  }   }
     } elsif ($align eq "right")  {         } elsif ($align eq "right")  {   
  if ($latex_rendering eq "parpic") {   if ($latex_rendering eq "parpic") {
Line 3796  sub image_size { Line 3793  sub image_size {
     my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval,      my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval,
    undef,1);     undef,1);
     if ($TeXwidth ne '') {        if ($TeXwidth ne '') {  
    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;
  }   }
    $height_param=$TeXwidth/$old_width_param*$height_param;
     } elsif ($TeXheight ne '') {      } elsif ($TeXheight ne '') {
  $height_param = $TeXheight;   $height_param = $TeXheight;
  $width_param  = $TeXheight/$height_param*$width_param;   $width_param  = $TeXheight/$height_param*$width_param;
     } elsif ($width ne '') {      } elsif ($width ne '') {
    my $old_width_param=$width_param;
  $width_param = $width*$scaling;         $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;
     }      }
     if ($width_param > $ENV{'form.textwidth'}) {$width_param =0.95*$ENV{'form.textwidth'}}  
     return ($height_param, $width_param);      return ($height_param, $width_param);
 }  }
   
Removed from v.1.251  
changed lines
  Added in v.1.254

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