[LON-CAPA-cvs] cvs: loncom /xml londefdef.pm

[sakharuk]

sakharuk		Fri Aug  1 09:35:20 2003 EDT

  Modified files:              
    /loncom/xml	londefdef.pm 
  Log:
  Corrected <p> tag according Guy's note.
  
  
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.157 loncom/xml/londefdef.pm:1.158
--- loncom/xml/londefdef.pm:1.157	Thu Jul 31 17:00:55 2003
+++ loncom/xml/londefdef.pm	Fri Aug  1 09:35:20 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.157 2003/07/31 21:00:55 sakharuk Exp $
+# $Id: londefdef.pm,v 1.158 2003/08/01 13:35:20 sakharuk Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1084,7 +1084,7 @@
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	my $signal=1;
-	foreach my $tag (@$tagstack) {if ($tag eq 'b') {$signal=0;}}
+	foreach my $tag (@$tagstack) {if (lc($tag) eq 'b') {$signal=0;}}
 	if ($signal) {$currentstring .= '\par ';}
     }
     return $currentstring;
@@ -1971,10 +1971,9 @@
     my $width_param = '';
     my $height_param = '';
     my $scaling = .3;
-    
     if ($target eq 'web') {
 	if ($ENV{'browser.imagesuppress'} ne 'on') {
-	    $currentstring = $token->[4];
+	    $currentstring.= $token->[4];
 	} else {
 	    my $alttag= &Apache::lonxml::get_param
 		('alt',$parstack,$safeeval,undef,1);
@@ -1982,12 +1981,11 @@
 		$alttag=&Apache::lonmeta::alttag
 		    ($Apache::lonxml::pwd[-1],$src);
 	    }
-	    $currentstring='[IMAGE: '.$alttag.']';
+	    $currentstring.='[IMAGE: '.$alttag.']';
 	}
     } elsif ($target eq 'tex') {
 	$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
 	&image_replication($src);
-	
 	#if original gif/jpg/png file exist do following:
 	if (-e $src) {          
 	    #defines the default size of image