--- loncom/homework/structuretags.pm 2001/07/18 20:08:34 1.48
+++ loncom/homework/structuretags.pm 2002/10/14 15:43:06 1.125
@@ -1,13 +1,41 @@
# 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 $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
# 2/19 Guy
# 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();
-sub BEGIN {
+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'))
}
@@ -29,7 +57,7 @@ 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 $bodytext.' ';
}
return '';
}
@@ -40,155 +68,407 @@ sub end_tex {
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);
+ 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='