[LON-CAPA-cvs] cvs: loncom /homework structuretags.pm

[albertel]

albertel		Thu Jun 12 18:19:33 2003 EDT

  Modified files:              
    /loncom/homework	structuretags.pm 
  Log:
  - <web> and <tex> should run for all other targets too
  - process the contents of <web>/<tex> so more markup can occur inside of it.
  - BUG#1723
  
  
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.181 loncom/homework/structuretags.pm:1.182
--- loncom/homework/structuretags.pm:1.181	Sat Jun  7 00:08:43 2003
+++ loncom/homework/structuretags.pm	Thu Jun 12 18:19:33 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.181 2003/06/07 04:08:43 albertel Exp $
+# $Id: structuretags.pm,v 1.182 2003/06/12 22:19:33 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,9 +43,9 @@
 
 sub start_web {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    my $bodytext=&Apache::lonxml::get_all_text("/web",$parser);
-    if ($target eq 'web') {
-	return $bodytext;
+    if (!($target eq 'web' || $target eq 'edit' || $target eq 'modified' ||
+	  $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) {
+	my $bodytext=&Apache::lonxml::get_all_text("/web",$parser);
     }
     return '';
 }
@@ -56,9 +56,10 @@
 
 sub start_tex {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
-    if ($target eq 'tex') {
-	return $bodytext.' ';
+    if (!($target eq 'tex' || $target eq 'edit' || $target eq 'modified' ||
+	  $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) {
+	&Apache::lonxml::debug("tex 1");
+	my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
     }
     return '';
 }