--- loncom/homework/optionresponse.pm 2010/08/02 10:52:54 1.165
+++ loncom/homework/optionresponse.pm 2010/09/01 21:29:51 1.171
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.165 2010/08/02 10:52:54 foxr Exp $
+# $Id: optionresponse.pm,v 1.171 2010/09/01 21:29:51 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 .= "\\\\";
}
@@ -452,7 +451,9 @@ sub displayfoils {
$text=''.$value.': '.$text;
}
} else {
- $text=''.$text;
+ if (@whichopt > 1) {
+ $text=''.$text;
+ }
}
$result.=$text."\n";
}
@@ -468,7 +469,7 @@ sub displayfoils {
my $checkboxopt=&check_box_opt($target,$checkboxvalue,@opt);
if ($checkboxopt) {
$result.='
'.&mt('Choices: ').''.$opt[0].','.$opt[1].'. '.
- &mt('Select all that are [_1].',$checkboxopt);
+ &mt('Select all that are [_1].',$checkboxopt);
}
foreach $name (@whichopt) {
my $text=$Apache::response::foilgroup{$name.'.text'};
@@ -543,7 +544,9 @@ sub displayfoils {
}
if ($text=~s||$optionlist|) {
if ($Apache::lonhomework::type ne 'exam') {
- $text=''.$text;
+ if (@whichopt > 1) {
+ $text=''.$text;
+ }
}
} else {
if ($Apache::lonhomework::type ne 'exam') {
@@ -692,12 +695,12 @@ sub bubbles {
$current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2;
if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) {
- $line.='\hskip 1pc {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';
+ $line.='\hskip 4 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';
$head.='lr';
} else {
$line=~s/\&\s*$//;
- $result.='\vskip -2 mm\noindent\setlength{\tabcolsep}{2 mm}\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}\vskip 0 mm';
- $line = '\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';;
+ $result.='\vskip -1 mm\noindent\setlength{\tabcolsep}{2 mm}\renewcommand{\arraystretch}{1.25}\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}\vskip 0 mm';
+ $line = '\hskip 4 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';;
$head ='lr';
$current_length = (length($opt[$ind])+length($alphabet[$ind]))*2;
}