--- loncom/homework/structuretags.pm 2001/12/04 14:53:59 1.73
+++ loncom/homework/structuretags.pm 2002/02/08 20:58:39 1.81
@@ -1,5 +1,30 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
+#
+# $Id: structuretags.pm,v 1.81 2002/02/08 20:58:39 albertel 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
@@ -9,7 +34,7 @@ package Apache::structuretags;
use strict;
use Apache::lonnet;
-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'))
}
@@ -42,24 +67,39 @@ 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=''.&Apache::lonxml::registerurl();
+ }
+ my $body_tag_start;
+ if (!defined($found{'body'})) {
+ $body_tag_start='';
}
- $body_tag_start.='>';
return ($result,$head_tag_start,$body_tag_start);
}
@@ -122,6 +162,14 @@ ENDCHECKOUT
sub start_problem {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ # meta is called from lonpublisher, which doesn't uses the normal
+ # lonhomework method of parsing the file which means that inputtags
+ # won't get reset
+ if ( $Apache::inputtags::part ne '' && $target != 'meta' ) {
+ &Apache::lonxml::error('Only one problem allowed in a .problem file');
+ my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[-1]);
+ return '';
+ }
#intialize globals
$Apache::inputtags::part='0';
@Apache::inputtags::responselist = ();
@@ -248,6 +296,8 @@ sub start_problem {
} elsif ($target eq 'modified') {
$result=$token->[4];
$result.=&Apache::edit::handle_insert();
+ } elsif ($target eq 'tex') {
+ $result .= '\begin{document}\noindent\textbf{Problem.}\newline';
} else {
# page_start returned a starting result, delete it if we don't need it
$result = '';
@@ -291,6 +341,8 @@ sub end_problem {
} elsif ($target eq 'edit') {
&Apache::lonxml::debug("in end_problem with $target, edit");
$result=' ';
+ } elsif ($target eq 'tex') {
+ $result .= '\end{document}';
}
return $result;
}