--- loncom/homework/structuretags.pm 2002/11/07 16:10:47 1.133 +++ loncom/homework/structuretags.pm 2003/07/17 18:42:13 1.198 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.133 2002/11/07 16:10:47 sakharuk Exp $ +# $Id: structuretags.pm,v 1.198 2003/07/17 18:42:13 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,19 +35,20 @@ package Apache::structuretags; use strict; use Apache::lonnet; use Apache::File(); +use Apache::lonmenu; BEGIN { - &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext')); -# &Apache::lonxml::register_insert('problem','',('part','postanswerdate','preduedate')) + &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext', +'simpleeditbutton','definetag')); } sub start_web { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $bodytext=&Apache::lonxml::get_all_text("/web",$$parser[$#$parser]); - if ($target eq 'web') { - return $bodytext; - } - return ''; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + 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 ''; } sub end_web { @@ -55,12 +56,16 @@ sub end_web { } sub start_tex { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]); - if ($target eq 'tex') { - return $bodytext.' '; - } - return ''; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result=''; + if (!($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); + } elsif ($target eq 'tex') { + $result=&Apache::lonxml::get_all_text("/tex",$parser); + } + return $result;; } sub end_tex { @@ -68,126 +73,159 @@ sub end_tex { } sub page_start { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my %found; - foreach my $taginside ($tagstack) { - foreach my $taglookedfor ('html','body','form') { - if ($taginside =~ /^$taglookedfor$/i) { $found{$taglookedfor} = 1; } - } - } - - my $result; - my $head_tag_start; - if (!defined($found{'html'})) { - $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack, - $parser,$safeeval); - $head_tag_start='
'.&Apache::lonxml::registerurl(undef,$target); - } - my $body_tag_start; - if (!defined($found{'body'})) { - $body_tag_start=''; - } - my $form_tag_start; - if (!defined($found{'form'})) { - $form_tag_start='