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

sakharuk lon-capa-cvs@mail.lon-capa.org
Thu, 19 Feb 2004 21:55:54 -0000


sakharuk		Thu Feb 19 16:55:54 2004 EDT

  Modified files:              
    /loncom/homework	optionresponse.pm 
  Log:
  Small but important change to print bubbles with only one letter more correctly.
  
  
Index: loncom/homework/optionresponse.pm
diff -u loncom/homework/optionresponse.pm:1.101 loncom/homework/optionresponse.pm:1.102
--- loncom/homework/optionresponse.pm:1.101	Thu Feb 19 14:06:35 2004
+++ loncom/homework/optionresponse.pm	Thu Feb 19 16:55:54 2004
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.101 2004/02/19 19:06:35 albertel Exp $
+# $Id: optionresponse.pm,v 1.102 2004/02/19 21:55:54 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -460,14 +460,14 @@
 	$ENV{'form.textwidth'}=~/(\d+)/;
 	$textwidth=$1;
     } else {
-	$ENV{'textwidth'}=~/(\d+)/;
-	$textwidth=$1;
+	$ENV{'textwidth'}=~/(\d*)\.?(\d*)/;
+	$textwidth=$1.'.'.$2;
     }
     for (my $ind=0;$ind<=$number_of_bubbles;$ind++) {
 	my $leftmargin;
 	$opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]);
 	if ($ind==0) {$leftmargin=6;} else {$leftmargin=10;}
-	$current_length += (length($opt[$ind])+length($alphabet[$ind])+3)*2;
+	$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].'} & ';
 	    $head.='lr';