--- loncom/homework/randomlabel.pm	2004/02/23 23:25:39	1.59
+++ loncom/homework/randomlabel.pm	2004/12/04 01:15:41	1.63
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
 #
-# $Id: randomlabel.pm,v 1.59 2004/02/23 23:25:39 albertel Exp $
+# $Id: randomlabel.pm,v 1.63 2004/12/04 01:15:41 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -87,7 +87,7 @@ sub start_randomlabel {
     my $result='';
     push (@Apache::lonxml::namespace,'randomlabel');
     my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
-    if ( $bgimg !~ /^http:/ ) {
+    if ( defined($bgimg) && $bgimg !~ /^http:/ ) {
 	$bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);
 	if (&Apache::lonnet::repcopy($bgimg) ne OK) {
 	    $bgimg='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';
@@ -144,6 +144,7 @@ sub end_randomlabel {
 	my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
 	my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1));
         if (!$texwidth) { $texwidth=90; }
+	# what if width is undefined?
 	my $howtoskipback = $texwidth*$height/$width;
 	$result.= ' \vskip -'.$howtoskipback.' mm }  \\\\ ';
     } elsif ($target eq 'edit') {
@@ -245,11 +246,21 @@ sub start_labelgroup {
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::tag_start($target,$token);
 	$result.=&Apache::edit::text_arg('Name:','name',$token).
-	    &Apache::edit::select_arg('Type:','type',['text','image'],$token).
-	    &Apache::edit::end_row().&Apache::edit::start_spanning_row();
+	    &Apache::edit::select_arg('Type:','type',['text','image'],$token);
+	if (!defined($token->[2]{'TeXsize'})) {
+	    $token->[2]{'TeXsize'}='\normalsize';
+	}
+	$result.=&Apache::edit::select_arg('TeX font size:','TeXsize',
+					   ['\tiny','\scriptsize',
+					    '\footnotesize','\small',
+					    '\normalsize','\large','\Large',
+					    '\LARGE','\huge','\Huge'],
+					   $token);
+	$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
 	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
-						     $safeeval,'name','type');
+						     $safeeval,'name','type',
+						     'TeXsize');
 	if ($constructtag) {
 	    $result = &Apache::edit::rebuild_tag($token);
 	    $result.=&Apache::edit::handle_insert();
@@ -260,6 +271,7 @@ sub start_labelgroup {
 
 sub add_vars {
     my ($name,$order,$label,$labelorder,$value,$image,$safeeval) = @_;
+    if (!defined($name) || $name eq '') { return; }
     my $code = '${'.$name."}{'".($order+1)."'}='".$label."';";
     my $out=Apache::run::run($code,$safeeval);
     if ($value) {
@@ -314,18 +326,11 @@ sub end_labelgroup {
 	my $wwidth=&Apache::lonxml::get_param('width',$parstack,$safeeval,-2);
 	my $wheight=&Apache::lonxml::get_param('height',$parstack,$safeeval,-2);
 	my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,-2,1));
+	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
+	if (!defined($TeXsize)) { $TeXsize='\\normalsize'; }
 	if (!$texwidth) { $texwidth=90; }
-	my $TX1=0;
-	my $TY1=$texwidth*($wheight/$wwidth);
-	my $TX2=$texwidth;
-	my $TY2=0;
-
-
-	my $slopex=($wwidth-$WX1)/($TX2-$TX1);
-	my $slopey=($wheight-$WY1)/($TY2-($TY1-1.0));
-	my $cstx=$wwidth-$slopex*($TX2);
-	my $csty=$wheight-$slopey*($TY2);
-
+	my $texheight=$texwidth*($wheight/$wwidth);
+	
 	my @idx_arr = (0 .. $#Apache::randomlabel::label_arr);
 	&Apache::structuretags::shuffle(\@idx_arr);
 
@@ -333,16 +338,17 @@ sub end_labelgroup {
 	for(my $i=0;$i <= $#Apache::randomlabel::label_arr; $i++) {
 	    my $label = "$Apache::randomlabel::label_arr[ $idx_arr[$i] ]";
 	    my $x = $Apache::randomlabel::xcoord[$i];
-	    my $y = $Apache::randomlabel::ycoord[$i];
+	    # FIXME the 3.5 here is the 'height' of the letter in TeX
+	    my $y = $Apache::randomlabel::ycoord[$i]-3.5;
 	    my $value = $Apache::randomlabel::value[$i];
 	    #x latex coordinate
 	    my $tcX=($x)*($texwidth/$wwidth);
 	    #y latex coordinate
             #      my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
-	    my $tcY=$TY1-$y*($TY1/$wheight);
+	    my $tcY=$texheight-$y*($texheight/$wheight);
 	    $tcX=sprintf('%.2f',$tcX);
 	    $tcY=sprintf('%.2f',$tcY);
-	    $result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";
+	    $result.='\put('.$tcX.','.$tcY.'){'.$TeXsize.' \bf '.$label.'}'."\n";
 	    if( $type eq 'text') {
 		&add_vars($gname,$i,$label,$idx_arr[$i],$value,'',$safeeval);
 	    } elsif ( $type eq 'image') {
@@ -451,6 +457,8 @@ sub end_label {
 	    my $description = &Apache::lonxml::get_param('description',
 							 $parstack,$safeeval);
 	    push(@Apache::randomlabel::description,$description);
+	} else {
+	    $ltext=~s/[\r\n]*//gs
 	}
 	push(@Apache::randomlabel::label_arr,$ltext);
     }