version 1.163, 2010/02/28 23:40:53
|
version 1.166, 2010/08/23 03:57:48
|
Line 467 sub displayfoils {
|
Line 467 sub displayfoils {
|
my $internal_counter=$Apache::lonxml::counter; |
my $internal_counter=$Apache::lonxml::counter; |
my $checkboxopt=&check_box_opt($target,$checkboxvalue,@opt); |
my $checkboxopt=&check_box_opt($target,$checkboxvalue,@opt); |
if ($checkboxopt) { |
if ($checkboxopt) { |
$result.='<br />'.&mt('Choices: ').'<b>'.$opt[0].','.$opt[1].'</b>. '. |
$result.='<br />'.&mt('Select all that are <b>[_1]</b>.',$checkboxopt); |
&mt('Select all that are <b>[_1]</b>.',$checkboxopt); |
|
} |
} |
foreach $name (@whichopt) { |
foreach $name (@whichopt) { |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
Line 492 sub displayfoils {
|
Line 491 sub displayfoils {
|
my $escopt=&HTML::Entities::encode($option,'\'"&<>'); |
my $escopt=&HTML::Entities::encode($option,'\'"&<>'); |
if ($option eq $lastopt) { |
if ($option eq $lastopt) { |
if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes' |
if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes' |
&& $Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
&& $Apache::inputtags::status[-1] eq 'CAN_ANSWER' |
|
&& $Apache::lonhomework::type ne 'exam') { |
$optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); |
$optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); |
} else { |
} else { |
$optionlist.="<option value='".$escopt."' selected=\"selected\">$option</option>\n"; |
$optionlist.="<option value='".$escopt."' selected=\"selected\">$option</option>\n"; |
} |
} |
} else { |
} else { |
if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes' |
if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes' |
&& $Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
&& $Apache::inputtags::status[-1] eq 'CAN_ANSWER' |
|
&& $Apache::lonhomework::type ne 'exam') { |
$optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); |
$optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); |
} else { |
} else { |
$optionlist.="<option value='".$escopt."'>$option</option>\n"; |
$optionlist.="<option value='".$escopt."'>$option</option>\n"; |
Line 581 sub displayfoils {
|
Line 582 sub displayfoils {
|
} |
} |
} |
} |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$result.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'. |
$result.='\vskip -1 mm\noindent'; |
$internal_counter.'}.]'.&bubbles(\@alphabet,\@opt). |
$result.= '\textbf{'. $internal_counter.'}. \vskip -3mm'.&bubbles(\@alphabet,\@opt). |
'\end{enumerate} \vskip -8 mm \strut '; |
' \strut '; |
$internal_counter++; |
$internal_counter++; |
} |
} |
if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes' |
if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes' |
&& $Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
&& $Apache::inputtags::status[-1] eq 'CAN_ANSWER' |
|
&& $Apache::lonhomework::type ne 'exam') { |
$text =~ s/\\item//m; |
$text =~ s/\\item//m; |
$result .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut \\\\'; |
$result .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut \\\\'; |
$temp++; |
$temp++; |
Line 689 sub bubbles {
|
Line 691 sub bubbles {
|
|
|
$current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2; |
$current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2; |
if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) { |
if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) { |
$line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & '; |
$line.='\hskip 1pc {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & '; |
$head.='lr'; |
$head.='lr'; |
} else { |
} else { |
$line=~s/\&\s*$//; |
$line=~s/\&\s*$//; |