[LON-CAPA-cvs] cvs: loncom /homework optionresponse.pm

[sakharuk]

sakharuk		Thu Feb 12 10:50:01 2004 EDT

  Modified files:              
    /loncom/homework	optionresponse.pm 
  Log:
  Algorithm for printing bubbles content in the exams was changed. It's capable to render more options with more accurate calculation of the width for every option. I really want to have as many responces about this as possible from people using exams printing. The same has to work without changes for radiobuttonresponce, rankresponce, ...
  
  
Index: loncom/homework/optionresponse.pm
diff -u loncom/homework/optionresponse.pm:1.98 loncom/homework/optionresponse.pm:1.99
--- loncom/homework/optionresponse.pm:1.98	Wed Jan 14 17:08:22 2004
+++ loncom/homework/optionresponse.pm	Thu Feb 12 10:50:01 2004
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.98 2004/01/14 22:08:22 www Exp $
+# $Id: optionresponse.pm,v 1.99 2004/02/12 15:50:01 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -398,7 +398,7 @@
 		  }
 	      }
 	      if ($Apache::lonhomework::type eq 'exam') {
-		  $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 ';
+		  $result.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&bubbles(\@alphabet,\@opt).'\end{enumerate} \vskip -9 mm \strut ';
 		  $internal_counter++;
 	      }
 	      $displayoptionintex=1;
@@ -419,7 +419,7 @@
 		  }
 	      }
 	      if ($Apache::lonhomework::type eq 'exam') {
-		  $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 ';
+		  $result.='\vskip -1 mm \noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&bubbles(\@alphabet,\@opt).'\end{enumerate} \vskip -9 mm \strut ';
 		  $internal_counter++;
 	      }
 	  }
@@ -485,14 +485,18 @@
     my ($result,$head,$line) =('','','');
     my $number_of_bubbles = $#opt + 1;
     my $current_length = 0;
+    $ENV{'form.textwidth'}=~/(\d+)/;
+    my $textwidth=$1;
     for (my $ind=0;$ind<=$number_of_bubbles;$ind++) {
-	$current_length += (length($opt[$ind])+length($alphabet[$ind])+2)*2;
-	if ($current_length<0.9*$ENV{'form.textwidth'} and $ind!=$number_of_bubbles) {
+	my $leftmargin;
+	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].'} & ';
 	    $head.='lr';
 	} else {
 	    $line=~s/\&\s*$//;
-	    $result.='\vskip -5 mm\begin{tabular}{'.$head.'}\\\\'.$line.'\\\\\end{tabular}';
+	    $result.='\vskip -2 mm\noindent\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}';
 	    $line = '\hskip -1 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;