--- loncom/xml/scripttag.pm 2005/02/21 23:23:30 1.122 +++ loncom/xml/scripttag.pm 2005/09/15 18:30:11 1.131 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Script Vars
"; } } elsif ($target eq "edit" ) { @@ -173,8 +172,8 @@ sub start_display { if ( $target eq "modified" ) { $result=$token->[4].&Apache::edit::modifiedfield("/display",$parser); } elsif ( $target eq 'web' || $target eq 'tex' || - $target eq 'grade' || $target eq 'answer' || - $target eq 'analyze') { + $target eq 'grade' || $target eq 'webgrade' || + $target eq 'answer' || $target eq 'analyze') { my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/display",$parser); if (!$Apache::lonxml::default_homework_loaded) { &Apache::lonxml::default_homework_load($safeeval); @@ -309,12 +308,12 @@ sub start_window { } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_start($target,$token); $result.=&Apache::edit::text_arg('Text of Link:','linktext',$token,70); - $result.=&Apache::edit::text_arg('Height:','width',$token,5); - $result.=&Apache::edit::text_arg('Width:','height',$token,5); + $result.=&Apache::edit::text_arg('Height:','height',$token,5); + $result.=&Apache::edit::text_arg('Width:','width',$token,5); $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack, - $safeeval,'linttext', + $safeeval,'linktext', 'width','height'); if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } } @@ -442,7 +441,7 @@ sub start_standalone { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; if ($target eq 'web' ) { - if ( $ENV{'request.course.id'} ) { + if ( $env{'request.course.id'} ) { my $inside = &Apache::lonxml::get_all_text("/standalone",$parser); } else { $result='
'; @@ -455,7 +454,7 @@ sub end_standalone { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; if ($target eq 'web' ) { - if ( $ENV{'request.course.id'} ) { + if ( $env{'request.course.id'} ) { } else { $result='
'; } @@ -553,5 +552,29 @@ sub end_parse { my $result = ''; return $result; } + +sub start_algebra { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; + my $result = ''; + if ( $target eq 'web' || $target eq 'tex' || + $target eq 'grade' || $target eq 'answer' || + $target eq 'analyze') { + my $inside = &Apache::lonxml::get_all_text_unbalanced("/algebra",$parser); + $inside = &Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); + if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { + my $style=&Apache::lonxml::get_param('style',$parstack,$safeeval); + $result=&Apache::lontexconvert::algebra($inside,$target,$style); + } + $Apache::lonxml::post_evaluate=0; + } + return $result; +} + +sub end_algebra { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; + my $result = ''; + return $result; +} + 1; __END__