--- loncom/interface/lonprintout.pm	2004/01/15 16:38:48	1.268
+++ loncom/interface/lonprintout.pm	2004/03/15 20:27:57	1.270.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.268 2004/01/15 16:38:48 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.270.2.2 2004/03/15 20:27:57 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -86,7 +86,7 @@ sub character_chart {
     $result =~ s/&\#0?55;/7/g;
     $result =~ s/&\#0?56;/8/g;
     $result =~ s/&\#0?57;/9/g;
-    $result =~ s/&(\#0?58|colon);/:/g;
+    $result =~ s/&\#0?58;/:/g;
     $result =~ s/&\#0?59;/;/g;
     $result =~ s/&(\#0?60|lt|\#139);/\$<\$/g;
     $result =~ s/&\#0?61;/\$=\$/g;
@@ -474,7 +474,6 @@ sub get_course {
 sub page_format_transformation {
     my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment,$tableofcontents,$indexlist) = @_; 
     my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin);
-    $assignment=&character_chart($assignment);
     $assignment=&Apache::lonxml::latex_special_symbols($assignment,'header');
     ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = &page_format($papersize,$layout,$numberofcolumns,$topmargin);
     my $name = &get_name();
@@ -516,20 +515,16 @@ sub page_cleanup {
 
 sub details_for_menu {
 
-    my $name_of_resourse = $hash{'title_'.$hash{'ids_'.$ENV{'form.postdata'}}};
-    $name_of_resourse=&character_chart($name_of_resourse);
+    my $name_of_resourse = &Apache::lonnet::gettitle($ENV{'form.postdata'});
     my $symbolic = &Apache::lonnet::symbread($ENV{'form.postdata'});
     my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symbolic);
     $map=&Apache::lonnet::clutter($map);
-    my $name_of_sequence;
-    $name_of_sequence = $hash{'title_'.$hash{'ids_'.$map}};
-    $name_of_sequence=&character_chart($name_of_sequence);
+    my $name_of_sequence = &Apache::lonnet::gettitle($map);
     if ($name_of_sequence =~ /^\s*$/) {
 	$map =~ m|([^/]+)$|;
 	$name_of_sequence = $1;
     }
-    my $name_of_map = $hash{'title_'.$hash{'ids_'.&Apache::lonnet::clutter($ENV{'request.course.uri'})}};
-    $name_of_map=&character_chart($name_of_map);
+    my $name_of_map = &Apache::lonnet::gettitle($ENV{'request.course.uri'});
     if ($name_of_map =~ /^\s*$/) {
 	$ENV{'request.course.uri'} =~ m|([^/]+)$|;
 	$name_of_map = $1;
@@ -652,6 +647,20 @@ sub path_to_problem {
     return '{\small\noindent\verb|'.$newurlp.'|\vskip 0 mm}';
 }
 
+sub recalcto_mm {
+    my $textwidth=shift;
+    my $LaTeXwidth;
+    if ($textwidth=~/(\d+\.?\d*)\s*cm/) {
+	$LaTeXwidth = $1*10;
+    } elsif ($textwidth=~/(\d+\.?\d*)\s*mm/) {
+	$LaTeXwidth = $1;
+    } elsif ($textwidth=~/(\d+\.?\d*)\s*in/) {
+	$LaTeXwidth = $1*25.4;
+    }
+    $LaTeXwidth.=' mm';
+    return $LaTeXwidth;
+}
+
 sub output_data {
     my ($r,$helper,$rparmhash) = @_;
     my %parmhash = %$rparmhash;
@@ -701,16 +710,7 @@ ENDPART
     }
     my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$laystyle,$numberofcolumns);
     my $assignment =  $ENV{'form.assignment'};
-    my $LaTeXwidth; 
-    if ($textwidth=~/(\d+\.?\d*)\s*cm/) {
-	$LaTeXwidth = $1*10;
-    } elsif ($textwidth=~/(\d+\.?\d*)\s*mm/) {
-	$LaTeXwidth = $1;
-    } elsif ($textwidth=~/(\d+\.?\d*)\s*in/) {
-	$LaTeXwidth = $1*25.4;
-    }
-    $LaTeXwidth.=' mm';
-    
+    my $LaTeXwidth=&recalcto_mm($textwidth);
     if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
       #-- single document - problem, page, html, xml, ...
 	my $currentURL;
@@ -737,7 +737,12 @@ ENDPART
 		}
 		my %form;
 		$form{'grade_target'}='tex';
-		$form{'textwidth'}=$LaTeXwidth;	
+		if ($helper->{'VARS'}->{'pagesize.width'}=~/\d+/ &&
+                    $helper->{'VARS'}->{'pagesize.widthunit'}=~/\w+/) {
+		    $form{'textwidth'}=&recalcto_mm($helper->{'VARS'}->{'pagesize.width'}.' '.$helper->{'VARS'}->{'pagesize.widthunit'});
+		} else {
+		    $form{'textwidth'}=$LaTeXwidth;
+		}
 		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		if ($helper->{'VARS'}->{'curseed'}) {
@@ -747,7 +752,7 @@ ENDPART
 		&Apache::lonnet::appenv(%moreenv);
 		&Apache::lonnet::delenv('form.counter');
 		&Apache::lonxml::init_counter();
-		$texversion=&Apache::lonnet::ssi($currentURL,%form);
+		$texversion.=&Apache::lonnet::ssi($currentURL,%form);
 		&Apache::lonnet::delenv('form.counter');
 		&Apache::lonnet::delenv('request.filename');
 	    }
@@ -802,7 +807,12 @@ ENDPART
 		    if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
 			my %form;
 			$form{'grade_target'}='tex';
-			$form{'textwidth'}=$LaTeXwidth;
+			if ($helper->{'VARS'}->{'pagesize.width'}=~/\d+/ &&
+			    $helper->{'VARS'}->{'pagesize.widthunit'}=~/\w+/) {
+			    $form{'textwidth'}=&recalcto_mm($helper->{'VARS'}->{'pagesize.width'}.' '.$helper->{'VARS'}->{'pagesize.widthunit'});
+			} else {
+			    $form{'textwidth'}=$LaTeXwidth;
+			}
 			$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 			$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 			$form{'rndseed'}=$rndseed;
@@ -848,7 +858,12 @@ ENDPART
 	} elsif ($currentURL=~/\/smppg$/) { 
 		my %form;
 		$form{'grade_target'}='tex';
-		$form{'textwidth'}=$LaTeXwidth;	
+		if ($helper->{'VARS'}->{'pagesize.width'}=~/\d+/ &&
+                    $helper->{'VARS'}->{'pagesize.widthunit'}=~/\w+/) {
+		    $form{'textwidth'}=&recalcto_mm($helper->{'VARS'}->{'pagesize.width'}.' '.$helper->{'VARS'}->{'pagesize.widthunit'});
+		} else {
+		    $form{'textwidth'}=$LaTeXwidth;
+		}	
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		my $texversion=&Apache::lonnet::ssi($currentURL,%form);
 		$result .= $texversion;
@@ -870,13 +885,19 @@ ENDPART
         #-- produce an output string
 	my %form=();	   
 	$form{'grade_target'}='tex';
-	$form{'textwidth'}=$LaTeXwidth;
+	if ($helper->{'VARS'}->{'pagesize.width'}=~/\d+/ &&
+	    $helper->{'VARS'}->{'pagesize.widthunit'}=~/\w+/) {
+	    $form{'textwidth'}=&recalcto_mm($helper->{'VARS'}->{'pagesize.width'}.' '.$helper->{'VARS'}->{'pagesize.widthunit'});
+	} else {
+	    $form{'textwidth'}=$LaTeXwidth;
+	}
 	$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 	$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 	my $flag_latex_header_remove = 'NO';
 	my $flag_page_in_sequence = 'NO';
 	my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
 	my $prevassignment='';
+	&Apache::lonnet::delenv('form.counter');
 	&Apache::lonxml::init_counter();
 	for (my $i=0;$i<=$#master_seq;$i++) {
 	    my (undef,undef,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
@@ -892,7 +913,6 @@ ENDPART
 	    }
 	    $form{'symb'}=$master_seq[$i];
 	    my ($sequence)=&Apache::lonnet::decode_symb($master_seq[$i]);
-	    $assignment=&character_chart($assignment);
 	    my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($sequence),'header'); #tittle of the assignment which contains this problem
 	    if ($selectionmade==7) {$helper->{VARS}->{'assignment'}=$assignment;}
 	    if ($i==0) {$prevassignment=$assignment;}
@@ -963,7 +983,12 @@ ENDPART
 	 #loop over students
 	 my $flag_latex_header_remove = 'NO'; 
 	 my %moreenv;
-	 $moreenv{'form.textwidth'}=$LaTeXwidth;
+	 if ($helper->{'VARS'}->{'pagesize.width'}=~/\d+/ &&
+	     $helper->{'VARS'}->{'pagesize.widthunit'}=~/\w+/) {
+	     $moreenv{'form.textwidth'}=&recalcto_mm($helper->{'VARS'}->{'pagesize.width'}.' '.$helper->{'VARS'}->{'pagesize.widthunit'});
+	 } else {
+	     $moreenv{'form.textwidth'}=$LaTeXwidth;
+	 }
 	 &Apache::lonnet::appenv(%moreenv);
 	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1);
 	 foreach my $person (@students) {
@@ -1016,7 +1041,6 @@ ENDPART
 	    }
 	    my $courseidinfo = &get_course();
 	    if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
-	    $assignment=&character_chart($assignment);
 	    my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
 	    if ($current_output=~/\\documentclass/) {
 		$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}}$courseidinfo \\hfill \\thepage \\\\ \\textit{$currentassignment}}\\vskip 3 mm /;
@@ -1050,7 +1074,12 @@ ENDPART
 	    if ($urlp=~/\//) {
 		my %form;
 		$form{'grade_target'}='tex';
-		$form{'textwidth'}=$LaTeXwidth;
+		if ($helper->{'VARS'}->{'pagesize.width'}=~/\d+/ &&
+                    $helper->{'VARS'}->{'pagesize.widthunit'}=~/\w+/) {
+		    $form{'textwidth'}=&recalcto_mm($helper->{'VARS'}->{'pagesize.width'}.' '.$helper->{'VARS'}->{'pagesize.widthunit'});
+		} else {
+		    $form{'textwidth'}=$LaTeXwidth;
+		}
 		$form{'rndseed'}=$rndseed;
 		if ($urlp =~ m|/home/([^/]+)/public_html|) {
 		    $urlp =~ s|/home/([^/]*)/public_html|/~$1|;