--- loncom/homework/optionresponse.pm 2010/02/28 23:40:53 1.163 +++ loncom/homework/optionresponse.pm 2010/08/23 04:43:04 1.167 @@ -1,7 +1,7 @@ # LearningOnline Network with CAPA # option list style responses # -# $Id: optionresponse.pm,v 1.163 2010/02/28 23:40:53 raeburn Exp $ +# $Id: optionresponse.pm,v 1.167 2010/08/23 04:43:04 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -179,8 +179,7 @@ ENDTABLE } if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { if($env{'form.pdfFormFields'} ne 'yes') { - $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.} - \begin{enumerate} '; + $result .= ' \begin{itemize} '; } else { $result .= "\\\\"; } @@ -327,7 +326,7 @@ sub end_foilgroup { } if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { if($env{'form.pdfFormFields'} ne 'yes') { - $result .= '\end{enumerate}'; + $result .= '\end{itemize}'; } else { $result .= "\\\\"; } @@ -467,8 +466,7 @@ sub displayfoils { my $internal_counter=$Apache::lonxml::counter; my $checkboxopt=&check_box_opt($target,$checkboxvalue,@opt); if ($checkboxopt) { - $result.='
'.&mt('Choices: ').''.$opt[0].','.$opt[1].'. '. - &mt('Select all that are [_1].',$checkboxopt); + $result.='
'.&mt('Select all that are [_1].',$checkboxopt); } foreach $name (@whichopt) { my $text=$Apache::response::foilgroup{$name.'.text'}; @@ -492,14 +490,16 @@ sub displayfoils { my $escopt=&HTML::Entities::encode($option,'\'"&<>'); if ($option eq $lastopt) { 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); } else { $optionlist.="\n"; } } else { 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); } else { $optionlist.="\n"; @@ -581,13 +581,14 @@ sub displayfoils { } } if ($Apache::lonhomework::type eq 'exam') { - $result.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'. - $internal_counter.'}.]'.&bubbles(\@alphabet,\@opt). - '\end{enumerate} \vskip -8 mm \strut '; + $result.='\vskip -1 mm\noindent'; + $result.= '\textbf{'. $internal_counter.'}. \vskip -3mm'.&bubbles(\@alphabet,\@opt). + ' \strut '; $internal_counter++; } 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; $result .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut \\\\'; $temp++; @@ -689,7 +690,7 @@ sub bubbles { $current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2; 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'; } else { $line=~s/\&\s*$//;