--- loncom/interface/lonprintout.pm	2005/08/29 10:06:52	1.389
+++ loncom/interface/lonprintout.pm	2005/09/16 20:45:00	1.392
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.389 2005/08/29 10:06:52 foxr Exp $
+# $Id: lonprintout.pm,v 1.392 2005/09/16 20:45:00 albertel 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;
@@ -926,6 +925,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);
@@ -1630,7 +1630,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' ) {
@@ -2321,6 +2321,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>