--- loncom/homework/structuretags.pm 2003/06/20 14:45:19 1.188 +++ loncom/homework/structuretags.pm 2003/10/03 15:27:56 1.200.2.2 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.188 2003/06/20 14:45:19 bowersj2 Exp $ +# $Id: structuretags.pm,v 1.200.2.2 2003/10/03 15:27:56 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,14 +38,15 @@ use Apache::File(); use Apache::lonmenu; BEGIN { - &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext')); + &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext', +'simpleeditbutton','definetag')); } sub start_web { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if (!($target eq 'web' || $target eq 'edit' || $target eq 'modified' || - $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) { - my $bodytext=&Apache::lonxml::get_all_text("/web",$parser); + my $bodytext=&Apache::lonxml::get_all_text("/web",$parser); + if ($target eq 'web') { + return $bodytext; } return ''; } @@ -56,12 +57,12 @@ sub end_web { sub start_tex { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if (!($target eq 'tex' || $target eq 'edit' || $target eq 'modified' || - $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) { - &Apache::lonxml::debug("tex 1"); - my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser); + my $result=''; + my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser); + if ($target eq 'tex') { + return $bodytext.' '; } - return ''; + return $result;; } sub end_tex { @@ -71,7 +72,7 @@ sub end_tex { sub page_start { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my %found; - foreach my $taginside ($tagstack) { + foreach my $taginside (@$tagstack) { foreach my $taglookedfor ('html','body','form') { if ($taginside =~ /^$taglookedfor$/i) {$found{$taglookedfor} = 1;} } @@ -90,6 +91,7 @@ sub page_start { 'onUnload="'.&Apache::lonmenu::unloadevents().'" '; my $background=&Apache::lonxml::get_param('background',$parstack, $safeeval); + if ($ENV{'browser.imagesuppress'} eq 'on') { $background=''; } if ($background) { $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= $background; @@ -97,12 +99,15 @@ sub page_start { } else { my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack, $safeeval); - if ($bgcolor) { + if (($bgcolor) && ($ENV{'browser.blackwhite'} ne 'on')) { $body_tag_start.='bgcolor="'.$bgcolor.'" '; } else { $body_tag_start.='bgcolor="#ffffff"'; } } + if ($ENV{'browser.fontenhance'} eq 'on') { + $body_tag_start.=' style="font-size: x-large;" '; + } $body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1); if ($target eq 'web' && $ENV{'request.state'} ne 'construct') { my ($symb,undef,undef,undef,$publicuser)= @@ -149,11 +154,8 @@ sub setup_rndseed { } if ($ENV{'form.resetdata'} eq 'New Problem Variation' || $ENV{'form.newrandomization'} eq 'New Randomization') { - $rndseed=time; - if ($rndseed eq $ENV{'form.rndseed'}) { - srand($rndseed); - $rndseed=int(rand(1000000000)); - } + srand(time); + $rndseed=int(rand(2100000000)); $ENV{'form.rndseed'}=$rndseed; delete($ENV{'form.resetdata'}); delete($ENV{'form.newrandomization'}); @@ -409,7 +411,7 @@ sub start_problem { } } elsif ($target eq 'tex') { my $startminipage = ''; - if ($ENV{'form.problem_split'} ne 'yes') { + if (not $ENV{'form.problem_split'}=~/yes/) { $startminipage = '\begin{minipage}{\textwidth}'; } my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); @@ -507,7 +509,8 @@ sub end_problem { } } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || $status eq 'UNCHECKEDOUT' ) { - if ($target ne 'tex') { + if ($target ne 'tex' && + $ENV{'form.answer_output_mode'} ne 'tex') { $result.="\n"; } } @@ -515,7 +518,7 @@ sub end_problem { $result.=&Apache::lonxml::xmlend(); } elsif ($target eq 'tex') { my $endminipage = ''; - if ($ENV{'form.problem_split'} ne 'yes') { + if (not $ENV{'form.problem_split'}=~/yes/) { $endminipage = '\end{minipage}'; } $result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}'; @@ -597,6 +600,30 @@ sub end_library { return $result; } +sub start_definetag { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + + my $result; + + my $name = $token->[2]->{'name'}; + my $skip=&Apache::lonxml::get_all_text("/definetag",$parser); + if ($name=~/^\//) { + $result= + '
'; + } else { + $result= + '
END '.$name.'
'; + } + $skip=~s/\/\>\;/gs; + $result.='
BEGIN '.$name.'
'.$skip.'
'; + return $result; +} + +sub end_definetag { + return ''; +} + sub start_block { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; @@ -903,11 +930,17 @@ sub start_part { if ( $target eq "web" ) { $result="
Part is not open to be viewed. It $accessmsg
"; } elsif ( $target eq 'tex' ) { - $result="\\end{minipage}\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\\\begin{minipage}{\\textwidth}"; + if (not $ENV{'form.problem_split'}=~/yes/) { + $result="\\end{minipage}\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\\\begin{minipage}{\\textwidth}"; + } else { + $result="\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\"; + } } } else { if ($target eq 'tex') { - $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent'; + if (not $ENV{'form.problem_split'}=~/yes/) { + $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent'; + } my $weight = &Apache::lonnet::EXT("resource.$id.weight"); if ($Apache::lonhomework::type eq 'exam') { $result .= '\fbox{\textit{'.$weight.' pt}}';} } @@ -942,7 +975,9 @@ sub end_part { } elsif (($target eq 'web' || $target eq 'tex') && !$hidden ) { my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part, $target); - if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';} + if ($Apache::lonhomework::type eq 'exam' && $target eq 'tex') { + $gradestatus=''; + } $result=$gradestatus; } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); @@ -1084,5 +1119,23 @@ sub delete_startouttext { return 1; } +sub start_simpleeditbutton { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result=''; + if (($target eq 'web') && + (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) { + my $url=$ENV{'REQUEST_URI'}; + $url=~s/\?.*$//; + $result='
'. + 'Simple Problem Editor - Note: it can take up to 10 minutes for changes to take effect for all users.'. +&Apache::loncommon::help_open_topic('Caching').'

'; + } + return $result; +} + +sub end_simpleeditbutton { + return ''; +} + 1; __END__