--- loncom/xml/londefdef.pm	2004/05/11 18:41:24	1.213
+++ loncom/xml/londefdef.pm	2004/05/21 21:06:59	1.216
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.213 2004/05/11 18:41:24 sakharuk Exp $
+# $Id: londefdef.pm,v 1.216 2004/05/21 21:06:59 matthew Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1110,7 +1110,9 @@ sub start_p {
 	    $currentstring='\makebox['.$ENV{'form.textwidth'}.']{\hfill\llap{';
 	} elsif ($align eq 'left') {
 	    $currentstring='\noindent\makebox['.$ENV{'form.textwidth'}.']{\rlap{';
-	}
+	} else {
+            $currentstring='\par ';
+        }
 	my $signal=1;#<p> does not work inside <b>...</b> 
 	foreach my $tag (@$tagstack) {if (lc($tag) eq 'b') {$signal=0;}
 	if (!$signal) {$currentstring = '';}
@@ -2269,9 +2271,10 @@ sub start_img {
     } elsif ($target eq 'tex') {
 	$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
         #if uploaded restore the path
-	if ($src=~/^\/uploaded\//) {
- 	    $src=~s/\/(\w)(\w)(\w)([^\/]*)\/simplepage\//\/$1\/$2\/$3\/$1$2$3$4\/userfiles\/simplepage\//;
-	    $src=~s/uploaded/home\/httpd\/lonUsers/;
+	if ($src=~/^\/uploaded\/([^\/]+)\/([^\/]+)\/simplepage\/([^\/]+)$/) {
+	    $src=&Apache::loncommon::propath($1,$2).'/userfiles/simplepage/'.$3;
+	} elsif ($src=~/^\/uploaded\/([^\/]+)\/([^\/]+)\/aboutme\/([^\/]+)$/) {
+	    $src=&Apache::loncommon::propath($1,$2).'/userfiles/aboutme/'.$3;
 	}
 	#if original gif/jpg/png file exist do following:
 	if (-e $src) {