--- loncom/interface/lontemplate.pm	2013/05/10 23:48:12	1.45.6.4
+++ loncom/interface/lontemplate.pm	2013/09/22 15:56:24	1.51
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # "Template" Functions to generate html output
 #
-# $Id: lontemplate.pm,v 1.45.6.4 2013/05/10 23:48:12 raeburn Exp $
+# $Id: lontemplate.pm,v 1.51 2013/09/22 15:56:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,6 +40,7 @@ use Apache::lontexconvert;
 use Apache::lonfeedback;
 use Apache::lonrss();
 use Apache::lonlocal;
+use Apache::lonhtmlgateway;
 use Apache::lonmsgdisplay();
 use HTML::Entities();
 
@@ -164,24 +165,18 @@ sub print_template_fields {
         }
 	foreach my $field (sort(keys(%fields))) {
 		my $message = $data{$field} if (($data{$field}=~/\w/) || ($allowed));
+		my $legacy = 1;
                 my $display = $displays{$field};
                 unless ($allowed) {
                     next if ($noshow{$field});
                 }
+                my $gateway = Apache::lonhtmlgateway->new($target);
+                $message = &Encode::decode('utf8', $message);
+                $message = $gateway->process_outgoing_html($message, $legacy);
                 if ((%custom_handlers) && ($custom_handlers{$field})) {
-			$custom_handlers{$field}->($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed, $display);
+                    $custom_handlers{$field}->($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed, $display);
 		} else {
 			if (($data{$field}=~/\w/) || ($allowed)) {
-                                if (!&Apache::lonfeedback::contains_block_html($message)) {
-                                        &Apache::lonfeedback::newline_to_br(\$message);
-                                } else {
-                                        $message = &Apache::lonfeedback::tidy_html($message);
-                                }
-                                $message=&Apache::lonhtmlcommon::raw_href_to_link($message);
-                                if ($allowed) {
-                                        $message=&Apache::lonspeller::markeduptext($message);
-                                }
-                                $message=&Apache::lontexconvert::msgtexconverted($message);
 				if ($target ne 'tex') {
 					#output of syllabusfields will be generated here. 
 					&Apache::lontemplate::print_start_template($r,$fields{$field},'LC_Box','box_'.$field,$display);
@@ -206,6 +201,7 @@ sub print_template_fields {
 				push(@html_ids,$field);
 			}
 		}
+		undef $gateway;
 	}
 	
 	return @html_ids;