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

Diff for /loncom/xml/londefdef.pm between versions 1.347 and 1.348

version 1.347, 2006/12/18 11:17:46 version 1.348, 2006/12/19 22:30:52
Line 2890  sub start_img { Line 2890  sub start_img {
  } elsif ($latex_rendering eq "parbox") {   } elsif ($latex_rendering eq "parbox") {
     $currentstring = '\begin{minipage}[l]{'.$width_param.'mm}'      $currentstring = '\begin{minipage}[l]{'.$width_param.'mm}'
  .$currentstring.'\end{minipage}';   .$currentstring.'\end{minipage}';
  } else {                                     # wrapfig render   } elsif ($latex_rendering eq "wrapfigure"
     $currentstring = '\begin{wrapfigure}{l}{'.$width_param.'mm}'   || $latexrendering ne 'none') {  # wrapfig render
       $currentstring = 
    '\begin{wrapfigure}{l}{'.$width_param.'mm}'
  .'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';   .'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';
  }   }
     } elsif ($align eq "right")  {         } elsif ($align eq "right")  {   
Line 2900  sub start_img { Line 2902  sub start_img {
  } elsif ($latex_rendering eq "parbox") {   } elsif ($latex_rendering eq "parbox") {
     $currentstring =  '\begin{minipage}[r]{'.$width_param.'mm}'      $currentstring =  '\begin{minipage}[r]{'.$width_param.'mm}'
  .$currentstring.'\end{minipage}';   .$currentstring.'\end{minipage}';
  } else {                                 # wrapfig rendering   } elsif ($latex_rendering eq "wrapfigure"
     $currentstring = '\begin{wrapfigure}{r}{'.$width_param.'mm}'   || $latexrendering ne 'none') {  # wrapfig render
       $currentstring = 
    '\begin{wrapfigure}{r}{'.$width_param.'mm}'
  .'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';   .'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';
   
  }   }
     } else { # Bottom is also default.      } else { # Bottom is also default.
  # $currentstring = '\raisebox{'.$height_param.'mm}{'.$currentstring.'}';   # $currentstring = '\raisebox{'.$height_param.'mm}{'.$currentstring.'}';
Line 2935  sub start_img { Line 2938  sub start_img {
  $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',   $currentstring .=&Apache::edit::select_arg('TeXwrap:', 'TeXwrap',
    ['', 'parbox', 'parpic', 'wrapfigure'], $token, 2);     ['', 'none','parbox', 'parpic', 'wrapfigure'], $token, 2);
  $currentstring .=&Apache::edit::select_arg('Encrypt URL:','encrypturl',   $currentstring .=&Apache::edit::select_arg('Encrypt URL:','encrypturl',
    ['no','yes'], $token, 2);     ['no','yes'], $token, 2);
  $currentstring .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();   $currentstring .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
Removed from v.1.347  
changed lines
  Added in v.1.348

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