--- loncom/homework/structuretags.pm 2002/01/23 14:36:19 1.77 +++ loncom/homework/structuretags.pm 2006/01/27 23:36:48 1.332 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.77 2002/01/23 14:36:19 sakharuk Exp $ +# $Id: structuretags.pm,v 1.332 2006/01/27 23:36:48 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,27 +25,29 @@ # # 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; - -sub 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')) +use Apache::File(); +use Apache::lonmenu; +use Apache::lonlocal; +use Apache::lonxml; +use Time::HiRes qw( gettimeofday tv_interval ); +BEGIN { + &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','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,$style)=@_; + my $bodytext=&Apache::lonxml::get_all_text("/web",$parser,$style); + if ($target eq 'web') { + return $bodytext; + } + return ''; } sub end_web { @@ -53,576 +55,1553 @@ 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,$style)=@_; + my $result=''; + my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style); + if ($target eq 'tex') { + return $bodytext.' '; + } + return $result;; } 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='"; + $body_tag_start.=$help; + } + } + $body_tag_start.=&Apache::lonxml::message_location(); + } + my $form_tag_start; + if (!defined($found{'form'})) { + $form_tag_start='
+ + '; +} + +sub problem_edit_header { + return ''. + &Apache::structuretags::remember_problem_state().' + + + +
+ +
'. + &Apache::loncommon::help_open_menu('','Problem Editing Help','Problem_Editor_XML_Index','',5,'Authoring',undef,undef,undef,'Problem Editing Help') + .'
'. + '
'; +} + +sub problem_edit_footer { + return '

+ '. + &Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields). + "\n
\n".&Apache::loncommon::endbodytag()."\n"; +} + +sub option { + my ($value,$name) = @_; + my $result ="