--- loncom/interface/lonprintout.pm	2003/01/28 20:36:17	1.107
+++ loncom/interface/lonprintout.pm	2003/01/30 16:57:01	1.109
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.107 2003/01/28 20:36:17 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.109 2003/01/30 16:57:01 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -240,7 +240,8 @@ sub problem_choice_menu {
 	@content_directory = &Apache::lonnet::dirlist($subdirtoprint,
 						      $domain, $user,'');
     } else {
-	@content_directory = &Apache::lonnet::dirlist($subdirtoprint);
+        #local library server res space (allows to print only from the own library server)
+	@content_directory = &Apache::lonnet::dirlist($subdirtoprint,$ENV{'user.domain'}, $ENV{'user.name'},'');
     }
     for (my $iy=0;$iy<=$#content_directory;$iy++) {
 	my @tempo_array = split(/&/,$content_directory[$iy]);
@@ -469,7 +470,7 @@ ENDPART
 	$LaTeXwidth = $1;
     }
     if ($choice eq 'Standard LaTeX output for current document') {
-      #-- single document - problem, page, html, xml  
+      #-- single document - problem, page, html, xml, ...  
       $selectionmade = 1;
       if ($ENV{'form.url'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
         my %moreenv;
@@ -646,6 +647,8 @@ ENDPART
 		&Apache::lonnet::appenv(%moreenv);
 		if ($urlp =~ m|/home/([^/]+)/public_html|) {
 		    $urlp =~ s|/home/([^/]*)/public_html|/~$1|;
+		} else {
+		    $urlp =~ s|^/home/httpd/html||;
 		}
 		my $texversion=&Apache::lonnet::ssi($urlp);
 		&Apache::lonnet::delenv('form.grade_target','form.textwidth');
@@ -1284,17 +1287,19 @@ sub page_format_transformation {
 	} else {
 	  ($textwidth,$textheight,$oddoffset,$evenoffset) = ($ENV{'form.width'},$ENV{'form.height'},$ENV{'form.leftmargin'},$ENV{'form.leftmargin'});
 	}
-	my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};	
-	if ($layout eq 'CBI') {
-	    $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}\\setlength{\\topmargin}{200pt}\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\parindent}{20pt}\\setlength{\\marginparwidth}{90pt}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm} \\begin{document}\\setcounter{page}{1}\\noindent\\parbox{\\minipagewidth}{\\noindent\\fbox{\\textbf{$ENV{'environment.firstname'} $ENV{'environment.lastname'}}} \\hfill  $courseidinfo} \\vskip 5 mm /;
-	} elsif ($layout eq 'CAPA') {
- 	    if ($choice ne 'All class print') { 
-		$text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\setlength{\\topmargin}{1cm}\\setlength{\\headheight}{1cm}\\setlength{\\headsep}{0.5cm}\\markboth{}{\\textbf{$ENV{'environment.firstname'} $ENV{'environment.lastname'}} $courseidinfo - $assignment}\\pagestyle{myheadings}\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1}/;
-	    } else {
+    my $firstname = &special_character_corrections(&Apache::lonnet::unescape($ENV{'environment.firstname'}));
+    my $lastname = &special_character_corrections(&Apache::lonnet::unescape($ENV{'environment.lastname'}));
+    my $courseidinfo = &special_character_corrections(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}));
+    if ($layout eq 'CBI') {
+	    $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}\\setlength{\\topmargin}{200pt}\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\parindent}{20pt}\\setlength{\\marginparwidth}{90pt}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm} \\begin{document}\\setcounter{page}{1}\\noindent\\parbox{\\minipagewidth}{\\noindent\\fbox{\\textbf{$firstname $lastname}} \\hfill  $courseidinfo} \\vskip 5 mm /;
+    } elsif ($layout eq 'CAPA') {
+	if ($choice ne 'All class print') { 
+		$text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\setlength{\\topmargin}{1cm}\\setlength{\\headheight}{1cm}\\setlength{\\headsep}{0.5cm}\\markboth{}{\\textbf{$firstname $lastname} $courseidinfo - $assignment}\\pagestyle{myheadings}\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1}/;
+	} else {
 		$text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1}  \\vskip 5 mm /;
-	    }
 	}
-	return $text;
+    }
+    return $text;
 }
 
 
@@ -1337,6 +1342,15 @@ sub details_for_menu {
 }
 
 
+sub special_character_corrections {
+    my $argument = shift;
+    $argument =~ s/_/ /g;
+    $argument =~ s/\^/ /g;
+    $argument =~ s/&/\\&/g;
+    return $argument;
+}
+
+
 sub latex_corrections {
 
     my ($number_of_columns,$result) = @_;