--- loncom/homework/structuretags.pm 2001/06/12 22:42:55 1.43
+++ loncom/homework/structuretags.pm 2001/07/18 20:08:34 1.48
@@ -1,13 +1,14 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
# 2/19 Guy
+# 6/26/2001 fixed extra web display at end of tags
package Apache::structuretags;
use strict;
use Apache::lonnet;
sub BEGIN {
- &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
+ &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'))
}
@@ -21,6 +22,7 @@ sub start_web {
}
sub end_web {
+ return '';
}
sub start_tex {
@@ -33,6 +35,17 @@ sub start_tex {
}
sub end_tex {
+ return '';
+}
+
+sub page_start {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval);
+ my $head_tag_start='
'.&Apache::lonxml::registerurl();
+ my $body_tag_start='';
+ return ($result,$head_tag_start,$body_tag_start);
}
sub start_problem {
@@ -53,12 +66,9 @@ sub start_problem {
my $datemsg;
#should get back a or the neccesary stuff to start XML/MathML
- my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval);
+ my ($result,$head_tag_start,$body_tag_start)=
+ &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
- my $head_tag_start=''.&Apache::lonxml::registerurl();
- my $body_tag_start='';
if ($target eq 'web' || $target eq 'grade') {
($status,$datemsg) = &Apache::lonhomework::check_date('0');
push (@Apache::inputtags::status,$status);
@@ -150,6 +160,39 @@ sub end_problem {
return $result;
}
+sub start_library {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my ($result,$head_tag_start,$body_tag_start)=
+ &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
+ if ($target eq 'edit') {
+ $result.=$head_tag_start."".$body_tag_start.
+ '