--- loncom/interface/lonprintout.pm	2003/08/13 15:28:57	1.209
+++ loncom/interface/lonprintout.pm	2003/08/13 19:38:16	1.212
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.209 2003/08/13 15:28:57 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.212 2003/08/13 19:38:16 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -465,11 +465,10 @@ sub page_format {
 sub get_name {
     my ($uname,$udom)=@_;
     if (!defined($uname)) { $uname=$ENV{'user.name'}; }
-    if (!defined($udom)) { $uname=$ENV{'user.domain'}; }
+    if (!defined($udom)) { $udom=$ENV{'user.domain'}; }
     my $plainname=&Apache::loncommon::plainname($uname,$udom);
     if ($plainname=~/^\s*$/) { $plainname=$uname; }
-    return &Apache::lonxml::latex_special_symbols($plainname,undef,undef,
-						  'header');
+    return &Apache::lonxml::latex_special_symbols($plainname,'header');
 }
 
 
@@ -484,10 +483,9 @@ sub page_format_transformation {
 	}
     my $name = &get_name();
     if ($name =~ /^\s*$/) {
-	$name=&Apache::lonxml::latex_special_symbols($ENV{'user.name'},undef,
-						     undef,'header');
+	$name=&Apache::lonxml::latex_special_symbols($ENV{'user.name'},'header');
     }
-    my $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'','','header');
+    my $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'header');
     if ($layout eq 'album') {
 	my $topmargintoinsert = '';
 	if ($topmargin ne '0') {$topmargintoinsert='\setlength{\topmargin}{'.$topmargin.'}';}
@@ -714,10 +712,9 @@ ENDPART
 	    if (($selectionmade == 4) and ($assignment ne $prevassignment) and ($i>=1)) {
 		my $name = &get_name();
 		if ($name =~ /^\s*$/) {
-		    $name=&Apache::lonxml::latex_special_symbols($ENV{'user.name'},undef,
-								 undef,'header');
+		    $name=&Apache::lonxml::latex_special_symbols($ENV{'user.name'},'header');
 		}
-		my $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'','','header');
+		my $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'header');
 		$prevassignment=$assignment;
 		$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$name.'}} - '.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}} \vskip -5 mm ';
 	    }
@@ -1156,7 +1153,7 @@ CHOOSE_FROM_SUBDIR
     if (($ENV{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) or 
 	($helper->{VARS}->{'construction'} eq '1')) {
         $paramHash = Apache::lonhelper::getParamHash();
-        $paramHash->{MESSAGE_TEXT} = "<br /><big><b><i>Next option is available only for advanced users:</i></b></big><br />";
+        $paramHash->{MESSAGE_TEXT} = "<br /><big><b><i>Next option is available only for advanced users:  </i></b></big>";
         Apache::lonhelper::message->new();
         $paramHash = Apache::lonhelper::getParamHash();
 	$paramHash->{'variable'} = 'ANSWER_TYPE';   
@@ -1164,12 +1161,12 @@ CHOOSE_FROM_SUBDIR
         $paramHash->{CHOICES} = [
                                    ['Print without answer', 'yes'],
                                    ['Print with answers', 'no'] ];
-        Apache::lonhelper::choices->new();
+        Apache::lonhelper::dropdown->new();
     }
 
     if ($ENV{'request.role.adv'}) {
         $paramHash = Apache::lonhelper::getParamHash();
-        $paramHash->{MESSAGE_TEXT} = "<br /><big><b><i>Another option available only for advanced users:</i></b></big><br />";
+        $paramHash->{MESSAGE_TEXT} = "<br /><big><b><i>Another option available only for advanced users:  </i></b></big>";
         Apache::lonhelper::message->new();
         $paramHash = Apache::lonhelper::getParamHash();
 	$paramHash->{'variable'} = 'LATEX_TYPE';   
@@ -1183,12 +1180,12 @@ CHOOSE_FROM_SUBDIR
 				     ['Print in LaTeX batchmode', 'batchmode'],
 				     ['Print in standard LaTeX mode', 'standard'] ];
 	}
-        Apache::lonhelper::choices->new();
+        Apache::lonhelper::dropdown->new();
     } 
 
     
         $paramHash = Apache::lonhelper::getParamHash();
-        $paramHash->{MESSAGE_TEXT} = "<br /><big><b>Print with <i>Table of Contents:</i></b></big>";
+        $paramHash->{MESSAGE_TEXT} = "<br /><big><b>Print with <i>Table of Contents:  </i></b></big>";
         Apache::lonhelper::message->new();
         $paramHash = Apache::lonhelper::getParamHash();
 	$paramHash->{'variable'} = 'TABLE_CONTENTS';   
@@ -1196,7 +1193,7 @@ CHOOSE_FROM_SUBDIR
         $paramHash->{CHOICES} = [
                                    ['No', 'no'],
                                    ['Yes', 'yes'] ];
-        Apache::lonhelper::choices->new();
+        Apache::lonhelper::dropdown->new();
 
 
     Apache::lonprintout::page_format_state->new("FORMAT");