--- loncom/xml/lonxml.pm	2000/07/14 19:11:03	1.10
+++ loncom/xml/lonxml.pm	2000/08/03 18:24:24	1.15
@@ -8,6 +8,7 @@ package Apache::lonxml;
 use strict;
 use HTML::TokeParser;
 use Safe;
+use Opcode;
 
 sub register {
   my $space;
@@ -18,7 +19,7 @@ sub register {
     $Apache::lonxml::alltags{$temptag}=$space;
   }
 }
-
+                                     
 use Apache::style;
 use Apache::lontexconvert;
 use Apache::run;
@@ -35,6 +36,7 @@ sub xmlparse {
  my $newarg = '';
  my $safeeval = new Safe;
  $safeeval->permit("entereval");
+ $safeeval->permit(":base_math");
 #-------------------- Redefinition of the target in the case of compound target
 
  ($target, my @tenta) = split('&&',$target);
@@ -58,44 +60,16 @@ sub xmlparse {
      push (@parstack,&parstring($token));
      
      if (exists $style_for_target{$token->[1]}) {
-       #basically recurse, but we never got more than one level down so just 
-       #create the new context here
-       my @innerstack = (); 
-       my @innerparstack = ();
-       # use style file definition
-       $newarg = $style_for_target{$token->[1]};       
-       my $pat = HTML::TokeParser->new(\$newarg);
-       my $tokenpat = '';
-       my $partstring = '';
-
-       while  ($tokenpat = $pat->get_token) {
-	 if ($tokenpat->[0] eq 'T') {
-	   $partstring = $tokenpat->[1];
-	 } elsif ($tokenpat->[0] eq 'S') {
-	   push (@innerstack,$tokenpat->[1]);
-	   push (@innerparstack,&parstring($tokenpat));
-	   $partstring = &callsub("start_$tokenpat->[1]", 
-				  $target, $tokenpat, \@innerparstack,
-				  $pat, $safeeval);
-	 } 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);
-	 }
-	 #pass both the variable to the style tag, and the tag we 
-	 #are processing inside the <definedtag>
-	 $finaloutput .= &Apache::run::evaluate($partstring,$safeeval,
-		$parstack[$#parstack].$innerparstack[$#innerparstack]);
-	 if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack; }
-       }
+       $finaloutput .= &recurse($style_for_target{$token->[1]},
+				$target,$safeeval,\%style_for_target,
+				@parstack);
      } else {
        my $result = &callsub("start_$token->[1]", $target, $token,\@parstack,
-			     $pars, $safeeval);
-       $finaloutput .= &Apache::run::evaluate($result,$safeeval,
-					      $parstack[$#parstack]);
+			     $pars, $safeeval, \%style_for_target);
+       if ($result ne "" ) {
+	 $finaloutput .= &Apache::run::evaluate($result,$safeeval,
+						$parstack[$#parstack]);
+       }
      }              
    } elsif ($token->[0] eq 'E')  {
      #clear out any tags that didn't end
@@ -103,41 +77,16 @@ sub xmlparse {
 	    && ($#stack > 0)) {pop @stack;pop @parstack;}
 
      if (exists $style_for_target{'/'."$token->[1]"}) {
-       my @innerstack = (); 
-       my @innerparstack = ();
-       $newarg = $style_for_target{'/'."$token->[1]"};
-       my $pat = HTML::TokeParser->new(\$newarg);
-       my $tokenpat;
-       my $partstring = '';
-       
-       while  ($tokenpat = $pat->get_token) {
-	 if ($tokenpat->[0] eq 'T') {
-	   $partstring .= $tokenpat->[1];
-	 } elsif ($tokenpat->[0] eq 'S') {
-	   push (@innerstack,$tokenpat->[1]);
-	   push (@innerparstack,&parstring($tokenpat));
-	   $partstring = &callsub("start_$tokenpat->[1]", 
-				  $target, $tokenpat, \@innerparstack,
-				  $pat, $safeeval);
-	 } 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);
-	 }
-	 #pass both the variable to the style tag, and the tag we 
-	 #are processing inside the <definedtag>
-	 $finaloutput .= &Apache::run::evaluate($partstring,$safeeval,
-		$parstack[$#parstack].$innerparstack[$#innerparstack]);
-	 if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack; }
-       }
+       $finaloutput .= &recurse($style_for_target{'/'."$token->[1]"},
+			       $target,$safeeval,\%style_for_target,
+				@parstack);
      } else {
        my $result = &callsub("end_$token->[1]", $target, $token, \@parstack,
-			     $pars,$safeeval);
-       $finaloutput .= &Apache::run::evaluate($result,$safeeval,
-					      $parstack[$#parstack]);
+			     $pars,$safeeval, \%style_for_target);
+       if ($result ne "") {
+	 $finaloutput .= &Apache::run::evaluate($result,$safeeval,
+						$parstack[$#parstack]);
+       }
      }
      pop @stack; 
      pop @parstack;
@@ -146,15 +95,52 @@ sub xmlparse {
  return $finaloutput;
 }
 
+sub recurse {
+  
+  my @innerstack = (); 
+  my @innerparstack = ();
+  my ($newarg,$target,$safeeval,$style_for_target,@parstack) = @_;
+  my $pat = HTML::TokeParser->new(\$newarg);
+  my $tokenpat;
+  my $partstring = '';
+  my $output='';
+  while  ($tokenpat = $pat->get_token) {
+    if ($tokenpat->[0] eq 'T') {
+      $partstring = $tokenpat->[1];
+    } elsif ($tokenpat->[0] eq 'S') {
+      push (@innerstack,$tokenpat->[1]);
+      push (@innerparstack,&parstring($tokenpat));
+      $partstring = &callsub("start_$tokenpat->[1]", 
+			     $target, $tokenpat, \@innerparstack,
+			     $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, $style_for_target);
+    }
+    #pass both the variable to the style tag, and the tag we 
+    #are processing inside the <definedtag>
+    if ( $partstring ne "" ) {
+      $output .= &Apache::run::evaluate($partstring,$safeeval,
+                  $parstack[$#parstack].$innerparstack[$#innerparstack]);
+    }
+    if ($tokenpat->[0] eq 'E') { pop @innerstack;pop @innerparstack; }
+  }
+  return $output;
+}
+
 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])) {
@@ -176,3 +162,8 @@ sub parstring {
 }
 1;
 __END__
+
+
+
+
+