--- loncom/homework/structuretags.pm 2003/06/30 20:30:50 1.192
+++ loncom/homework/structuretags.pm 2003/07/25 10:44:36 1.199
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.192 2003/06/30 20:30:50 sakharuk Exp $
+# $Id: structuretags.pm,v 1.199 2003/07/25 10:44:36 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -38,7 +38,8 @@ 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 {
@@ -56,12 +57,15 @@ sub end_web {
sub start_tex {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- if (!($target eq 'tex' || $target eq 'edit' || $target eq 'modified' ||
+ my $result='';
+ if (!($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);
+ } elsif ($target eq 'tex') {
+ $result=&Apache::lonxml::get_all_text("/tex",$parser);
}
- return '';
+ return $result;;
}
sub end_tex {
@@ -90,6 +94,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 +102,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)=
@@ -595,6 +603,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=
+ '
END '.$name.' |
';
+ } else {
+ $result=
+ '
BEGIN '.$name.' |
';
+ }
+ $skip=~s/\\<\;/gs;
+ $skip=~s/\>/\>\;/gs;
+ $result.=''.$skip.' |
';
+ return $result;
+}
+
+sub end_definetag {
+ return '';
+}
+
sub start_block {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
@@ -901,11 +933,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}}';}
}
@@ -1082,5 +1120,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__