version 1.151, 2008/08/08 16:37:13
|
version 1.152, 2008/09/11 17:38:14
|
Line 159 ENDTABLE
|
Line 159 ENDTABLE
|
} # else nothing changed so just use the default mechanism |
} # else nothing changed so just use the default mechanism |
} |
} |
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { |
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { |
|
if($env{'form.pdfFormFields'} ne 'yes') { |
$result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.} |
$result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.} |
\begin{enumerate} '; |
\begin{enumerate} '; |
|
} else { |
|
$result .= "\\\\"; |
|
} |
} |
} |
return $result; |
return $result; |
} |
} |
Line 290 sub end_foilgroup {
|
Line 294 sub end_foilgroup {
|
$result.=&Apache::edit::end_table(); |
$result.=&Apache::edit::end_table(); |
} |
} |
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { |
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { |
|
if($env{'form.pdfFormFields'} ne 'yes') { |
$result .= '\end{enumerate}'; |
$result .= '\end{enumerate}'; |
|
} else { |
|
$result .= "\\\\"; |
|
} |
} |
} |
&Apache::response::poprandomnumber(); |
&Apache::response::poprandomnumber(); |
return $result; |
return $result; |
Line 423 sub displayfoils {
|
Line 431 sub displayfoils {
|
} |
} |
my $lastopt=$lastresponse{$name}; |
my $lastopt=$lastresponse{$name}; |
my $optionlist="<option></option>\n"; |
my $optionlist="<option></option>\n"; |
|
|
|
if($target eq 'tex' and $env{'form.pdfFormFields'} eq 'yes') { |
|
my $fieldname = $env{'request.symb'}.'&part_'.$Apache::inputtags::part.'&optionresponse'.'&HWVAL_'.$Apache::inputtags::response['-1'].':'.$temp; |
|
$optionlist = &Apache::lonxml::print_pdf_start_combobox($fieldname); |
|
} |
|
|
foreach my $option (@opt) { |
foreach my $option (@opt) { |
my $escopt=&HTML::Entities::encode($option,'\'"&<>'); |
my $escopt=&HTML::Entities::encode($option,'\'"&<>'); |
if ($option eq $lastopt) { |
if ($option eq $lastopt) { |
$optionlist.="<option value='".$escopt."' selected=\"selected\">$option</option>\n"; |
if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') { |
} else { |
$optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); |
$optionlist.="<option value='".$escopt."'>$option</option>\n"; |
} else { |
} |
$optionlist.="<option value='".$escopt."' selected=\"selected\">$option</option>\n"; |
|
} |
|
} else { |
|
if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') { |
|
$optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); |
|
} else { |
|
$optionlist.="<option value='".$escopt."'>$option</option>\n"; |
|
} |
|
} |
} |
} |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
if ($Apache::lonhomework::type ne 'exam') { |
if ($Apache::lonhomework::type ne 'exam') { |
Line 467 sub displayfoils {
|
Line 489 sub displayfoils {
|
if ($text=~m/\\item /) { |
if ($text=~m/\\item /) { |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$text=~s/\\item/\\vskip 2 mm/; |
$text=~s/\\item/\\vskip 2 mm/; |
} |
} elsif ($env{'form.pdfFormFields'} ne 'yes') { |
$result.= $texoptionlist.$text; |
$result.= $texoptionlist.$text; |
} else { |
} |
|
} else { |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$result.= $texoptionlist.' '.$text; |
$result.= $texoptionlist.' '.$text; |
} else { |
} elsif ($env{'form.pdfFormFields'} ne 'yes') { |
if ($text=~/\S/) {$result.= $texoptionlist.'\vspace*{-2 mm}\item '.$text;} else {$result.= $texoptionlist;} |
if ($text=~/\S/) { |
|
$result.= $texoptionlist.'\vspace*{-2 mm}\item '.$text; |
|
} else { |
|
$result.= $texoptionlist; |
|
} |
} |
} |
} |
} |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
Line 482 sub displayfoils {
|
Line 509 sub displayfoils {
|
'\end{enumerate} \vskip -8 mm \strut '; |
'\end{enumerate} \vskip -8 mm \strut '; |
$internal_counter++; |
$internal_counter++; |
} |
} |
|
if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') { |
|
$text =~ s/.*indent(.*)$/$1/; |
|
$text = $1; |
|
$result .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut \\\\'; |
|
$temp++; |
|
} |
$displayoptionintex=0; |
$displayoptionintex=0; |
} |
} |
} |
} |