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

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

version 1.348, 2006/12/19 22:30:52 version 1.351, 2007/01/17 10:09:26
Line 1559  sub start_a { Line 1559  sub start_a {
  my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,   my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,
     undef,1);      undef,1);
  $currentstring=&Apache::lonenc::encrypt_ref($token,{'href'=>$href});   $currentstring=&Apache::lonenc::encrypt_ref($token,{'href'=>$href});
     } elsif ($target eq 'tex') {  
  my $a=&Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1);  
  my $b=&Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1);  
  if ($a=~/\S/) {  
     $a=~s/([^\\])%/$1\\\%/g;  
     $currentstring .= '\ref{URI: '.$a.'}';  
  } elsif ($b=~/\S/) {  
     $currentstring .= '\ref{Anchor: '.$b.'}';  
  } else {  
     $currentstring.='';  
  }  
     }      }
     return $currentstring;      return $currentstring;
 }  }
Line 1580  sub end_a { Line 1569  sub end_a {
     if ($target eq 'web' || $target eq 'webgrade') {      if ($target eq 'web' || $target eq 'webgrade') {
  $currentstring .= $token->[2];   $currentstring .= $token->[2];
     }      }
       if ($target eq 'tex') {
    my $a=&Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1);
    my $b=&Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1);
    if ($a=~/\S/) {
       $a=~s/([^\\])%/$1\\\%/g;
       $currentstring .= ' ({\tt URI:'.&Apache::lonxml::latex_special_symbols($a).'})';
    } elsif ($b=~/\S/) {
       $currentstring .= ' ({\tt Anchor:'.&Apache::lonxml::latex_special_symbols($b).'})';
    } else {
       $currentstring.='';
    }
       }
     return $currentstring;      return $currentstring;
 }  }
   
Line 2251  sub end_table { Line 2252  sub end_table {
     }      }
     $have_rowspan++;      $have_rowspan++;
     $output .= '\multirow{'.$rowspan.'}[0]{*}{';      $output .= '\multirow{'.$rowspan.'}[0]{*}{';
       
       $Apache::londefdef::table[-1]{'content'}[$in][$jn] =~
    s{^\s*\\par\s*}{};
       $Apache::londefdef::table[-1]{'content'}[$in][$jn] =~
    s{\s*\\vskip\s*0pt\s*$}{};
   
     #      #
     # If we did not throw in a multicolumn to align, then add       # If we did not throw in a multicolumn to align, then add 
     # an extra {      # an extra {
Line 2891  sub start_img { Line 2898  sub start_img {
     $currentstring = '\begin{minipage}[l]{'.$width_param.'mm}'      $currentstring = '\begin{minipage}[l]{'.$width_param.'mm}'
  .$currentstring.'\end{minipage}';   .$currentstring.'\end{minipage}';
  } elsif ($latex_rendering eq "wrapfigure"   } elsif ($latex_rendering eq "wrapfigure"
  || $latexrendering ne 'none') {  # wrapfig render   || $latex_rendering ne 'none') {  # wrapfig render
     $currentstring =       $currentstring = 
  '\begin{wrapfigure}{l}{'.$width_param.'mm}'   '\begin{wrapfigure}{l}{'.$width_param.'mm}'
  .'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';   .'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';
Line 2903  sub start_img { Line 2910  sub start_img {
     $currentstring =  '\begin{minipage}[r]{'.$width_param.'mm}'      $currentstring =  '\begin{minipage}[r]{'.$width_param.'mm}'
  .$currentstring.'\end{minipage}';   .$currentstring.'\end{minipage}';
  } elsif ($latex_rendering eq "wrapfigure"   } elsif ($latex_rendering eq "wrapfigure"
  || $latexrendering ne 'none') {  # wrapfig render   || $latex_rendering ne 'none') {  # wrapfig render
     $currentstring =       $currentstring = 
  '\begin{wrapfigure}{r}{'.$width_param.'mm}'   '\begin{wrapfigure}{r}{'.$width_param.'mm}'
  .'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';   .'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';
Removed from v.1.348  
changed lines
  Added in v.1.351

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