Diff for /loncom/homework/optionresponse.pm between versions 1.96.2.2 and 1.97

version 1.96.2.2, 2004/02/19 19:20:25 version 1.97, 2004/01/06 20:37:29
Line 397  sub displayfoils { Line 397  sub displayfoils {
   }    }
       }        }
       if ($Apache::lonhomework::type eq 'exam') {        if ($Apache::lonhomework::type eq 'exam') {
   $result.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&bubbles(\@alphabet,\@opt).'\end{enumerate} \vskip -9 mm \strut ';    $result.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&bubbles(\@alphabet,\@opt).'}\end{enumerate}} \vskip -9 mm \strut ';
   $internal_counter++;    $internal_counter++;
       }        }
       $displayoptionintex=1;        $displayoptionintex=1;
Line 418  sub displayfoils { Line 418  sub displayfoils {
   }    }
       }        }
       if ($Apache::lonhomework::type eq 'exam') {        if ($Apache::lonhomework::type eq 'exam') {
   $result.='\vskip -1 mm \noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&bubbles(\@alphabet,\@opt).'\end{enumerate} \vskip -9 mm \strut ';    $result.='\vskip -2 mm \parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&bubbles(\@alphabet,\@opt).'}\end{enumerate}} \vskip -9 mm \strut ';
   $internal_counter++;    $internal_counter++;
       }        }
   }    }
Line 445  sub optionlist_correction { Line 445  sub optionlist_correction {
  $texoptionlist =~ s/>/\$>\$/g;   $texoptionlist =~ s/>/\$>\$/g;
  $texoptionlist =~ s/</\$<\$/g;   $texoptionlist =~ s/</\$<\$/g;
  $texoptionlist =~ s/=/\$=\$/g;   $texoptionlist =~ s/=/\$=\$/g;
  $texoptionlist =~ s/\^(\d+)/<m>\$$1\$<\/m>/g;   $texoptionlist =~ s/\^(\d+)/\$^{$1}\$/g;
     } else {      } else {
  $texoptionlist =~ s/<option><\/option>/\\item \[\] \\vskip -5 mm/;   $texoptionlist =~ s/<option><\/option>/\\item \[\] \\vskip -5 mm/;
     }      }
Line 484  sub bubbles { Line 484  sub bubbles {
     my ($result,$head,$line) =('','','');      my ($result,$head,$line) =('','','');
     my $number_of_bubbles = $#opt + 1;      my $number_of_bubbles = $#opt + 1;
     my $current_length = 0;      my $current_length = 0;
     my $textwidth;  
     if ($ENV{'form.textwidth'} ne '') {  
  $ENV{'form.textwidth'}=~/(\d+)/;  
  $textwidth=$1;  
     } else {  
  $ENV{'textwidth'}=~/(\d+)/;  
  $textwidth=$1;  
     }  
     for (my $ind=0;$ind<=$number_of_bubbles;$ind++) {      for (my $ind=0;$ind<=$number_of_bubbles;$ind++) {
  my $leftmargin;   $current_length += (length($opt[$ind])+length($alphabet[$ind])+2)*2;
  $opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]);   if ($current_length<0.9*$ENV{'form.textwidth'} and $ind!=$number_of_bubbles) {
  if ($ind==0) {$leftmargin=6;} else {$leftmargin=10;}  
  $current_length += (length($opt[$ind])+length($alphabet[$ind])+3)*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 -1 mm {\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*$//;
     $result.='\vskip -2 mm\noindent\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}';      $result.='\vskip -5 mm\begin{tabular}{'.$head.'}\\\\'.$line.'\\\\\end{tabular}';
     $line = '\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';;      $line = '\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';;
     $head ='lr';      $head ='lr';
     $current_length = (length($opt[$ind])+length($alphabet[$ind]))*2;      $current_length = (length($opt[$ind])+length($alphabet[$ind]))*2;

Removed from v.1.96.2.2  
changed lines
  Added in v.1.97


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>