Diff for /loncom/xml/londefdef.pm between versions 1.213 and 1.216

version 1.213, 2004/05/11 18:41:24 version 1.216, 2004/05/21 21:06:59
Line 1110  sub start_p { Line 1110  sub start_p {
     $currentstring='\makebox['.$ENV{'form.textwidth'}.']{\hfill\llap{';      $currentstring='\makebox['.$ENV{'form.textwidth'}.']{\hfill\llap{';
  } elsif ($align eq 'left') {   } elsif ($align eq 'left') {
     $currentstring='\noindent\makebox['.$ENV{'form.textwidth'}.']{\rlap{';      $currentstring='\noindent\makebox['.$ENV{'form.textwidth'}.']{\rlap{';
  }   } else {
               $currentstring='\par ';
           }
  my $signal=1;#<p> does not work inside <b>...</b>    my $signal=1;#<p> does not work inside <b>...</b> 
  foreach my $tag (@$tagstack) {if (lc($tag) eq 'b') {$signal=0;}   foreach my $tag (@$tagstack) {if (lc($tag) eq 'b') {$signal=0;}
  if (!$signal) {$currentstring = '';}   if (!$signal) {$currentstring = '';}
Line 2269  sub start_img { Line 2271  sub start_img {
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);   $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
         #if uploaded restore the path          #if uploaded restore the path
  if ($src=~/^\/uploaded\//) {   if ($src=~/^\/uploaded\/([^\/]+)\/([^\/]+)\/simplepage\/([^\/]+)$/) {
      $src=~s/\/(\w)(\w)(\w)([^\/]*)\/simplepage\//\/$1\/$2\/$3\/$1$2$3$4\/userfiles\/simplepage\//;      $src=&Apache::loncommon::propath($1,$2).'/userfiles/simplepage/'.$3;
     $src=~s/uploaded/home\/httpd\/lonUsers/;   } elsif ($src=~/^\/uploaded\/([^\/]+)\/([^\/]+)\/aboutme\/([^\/]+)$/) {
       $src=&Apache::loncommon::propath($1,$2).'/userfiles/aboutme/'.$3;
  }   }
  #if original gif/jpg/png file exist do following:   #if original gif/jpg/png file exist do following:
  if (-e $src) {   if (-e $src) {

Removed from v.1.213  
changed lines
  Added in v.1.216


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