--- loncom/homework/randomlabel.pm	2003/09/08 19:08:57	1.47
+++ loncom/homework/randomlabel.pm	2003/09/23 21:20:42	1.49
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
 #
-# $Id: randomlabel.pm,v 1.47 2003/09/08 19:08:57 albertel Exp $
+# $Id: randomlabel.pm,v 1.49 2003/09/23 21:20:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -92,7 +92,8 @@ sub start_randomlabel {
     }
     my $w= &check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval));
     my $h= &check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval));
-    my $texwidth= &Apache::lonxml::get_param('texwidth',$parstack,$safeeval);
+    my $texwidth= &Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1);
+    if (!$texwidth) { $texwidth=90; }
     $Apache::randomlabel::tlabel_cnt=0;
     $Apache::randomlabel::ilabel_cnt=0;
     if ($target eq 'web') {
@@ -178,7 +179,8 @@ sub end_randomlabel {
 	$result='\end{picture}\\\\';
 	my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval);
 	my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
-	my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval);
+	my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1);
+        if (!$texwidth) { $texwidth=90; }
 	my $howtoskipback = $texwidth*$height/$width;
 	$result.= ' \vskip -'.$howtoskipback.' mm }  \\\\ ';
     } elsif ($target eq 'edit') {
@@ -193,6 +195,9 @@ sub start_labelgroup {
     my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
     my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval);
     $type =~tr/A-Z/a-z/;
+    if ($target ne 'modified' && ($name =~ /\W/ || $name =~ /^[0-9]/)) {
+	&Apache::lonxml::error("Only _ a-z A-Z and 0-9 are allowed in the name to a labelgroup, and the first character can not be a number.<br />");
+    }
     if ($target eq 'web' || $target eq 'tex' ||
 	$target eq 'grade' || $target eq 'answer' || $target eq 'analyze') {
 	$Apache::randomlabel::groupname=$name;
@@ -282,7 +287,8 @@ sub end_labelgroup {
 	my $WY1=0; #  Web y-coord. of (ULC)
 	my $wwidth=&Apache::lonxml::get_param('width',$parstack,$safeeval,-2);
 	my $wheight=&Apache::lonxml::get_param('height',$parstack,$safeeval,-2);
-	my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,-2);
+	my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,-2,1);
+	if (!$texwidth) { $texwidth=90; }
 	my $TX1=0;
 	my $TY1=$texwidth*($wheight/$wwidth);
 	my $TX2=$texwidth;