--- loncom/homework/structuretags.pm 2002/10/14 15:43:06 1.125
+++ loncom/homework/structuretags.pm 2003/05/19 21:05:23 1.176
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.125 2002/10/14 15:43:06 sakharuk Exp $
+# $Id: structuretags.pm,v 1.176 2003/05/19 21:05:23 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -29,24 +29,25 @@
# 6/26/2001 fixed extra web display at end of tags
# 8/17,8/18,8/20 Gerd Kortemeyer
+
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'));
}
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)=@_;
+ my $bodytext=&Apache::lonxml::get_all_text("/web",$parser);
+ if ($target eq 'web') {
+ return $bodytext;
+ }
+ return '';
}
sub end_web {
@@ -54,12 +55,12 @@ 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 $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
+ if ($target eq 'tex') {
+ return $bodytext.' ';
+ }
+ return '';
}
sub end_tex {
@@ -67,119 +68,157 @@ 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='