--- loncom/xml/lonxml.pm	2000/07/25 21:28:22	1.13
+++ loncom/xml/lonxml.pm	2000/08/02 16:47:53	1.14
@@ -78,14 +78,14 @@ sub xmlparse {
 	   push (@innerparstack,&parstring($tokenpat));
 	   $partstring = &callsub("start_$tokenpat->[1]", 
 				  $target, $tokenpat, \@innerparstack,
-				  $pat, $safeeval);
+				  $pat, $safeeval, \%style_for_target);
 	 } elsif ($tokenpat->[0] eq 'E') {
 	   #clear out any tags that didn't end
 	   while ($tokenpat->[1] ne $innerstack[$#innerstack] 
 		  && ($#innerstack > 0)) {pop @innerstack;pop @innerparstack;}
 	   $partstring = &callsub("end_$tokenpat->[1]",
 				  $target, $tokenpat, \@innerparstack,
-				  $pat, $safeeval);
+				  $pat, $safeeval, \%style_for_target);
 	 }
 	 #pass both the variable to the style tag, and the tag we 
 	 #are processing inside the <definedtag>
@@ -97,7 +97,7 @@ sub xmlparse {
        }
      } else {
        my $result = &callsub("start_$token->[1]", $target, $token,\@parstack,
-			     $pars, $safeeval);
+			     $pars, $safeeval, \%style_for_target);
        if ($result ne "" ) {
 	 $finaloutput .= &Apache::run::evaluate($result,$safeeval,
 						$parstack[$#parstack]);
@@ -124,14 +124,14 @@ sub xmlparse {
 	   push (@innerparstack,&parstring($tokenpat));
 	   $partstring = &callsub("start_$tokenpat->[1]", 
 				  $target, $tokenpat, \@innerparstack,
-				  $pat, $safeeval);
+				  $pat, $safeeval, \%style_for_target);
 	 } elsif ($tokenpat->[0] eq 'E') {
 	   #clear out any tags that didn't end
 	   while ($tokenpat->[1] ne $innerstack[$#innerstack] 
 		  && ($#innerstack > 0)) {pop @innerstack;pop @innerparstack;}
 	   $partstring = &callsub("end_$tokenpat->[1]",
 				  $target, $tokenpat, \@innerparstack,
-				  $pat, $safeeval);
+				  $pat, $safeeval, \%style_for_target);
 	 }
 	 #pass both the variable to the style tag, and the tag we 
 	 #are processing inside the <definedtag>
@@ -143,7 +143,7 @@ sub xmlparse {
        }
      } else {
        my $result = &callsub("end_$token->[1]", $target, $token, \@parstack,
-			     $pars,$safeeval);
+			     $pars,$safeeval, \%style_for_target);
        if ($result ne "") {
 	 $finaloutput .= &Apache::run::evaluate($result,$safeeval,
 						$parstack[$#parstack]);
@@ -157,14 +157,14 @@ sub xmlparse {
 }
 
 sub callsub {
-  my ($sub,$target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($sub,$target,$token,$parstack,$parser,$safeeval,$style)=@_;
   my $currentstring='';
   {
     no strict 'refs';
     if (my $space=$Apache::lonxml::alltags{$token->[1]}) {
       #print "Calling sub $sub in $space \n";
       $sub="$space\:\:$sub";
-      $currentstring = &$sub($target,$token,\@$parstack,$parser,$safeeval);
+      $currentstring = &$sub($target,$token,\@$parstack,$parser,$safeeval,$style);
     } else {
       #print "NOT Calling sub $sub\n";
       if (defined($token->[4])) {