--- loncom/homework/structuretags.pm	2003/08/04 22:40:03	1.200
+++ loncom/homework/structuretags.pm	2003/08/11 20:05:53	1.201
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.200 2003/08/04 22:40:03 albertel Exp $
+# $Id: structuretags.pm,v 1.201 2003/08/11 20:05:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -625,14 +625,14 @@ sub end_definetag {
 }
 
 sub start_block {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
 
     my $result;
 
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
 	$target eq 'tex' || $target eq 'analyze') {
 	my $code = $token->[2]->{'condition'};
-	if ($code) {
+	if (defined($code)) {
 	    if (!$Apache::lonxml::default_homework_loaded) {
 		&Apache::lonxml::default_homework_load($safeeval);
 	    }
@@ -642,7 +642,7 @@ sub start_block {
 	    $result='1';
 	}
 	if ( ! $result ) {
-	    my $skip=&Apache::lonxml::get_all_text("/block",$parser);
+	    my $skip=&Apache::lonxml::get_all_text("/block",$parser,$style);
 	    &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
 	}
 	$result='';
@@ -669,13 +669,33 @@ sub end_block {
 }
 
 sub start_languageblock {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
 
     my $result;
 
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
 	$target eq 'tex' || $target eq 'analyze') {
-	&Apache::lonxml::startredirection();
+	my $include = $token->[2]->{'include'};
+	my $exclude = $token->[2]->{'exclude'};
+        my %languages=&Apache::loncommon::display_languages();
+        $result='1';
+	if ($include) {
+            $result='';
+            foreach (split(/\,/,$include)) {
+                if ($languages{$_}) { $result='1'; }
+            }
+	}
+        if ($exclude) {
+            foreach (split(/\,/,$exclude)) {
+                if ($languages{$_}) { $result='0'; }
+            }
+	}
+	if ( ! $result ) {
+	    my $skip=&Apache::lonxml::get_all_text("/languageblock",$parser,
+						   $style);
+	    &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
+	}
+	$result='';
     } elsif ($target eq 'edit') {
 	$result .=&Apache::edit::tag_start($target,$token);
 	$result .=&Apache::edit::text_arg('Include Language:','include',
@@ -695,38 +715,14 @@ sub start_languageblock {
 sub end_languageblock {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
-
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
-	$target eq 'tex' || $target eq 'analyze') {
-	my $text=&Apache::lonxml::endredirection();
-	my $include= &Apache::lonxml::get_param('include',$parstack,$safeeval);
-	my $exclude= &Apache::lonxml::get_param('exclude',$parstack,$safeeval);
-	my %languages=&Apache::loncommon::display_languages();
-	$result='1';
-	if ($include) {
-	    $result='';
-	    foreach (split(/\,/,$include)) {
-		if ($languages{$_}) { $result='1'; }
-	    }
-	}
-	if ($exclude) {
-	    foreach (split(/\,/,$exclude)) {
-		if ($languages{$_}) { $result='0'; }
-	    }
-	}
-	if ( ! $result ) {
-	    $result='';
-	} else {
-	    $result=$text;
-	}
-    } elsif ($target eq "edit") {
+    if ($target eq "edit") {
 	$result.= &Apache::edit::tag_end($target,$token,'');
     }
     return $result;
 }
 
 sub start_instructorcomment {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
 
     my $result;
 
@@ -734,7 +730,8 @@ sub start_instructorcomment {
 	$target eq 'tex' || $target eq 'analyze') {
         $result=($ENV{'request.role'}=~/^(in|cc|au|ca|li)/);
 	if ( ! $result ) {
-	    my $skip=&Apache::lonxml::get_all_text("/instructorcomment",$parser);
+	    my $skip=&Apache::lonxml::get_all_text("/instructorcomment",
+						   $parser,$style);
 	    &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
 	}
 	$result='';