--- loncom/homework/matchresponse.pm	2008/10/24 16:22:54	1.72
+++ loncom/homework/matchresponse.pm	2008/12/11 01:20:32	1.73.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.72 2008/10/24 16:22:54 bisitz Exp $
+# $Id: matchresponse.pm,v 1.73.2.1 2008/12/11 01:20:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -54,11 +54,11 @@ sub start_matchresponse {
 	$result=&Apache::response::meta_package_write('matchresponse');
     } elsif ($target eq 'edit' ) {
 	$result.=&Apache::edit::start_table($token).
-	    '<tr><td>'.&Apache::lonxml::description($token)."</td>"
+	    '<tr><td>'.&Apache::lonxml::description($token).'</td>'
            .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
 	   .&Apache::edit::deletelist($target,$token)
            .'</span></td>'
-           ."<td>&nbsp".&Apache::edit::end_row()
+           .'<td>&nbsp;'.&Apache::edit::end_row()
 	   .&Apache::edit::start_spanning_row();
 	
 	$result.=
@@ -103,12 +103,12 @@ sub start_itemgroup {
     if ($target eq 'edit') {
 	$result=&Apache::edit::tag_start($target,$token);
 	$result.=&Apache::edit::select_arg('Randomize Order:','randomize',
-					   ['yes','no'],$token);
+					   ['yes','no'],$token).'&nbsp;'x 3;
 	$result.=&Apache::edit::select_arg('Items Display Location:',
 					   'location',
 					   ['top','bottom','left','right'],
-					   $token);
-	$result.=&Apache::edit::select_arg('Items Display Directection:',
+					   $token).'&nbsp;'x 3;
+	$result.=&Apache::edit::select_arg('Items Display Direction:',
 					   'direction',
 					   ['vertical','horizontal'],
 					   $token);
@@ -198,7 +198,8 @@ sub start_item {
 	$result=&Apache::edit::tag_start($target,$token,"Item");
 	$result.=&Apache::edit::text_arg('Name:','name',$token);
 	if ($randomize ne 'no') {
-	    $result.=&Apache::edit::select_arg('Location:','location',
+	    $result.='&nbsp;'x 3 .
+                     &Apache::edit::select_arg('Location:','location',
 					       ['random','top','bottom'],
 					       $token);
 	}
@@ -254,11 +255,11 @@ sub start_foilgroup {
     &Apache::response::pushrandomnumber();
     if ($target eq 'edit') {
 	$result.=&Apache::edit::start_table($token)
-	    ."<tr><td>".&mt('Collection Of Foils')."</td>"
+	    .'<tr><td>'.&mt('Collection Of Foils').'</td>'
             .'<td><span class="LC_nobreak">'.&mt('Delete?')
 	    .&Apache::edit::deletelist($target,$token)
 	    .'</span></td>'
-            ."<td>&nbsp;".&Apache::edit::end_row()
+            .'<td>&nbsp;'.&Apache::edit::end_row()
             .&Apache::edit::start_spanning_row()."\n";
     }
     return $result;
@@ -512,27 +513,18 @@ sub displayfoils {
 		$optionlist="<option></option>\n";
 	    } else {
 		if ($Apache::lonhomework::type ne 'exam') {
-                    if($env{'form.pdfFormFields'} eq 'yes') {
-                        my $fieldname = $env{'request.symb'} . '&part_'. $Apache::inputtags::part .'&matchresponse'. '&HWVAL_' . $Apache::inputtags::response['-1'] . ':' . $temp . '&submit_' . $Apache::inputtags::part . '&';
-                        $optionlist = &Apache::lonxml::print_pdf_start_combobox($fieldname);
-                    } else {
-                        $optionlist='\framebox[10 mm][s]{\tiny\strut}';
-                    }
-                 }
+                    $optionlist='\framebox[10 mm][s]{\tiny\strut}';
+                }
 	    }
 	    my $option;
 	    foreach $option (@used_letters) {
 		if ($option eq $last_letter) {
 		    if ($target ne 'tex') {
                         $optionlist.="<option selected=\"on\">$option</option>\n";
-                    } elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') {
-                        $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option);
                     }
 		} else {
 		    if ($target ne 'tex') {
                         $optionlist.="<option>$option</option>\n";
-                    } elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') {
-                        $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option);
                     }
 		}
 	    }
@@ -576,7 +568,7 @@ sub displayfoils {
 		# Note that if left or right positioned, we must
 		# confine the bubbles to righttabsize:
 		#
-		if ($Apache::lonhomework::type eq 'exam' && $env{'form.pdfFormFields'} ne 'yes') {
+		if ($Apache::lonhomework::type eq 'exam') {
 		    $question.=' '.$optionlist.$text."\n";
 		    my @emptyItems = ();
 		    for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';}
@@ -591,11 +583,7 @@ sub displayfoils {
 		    $question .= '\end{list} \vskip -8 mm \strut ';
 		    $internal_counter++;
 	        } else {
-                    if($env{'form.pdfFormFields'} eq 'yes') {
-                        $question .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut';
-                    } else {
-                        $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";
-                    }
+                    $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";
 		}
             } 
 	    $temp++;