--- loncom/interface/lonprintout.pm	2008/03/31 09:51:11	1.527
+++ loncom/interface/lonprintout.pm	2008/05/05 10:48:56	1.534
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.527 2008/03/31 09:51:11 foxr Exp $
+# $Id: lonprintout.pm,v 1.534 2008/05/05 10:48:56 foxr 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();
@@ -150,7 +152,7 @@ sub ssi_with_retries {
 	$ssi_error               = 1;
 	$ssi_last_error_resource = $resource;
 	$ssi_last_error          = $response->code . " " . $response->message;
-        $content='\section*{!!! An error occured !!!}';	
+        $content='\section*{!!! An error occurred !!!}';	
 	&Apache::lonnet::logthis("Error in SSI resource: $resource Error: $ssi_last_error");
     }
 
@@ -166,7 +168,7 @@ sub get_student_view_with_retries {
         $ssi_error               = 1;
         $ssi_last_error_resource = $curresline.' for user '.$username.':'.$userdomain;
         $ssi_last_error          = $response->code . " " . $response->message;
-        $content='\section*{!!! An error occured !!!}';
+        $content='\section*{!!! An error occurred !!!}';
         &Apache::lonnet::logthis("Error in SSI (student view) resource: $curresline Error: $ssi_last_error User: $username:$userdomain");
     }
     return $content;
@@ -507,7 +509,13 @@ sub 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 +637,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 +648,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 +1150,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".
+	     '\usepacakge{pifont}'  . "\n".
+	     '\usepackage{latexsym}'."\n".
 	     '\usepackage{amsmath}'.
 	     '\usepackage{amssymb}'.
 	     '\usepackage{amsfonts}'.
@@ -2185,26 +2197,26 @@ ENDPART
 				"cgi.$identifier.resources" => $resources_printed});
 	
     my $end_page = &Apache::loncommon::end_page();
+    my $continue_text = &mt('Continue');
     # If there's been an unrecoverable SSI error, report it to the user
     if ($ssi_error) {
         my $helpurl = &Apache::loncommon::top_nav_help('Helpdesk');
-        my $end_page = &Apache::loncommon::end_page();
         $r->print('<br /><h2>'.&mt('An unrecoverable network error occurred:').'</h2><p>  '.
                   &mt('At least one of the resources you chose to print could not be rendered due to an unrecoverable error when communicating with a server:').
                   '<br />'.$ssi_last_error_resource.'<br />'.$ssi_last_error.
                   '</p><p>'.&mt('You can continue using the link provided below, but make sure to carefully inspect your output file! The errors will be marked in the file.').'<br />'.
-                  &mt('You may be able to reprint the individual resources for which this error occured, as the issue may be temporary.').
+                  &mt('You may be able to reprint the individual resources for which this error occurred, as the issue may be temporary.').
                   '<br />'.&mt('If the error persists, please contact the [_1] for assistance.',$helpurl).'</p><p>'.
                   &mt('We apologize for the inconvenience.').'</p>'.
-                  '<a href="/cgi-bin/printout.pl?'.$identifier.'">Continue</a>'.$end_page);
+                  '<a href="/cgi-bin/printout.pl?'.$identifier.'">'.$continue_text.'</a>'.$end_page);
     } else {
 	$r->print(<<FINALEND);
 <br />
 <meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$identifier" />
-<a href="/cgi-bin/printout.pl?$identifier">Continue</a>
+<a href="/cgi-bin/printout.pl?$identifier">$continue_text</a>
 $end_page
 FINALEND
-  }                                       # endif ssi errors.
+    }                                     # endif ssi errors.
 }
 
 
@@ -2319,7 +2331,7 @@ sub print_resources {
 		    $current_output .= $rendered;		    
 		} elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
 		    $printed .= $curresline.':';
-		    my $rendered = &get_student_view($curresline,$ssi_retry_count,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
+		    my $rendered = &get_student_view_with_retries($curresline,$ssi_retry_count,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
 		    if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
 			my $url = &Apache::lonnet::clutter($res_url);
 			my $annotation = &annotate($url);