--- loncom/interface/lonprintout.pm	2005/08/22 22:21:48	1.388
+++ loncom/interface/lonprintout.pm	2005/10/07 10:21:08	1.394
@@ -1,7 +1,7 @@
-#  The LearningOnline Network
+# The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.388 2005/08/22 22:21:48 foxr Exp $
+# $Id: lonprintout.pm,v 1.394 2005/10/07 10:21:08 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,8 +42,6 @@ use Apache::lonratedt;
 use POSIX qw(strftime);
 use Apache::lonlocal;
 
-my $resources_printed = '';
-
 #
 #   Convert a numeric code to letters
 #
@@ -508,6 +506,7 @@ sub character_chart {
     $result =~ s/&(prod|\#8719);/\\ensuremath\{\\prod\}/g;
     $result =~ s/&(sum|\#8721);/\\ensuremath\{\\sum\}/g;
     $result =~ s/&(minus|\#8722);/\\ensuremath\{-\}/g;
+    $result =~ s/–/\\ensuremath\{-\}/g;
     $result =~ s/&(lowast|\#8727);/\\ensuremath\{*\}/g;
     $result =~ s/&(radic|\#8730);/\\ensuremath\{\\surd\}/g;
     $result =~ s/&(prop|\#8733);/\\ensuremath\{\\propto\}/g;
@@ -822,6 +821,7 @@ sub print_latex_header {
     $output.='\newcommand{\keephidden}[1]{}\renewcommand{\deg}{$^{\circ}$}'."\n".
 	     '\usepackage{longtable}\usepackage{textcomp}\usepackage{makeidx}'."\n".
 	     '\usepackage[dvips]{graphicx}\usepackage{epsfig}'."\n".
+	     '\usepackage{wrapfig}'.
 	     '\usepackage{picins}\usepackage{calc}'."\n".
 	     '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}'."\n".
 	     '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}'."\n".
@@ -926,6 +926,7 @@ sub get_page_breaks  {
 sub output_data {
     my ($r,$helper,$rparmhash) = @_;
     my %parmhash = %$rparmhash;
+    my $resources_printed = '';
     my $html=&Apache::lonxml::xmlbegin();
     my $bodytag=&Apache::loncommon::bodytag('Preparing Printout');
     $r->print(<<ENDPART);
@@ -1386,11 +1387,8 @@ ENDPART
 	     $code_type=$result{"type\0$old_name"};
 	     @allcodes=split(',',$result{$old_name});
 	     $num_todo=scalar(@allcodes);
-	 } elsif ($selected_code) {
+	 } elsif ($selected_code) { # Selection value is always numeric.
 	     $num_todo = 1;
-	     my ($alpha, $numeric) = split(/:/, $selected_code);
-	     $selected_code = $numeric;	# Always use numeric, converted if need be.
-	     $selected_code =~ s/\s+//g;
 	     @allcodes = ($selected_code);
 	 } elsif ($single_code) {
 
@@ -1633,7 +1631,7 @@ sub get_CODE {
     my $max='1'.'0'x$size;
     my $newcode;
     while(1) {
-	$newcode=sprintf("%06d",int(rand($max)));
+	$newcode=sprintf("%0".$size."d",int(rand($max)));
 	if (!exists($$all_codes{$newcode})) {
 	    $$all_codes{$newcode}=1;
 	    if ($type eq 'number' ) {
@@ -1854,21 +1852,27 @@ sub printHelper {
     $helper->declareVar("showallfoils");
 
     #  The page breaks can get loaded initially from the course environment:
+    # But we only do this in the initial state so that they are allowed to change.
+    #
 
-    if((!defined($env{"form.CURRENT_STATE"}))  ||
-       ($env{'form.CURRENT_STATE'} == "START")) {
-	$helper->{VARS}->{FINISHPAGE} = ""; # In case they did a back e.g.
-    }
-
-
+    $helper->{VARS}->{FINISHPAGE} = '';
     
     &Apache::loncommon::restore_course_settings('print',
 						{'pagebreaks'  => 'scalar',
 					         'lastprinttype' => 'scalar'});
-
     
-    if("$helper->{VARS}->{PRINT_TYPE}" eq "$env{'form.lastprinttype'}") {
-	$helper->{VARS}->{FINISHPAGE} = $env{'form.pagebreaks'};
+    
+    if($helper->{VARS}->{PRINT_TYPE} eq $env{'form.lastprinttype'}) {
+	if (!defined ($env{"form.CURRENT_STATE"})) {
+	    
+	    $helper->{VARS}->{FINISHPAGE} = $env{'form.pagebreaks'};
+	} else {
+	    my $state = $env{"form.CURRENT_STATE"};
+	    if ($state eq "START") {
+		$helper->{VARS}->{FINISHPAGE} = $env{'form.pagebreaks'};
+	    }
+	}
+	
     }
     
     
@@ -1978,7 +1982,7 @@ sub printHelper {
     $helper->declareVar('SEQUENCE');
 
     # Useful for debugging: Dump the help vars
-#    $r->print(Dumper($helper->{VARS}));
+#     $r->print(Dumper($helper->{VARS}));
 #    $r->print($map);
 
     # If we're in a sequence...
@@ -2096,20 +2100,26 @@ CHOOSE_STUDENTS
 	    if ($name =~ /^type\0/) { next; }
 	    $namechoice.='<choice computer="'.$name.'">'.$name.'</choice>';
 	}
+
+
         my %all_codes = &Apache::lonnet::get('CODEs',
 					     \@names, $cdom,$cnum);
+	my %code_values;
 	my @all_code_array;
 	foreach my $key (keys %all_codes) {
-	    my $codes = $all_codes{$key};
-	    my @numeric_codes = split(/,/,$codes);
-	    foreach my $numeric (sort {uc($a) cmp uc($b)} @numeric_codes) {
-		my $alpha_code = &num_to_letters($numeric);
-		push (@all_code_array, "$alpha_code : $numeric");
+	    %code_values = &Apache::grades::get_codes($key, $cdom, $cnum);
+	    foreach my $key (keys %code_values) {
+		push (@all_code_array, "$key");
 	    }
 	}
+
 	my $code_selection = "<choice></choice>\n";
-	foreach my $code (@all_code_array) {
-	    $code_selection .= '   <choice computer="'.$code.'">'.$code."</choice>\n";
+	foreach my $code (sort {uc($a) cmp uc($b)} @all_code_array) {
+	    my $choice  = $code;
+	    if ($code =~ /^[A-Z]+$/) { # Alpha code
+		$choice = &letters_to_num($code);
+	    }
+	    $code_selection .= '   <choice computer="'.$choice.'">'.$code."</choice>\n";
 	}
 	open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
 	my $codechoice='';
@@ -2318,6 +2328,8 @@ CHOOSE_FROM_SUBDIR
       <nextstate>CHOOSE_FROM_ANY_SEQUENCE</nextstate>
       <filterfunc>return \$res->is_sequence;</filterfunc>
       <valuefunc>return $urlValue;</valuefunc>
+      <choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);
+	</choicefunc>
       <option text='Newpage' variable='FINISHPAGE' />
       </resource>
     </state>