--- loncom/interface/lonprintout.pm	2008/04/04 16:38:34	1.529
+++ loncom/interface/lonprintout.pm	2008/09/21 21:25:21	1.536.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.529 2008/04/04 16:38:34 raeburn Exp $
+# $Id: lonprintout.pm,v 1.536.2.1 2008/09/21 21:25:21 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,6 +39,8 @@ use Apache::File();
 use Apache::lonnavmaps;
 use Apache::admannotations;
 use Apache::lonenc;
+use Apache::entities;
+
 use HTTP::Response;
 
 use LONCAPA::map();
@@ -502,12 +504,19 @@ sub adjust_number_to_print {
 	#  Unmodified.
     } else {
 	# Error!!!!
-
+	
 	croak "bad SPLIT_PDFS: $split_pdf in lonprintout::adjust_number_to_print";
+
     }
 }
 
+
 sub character_chart {
+    my $result = shift;
+    return  &Apache::entities::replace_entities($result);
+}
+
+sub old_character_chart {
     my $result = shift;	
     $result =~ s/&\#0?0?(7|9);//g;
     $result =~ s/&\#0?(10|13);//g;
@@ -629,7 +638,7 @@ sub character_chart {
     $result =~ s/&(\#165|yen);/\\textyen /g;
     $result =~ s/&(\#166|brvbar);/\\textbrokenbar /g;
     $result =~ s/&(\#167|sect);/\\textsection /g;
-    $result =~ s/&(\#168|uml);/\\texthighdieresis /g;
+    $result =~ s/&(\#168|uml);/\\"\{\} /g;
     $result =~ s/&(\#169|copy);/\\copyright /g;
     $result =~ s/&(\#170|ordf);/\\textordfeminine /g;
     $result =~ s/&(\#172|not);/\\ensuremath\{\\neg\}/g;
@@ -640,7 +649,7 @@ sub character_chart {
     $result =~ s/&(\#177|plusmn);/\\ensuremath\{\\pm\}/g;
     $result =~ s/&(\#178|sup2);/\\ensuremath\{^2\}/g;
     $result =~ s/&(\#179|sup3);/\\ensuremath\{^3\}/g;
-    $result =~ s/&(\#180|acute);/\\textacute /g;
+    $result =~ s/&(\#180|acute);/\\'\{\} /g;
     $result =~ s/&(\#181|micro);/\\ensuremath\{\\mu\}/g;
     $result =~ s/&(\#182|para);/\\P/g;
     $result =~ s/&(\#183|middot);/\\ensuremath\{\\cdot\}/g;
@@ -1142,7 +1151,11 @@ sub print_latex_header {
 	     '\usepackage[dvips]{graphicx}\usepackage{epsfig}'."\n".
 	     '\usepackage{wrapfig}'.
 	     '\usepackage{picins}\usepackage{calc}'."\n".
-	     '\usepackage[utf8]{inputenc}'."\n".
+	     '\usepackage[T1]{fontenc}'."\n".
+	     '\usepackage[postscript]{ucs}'."\n".
+	     '\usepackage[utf8x]{inputenc}'."\n".
+	     '\usepackage{pifont}'  . "\n".
+	     '\usepackage{latexsym}'."\n".
 	     '\usepackage{amsmath}'.
 	     '\usepackage{amssymb}'.
 	     '\usepackage{amsfonts}'.
@@ -1652,7 +1665,8 @@ ENDPART
              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or
              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')       or
 	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources')      or # BUGBUG
-	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences')) { 
+	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences') 
+	     ) { 
 
 
         #-- produce an output string
@@ -1660,7 +1674,8 @@ ENDPART
 	    $selectionmade = 2;
 	} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') {
 	    $selectionmade = 3;
-	} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') {
+	} elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') 
+		 ) {
 	    $selectionmade = 4;
 	} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources') {  #BUGBUG
 	    $selectionmade = 4;
@@ -1815,12 +1830,14 @@ ENDPART
 	}	
 	$result .= '\end{document}';
      } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') ||
+	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems_students') ||
 	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students')){
 
 
      #-- prints assignments for whole class or for selected students  
 	 my $type;
-	 if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') {
+	 if (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') ||
+	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems_students') ) {
 	     $selectionmade=5;
 	     $type='problems';
 	 } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students') {
@@ -2624,9 +2641,9 @@ sub printHelper {
     }
 
     # Useful filter strings
-    my $isProblem = '($res->is_problem()||$res->contains_problem) ';
+    my $isProblem = '($res->is_problem()||$res->contains_problem||$res->is_practice()) ';
     $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
-    my $isProblemOrMap = '$res->is_problem() || $res->contains_problem() || $res->is_sequence()';
+    my $isProblemOrMap = '$res->is_problem() || $res->contains_problem() || $res->is_sequence() || $res->is_practice()';
     my $isNotMap = '!$res->is_sequence()';
     $isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
     my $isMap = '$res->is_map()';
@@ -2687,6 +2704,7 @@ HELPERFRAGMENT
 
         push @{$printChoices}, [&mtn('Selected <b>Problems</b> from <b>entire course</b>'), 'all_problems', 'ALL_PROBLEMS'];
 	push @{$printChoices}, [&mtn('Selected <b>Resources</b> from <b>entire course</b>'), 'all_resources', 'ALL_RESOURCES'];
+	push @{$printChoices}, [&mtn('Selected <b>Problems</b> from <b>entire course</b> for <b>selected people</b>'), 'all_problems_students', 'ALL_PROBLEMS_STUDENTS'];
          &Apache::lonxml::xmlparse($r, 'helper', <<ALL_PROBLEMS);
   <state name="ALL_PROBLEMS" title="Select Problem(s) to print">
     <resource variable="RESOURCES" toponly='0' multichoice="1"
@@ -2707,6 +2725,26 @@ HELPERFRAGMENT
       $start_new_option
     </resource>
   </state>
+  <state name="ALL_PROBLEMS_STUDENTS" title="Select Problem(s) to print">
+    <resource variable="RESOURCES" toponly='0' multichoice="1"
+	suppressEmptySequences='0' addstatus="1" closeallpages="1">
+      <nextstate>STUDENTS1</nextstate>
+      <filterfunc>return $isProblemOrMap;</filterfunc>
+      <choicefunc>return $isNotMap;</choicefunc>
+      <valuefunc>return $symbFilter;</valuefunc>
+      $start_new_option
+    </resource>
+  </state>
+  <state name="STUDENTS1" title="Select People">
+      <message><b>Select sorting order of printout</b> </message>
+    <choices variable='student_sort'>
+      <choice computer='0'>Sort by section then student</choice>
+      <choice computer='1'>Sort by students across sections.</choice>
+    </choices>
+      <message><br /><hr /><br /> </message>
+      <student multichoice='1' variable="STUDENTS" nextstate="PRINT_FORMATTING" coursepersonnel="1"/>
+  </state>
+
 ALL_PROBLEMS
 
 	if ($helper->{VARS}->{'assignment'}) {