version 1.58, 2006/04/04 22:24:08
|
version 1.63, 2007/04/11 09:20:32
|
Line 163 sub end_itemgroup {
|
Line 163 sub end_itemgroup {
|
if ($direction eq 'horizontal') { $table .='</tr>';} |
if ($direction eq 'horizontal') { $table .='</tr>';} |
$table.='</table>'; |
$table.='</table>'; |
$Apache::matchresponse::itemtable{'display'}=$table; |
$Apache::matchresponse::itemtable{'display'}=$table; |
|
$Apache::lonxml::post_evaluate=0; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $table=' \begin{description}\setlength{\leftmargin}{2em}\setlength{\labelwidth}{1em}\setlength{\itemsep}{0.5pt plus1pt minus2pt}\setlength{\listparindent}{0em} '; |
my $table=' \begin{description}\setlength{\leftmargin}{2em}\setlength{\labelwidth}{1em}\setlength{\itemsep}{0.5pt plus1pt minus2pt}\setlength{\listparindent}{0em} '; |
my $i=0; |
my $i=0; |
foreach my $name (@names) { |
foreach my $name (@names) { |
$Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g; |
# $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g; |
$table.='\item['.$alphabet[$i].'] '. |
$table.='\item['.$alphabet[$i].'] '. |
$Apache::response::itemgroup{$name.'.text'}; |
$Apache::response::itemgroup{$name.'.text'}; |
$i++; |
$i++; |
Line 175 sub end_itemgroup {
|
Line 176 sub end_itemgroup {
|
$table.=' \end{description} \strut '; |
$table.=' \end{description} \strut '; |
if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';} |
if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';} |
$Apache::matchresponse::itemtable{'display'}=$table; |
$Apache::matchresponse::itemtable{'display'}=$table; |
|
$Apache::lonxml::post_evaluate=0; |
} |
} |
return $result; |
return $result; |
} |
} |
Line 263 sub end_foilgroup {
|
Line 265 sub end_foilgroup {
|
$safeeval,'-2'); |
$safeeval,'-2'); |
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex') { |
$result=&displayfoils($target,$max,$randomize); |
$result=&displayfoils($target,$max,$randomize); |
|
$Apache::lonxml::post_evaluate=0; |
} elsif ($target eq 'answer' ) { |
} elsif ($target eq 'answer' ) { |
$result=&displayanswers($max,$randomize); |
$result=&displayanswers($max,$randomize); |
} elsif ( $target eq 'grade') { |
} elsif ( $target eq 'grade') { |
Line 425 sub itemdisplay {
|
Line 428 sub itemdisplay {
|
} |
} |
sub displayfoils { |
sub displayfoils { |
my ($target,$max,$randomize)=@_; |
my ($target,$max,$randomize)=@_; |
|
my ($tabsize, $lefttabsize, $righttabsize); |
|
|
my $result; |
my $result; |
my $question; |
my $question; |
my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max), |
my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max), |
Line 484 sub displayfoils {
|
Line 489 sub displayfoils {
|
} |
} |
} |
} |
if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') { |
if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') { |
$optionlist='<select name="HWVAL_'. |
$optionlist='<select onchange="javascript:setSubmittedPart(\''. |
|
$part.'\');" name="HWVAL_'. |
$Apache::inputtags::response[-1].':'.$temp.'">'. |
$Apache::inputtags::response[-1].':'.$temp.'">'. |
$optionlist."</select>\n"; |
$optionlist."</select>\n"; |
} |
} |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
|
# |
|
# Factor out the tex computations of the left/right 1/2 minipage |
|
# widths for left or right positioning. This allows us |
|
# to, if necessary constrain the bubble widths: |
|
# |
|
if ($target eq 'tex' && |
|
(&itemdisplay('left') || &itemdisplay('right'))) { |
|
$tabsize=&Apache::londefdef::recalc($env{'form.textwidth'}); |
|
($lefttabsize,$righttabsize)=(0,0); |
|
if ($Apache::matchresponse::TeXitemgroupwidth ne '') { |
|
$Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/; |
|
$lefttabsize=$tabsize*$1/100; |
|
$righttabsize=0.95*($tabsize-$lefttabsize); |
|
} else { |
|
$tabsize=~/(\d+\.?\d*)/; |
|
$lefttabsize=$1/2.1; |
|
$righttabsize=0.95*($1-$lefttabsize); |
|
} |
|
} |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
if ($Apache::lonhomework::type ne 'exam') { |
if ($Apache::lonhomework::type ne 'exam') { |
$question.="<br />\n".$optionlist.$text; |
$question.="<br />\n".$optionlist.$text; |
Line 500 sub displayfoils {
|
Line 525 sub displayfoils {
|
$question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter); |
$question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter); |
} |
} |
} else { |
} else { |
|
# Note that if left or right positioned, we must |
|
# confine the bubbles to righttabsize: |
|
# |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$question.=' '.$optionlist.$text."\n"; |
$question.=' '.$optionlist.$text."\n"; |
my @emptyItems = (); |
my @emptyItems = (); |
for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';} |
for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';} |
$question.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'\end{enumerate} \vskip -8 mm \strut '; |
$question.='\vskip -1 mm\noindent\begin{list}{}{\setlength{\listparindent}{0mm}\setlength{\leftmargin}{2mm}}' |
|
.'\item \hskip -3mm \textbf{'.$internal_counter.'}'; |
|
if (&itemdisplay('left') || &itemdisplay('right')) { |
|
$question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems, "", $righttabsize); |
|
} |
|
else { |
|
$question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems); |
|
} |
|
$question .= '\end{list} \vskip -8 mm \strut '; |
$internal_counter++; |
$internal_counter++; |
} else { |
} else { |
$question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n"; |
$question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n"; |
Line 524 sub displayfoils {
|
Line 560 sub displayfoils {
|
$result='<table><tr><td valign="top">'.$question. |
$result='<table><tr><td valign="top">'.$question. |
'</td><td valign="top">'.$result.'</td></tr></table>'; |
'</td><td valign="top">'.$result.'</td></tr></table>'; |
} else { |
} else { |
my $tabsize=&Apache::londefdef::recalc($env{'form.textwidth'}); |
|
my ($lefttabsize,$righttabsize)=(0,0); |
|
if ($Apache::matchresponse::TeXitemgroupwidth ne '') { |
|
$Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/; |
|
$lefttabsize=$tabsize*$1/100; |
|
$righttabsize=0.95*($tabsize-$lefttabsize); |
|
} else { |
|
$tabsize=~/(\d+\.?\d*)/; |
|
$lefttabsize=$1/2.1; |
|
$righttabsize=0.95*($1-$lefttabsize); |
|
} |
|
$lefttabsize.=' mm '; |
$lefttabsize.=' mm '; |
$righttabsize.=' mm '; |
$righttabsize.=' mm '; |
$result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$righttabsize.'}p{'.$lefttabsize.'}}\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}&\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}\end{tabular}'; |
$result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$righttabsize.'}p{'.$lefttabsize.'}}\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}&\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}\end{tabular}'; |
Line 546 sub displayfoils {
|
Line 571 sub displayfoils {
|
$result='<table><tr><td valign="top">'.$result. |
$result='<table><tr><td valign="top">'.$result. |
'</td><td valign="top">'.$question.'</td></tr></table>'; |
'</td><td valign="top">'.$question.'</td></tr></table>'; |
} else { |
} else { |
my $tabsize=&Apache::londefdef::recalc($env{'form.textwidth'}); |
|
my ($lefttabsize,$righttabsize)=(0,0); |
|
if ($Apache::matchresponse::TeXitemgroupwidth ne '') { |
|
$Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/; |
|
$lefttabsize=$tabsize*$1/100; |
|
$righttabsize=0.95*($tabsize-$lefttabsize); |
|
} else { |
|
$tabsize=~/(\d+\.?\d*)/; |
|
$lefttabsize=$1/2.1; |
|
$righttabsize=0.95*($1-$lefttabsize); |
|
} |
|
$lefttabsize.=' mm '; |
$lefttabsize.=' mm '; |
$righttabsize.=' mm '; |
$righttabsize.=' mm '; |
$result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$lefttabsize.'}p{'.$righttabsize.'}}\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}&\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}\end{tabular}'; |
$result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$lefttabsize.'}p{'.$righttabsize.'}}\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}&\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}\end{tabular}'; |