--- loncom/interface/lonprintout.pm	2002/10/22 22:07:50	1.81
+++ loncom/interface/lonprintout.pm	2003/05/06 20:50:04	1.155
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.81 2002/10/22 22:07:50 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.155 2003/05/06 20:50:04 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -66,37 +66,41 @@ sub headerform {
 <body bgcolor="FFFFFF">
 <form method="post" enctype="multipart/form-data" action="/adm/printout" name="printform">
 ENDHEADER
-    if ($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) { 
-    $r->print(<<ENDHEADER1);
+
+    if ($ENV{'form.postdata'}=~m|^/res/|) {
+	$r->print(<<ENDHEADER1);
 <b>Path to current document: </b><tt>$ENV{'form.postdata'}</tt><p>
 ENDHEADER1
-}
+    }
 }
 
 
 sub menu_for_output {
     my $r = shift;
     my ($title_for_single_resource,$title_for_sequence,$title_for_main_map) = &details_for_menu;
+    my $assignment = $title_for_sequence;
     if ($title_for_single_resource ne '') {$title_for_single_resource = '"'.$title_for_single_resource.'"';}
     if ($title_for_sequence ne '') {$title_for_sequence = '"'.$title_for_sequence.'"';}
     if ($title_for_main_map ne '') {$title_for_main_map = '"'.$title_for_main_map.'"';}
+    $ENV{'form.postdata'} =~ s|http://[^/]+||;
     my $subdir_to_print = $ENV{'form.postdata'};
     $subdir_to_print =~ m/\/([^\/]+)$/;
-    $subdir_to_print =~ s/$1//;
+    $subdir_to_print =~ s/\Q$1\E//;
     $r->print(<<ENDMENUOUT1);
 <h1>What do you want to print? Make a choice.</h1><br />
 <input type="hidden" name="phase" value="two">
 <input type="hidden" name="url" value="$ENV{'form.postdata'}">
+<input type="hidden" name="assignment" value="$assignment">
 <input type="radio" name="choice" value="Standard LaTeX output for current document" checked>  Current document <b>$title_for_single_resource</b>
 (prints what you just saw on the screen)<br />
 ENDMENUOUT1
-    if ((not $ENV{'request.role'}=~m/^au\./) and (not $ENV{'request.role'}=~m/^ca\./)) {
+    if ($ENV{'form.postdata'}=~/\/res\//) {
 	$r->print(<<ENDMENUOUT2);
-<input type="radio" name="choice" value="Standard LaTeX output for the primary sequence">  All problems from <b>$title_for_sequence</b><br />
-<input type="radio" name="choice" value="Standard LaTeX output for whole primary sequence">  All problems plus any pages or html/xml files from <b>$title_for_sequence</b><br />
+<input type="radio" name="choice" value="Standard LaTeX output for the primary sequence">  Problem(s) from <b>$title_for_sequence</b><br />
+<input type="radio" name="choice" value="Standard LaTeX output for whole primary sequence">  Problem(s) plus page(s) or html/xml file(s) from <b>$title_for_sequence</b><br />
 ENDMENUOUT2
     }
-    if ($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) { 
+    if (($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) and ($ENV{'form.postdata'}=~/\/res\//)) { 
 	$r->print(<<ENDMENUOUT6);
 <input type="radio" name="choice" value="Standard LaTeX output for the top level sequence">  All problems in this course (<b>warning:</b> this may be time consuming) <br />
 <br />
@@ -105,7 +109,7 @@ ENDMENUOUT6
     }
       my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
       $subdirtoprint =~ s/\/[^\/]+$//;
-      if (&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') {
+      if ((&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') and ($ENV{'form.postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) {
 	  $r->print(<<ENDMENUOUT4);
   <input type="radio" name="choice" value="Subdirectory print">  Problems from current subdirectory <b>$subdir_to_print</b><br />
 ENDMENUOUT4
@@ -140,6 +144,7 @@ ENDMENUOUT4
                                            </select> 
    </td>
  </tr>
+
 </table>
 </br> 
 <input type="submit" value="Submit your choice">
@@ -147,21 +152,101 @@ ENDMENUOUT5
 }
 
 
+sub sequence_content_menu {
+    my ($key_to,$r) = @_;
+    my $primary_sequence;
+    my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
+    my @sequence = split('___',$symbolic);
+    $primary_sequence=&Apache::lonnet::clutter($sequence[0]);
+    my @master_seq = &coming_from_hash($primary_sequence);
+    my @titles_master_seq = (); 
+    for (my $i=0;$i<=$#master_seq;$i++) {
+	my ($path,$title,$symb) = split /&&/,$master_seq[$i];
+	$master_seq[$i] = $path.'&&'.$symb;
+        push @titles_master_seq,  $title;
+    }
+    my @master_seq_view = @master_seq;
+    if ($ENV{'user.adv'}) {
+      for (my $i=0;$i<=$#master_seq_view;$i++) {
+	 $master_seq_view[$i]=~/___\d+___(.+)$/;
+	 $master_seq_view[$i]='/'.$1;
+      }
+    } else {
+      for (my $i=0;$i<=$#master_seq_view;$i++) {
+         $master_seq_view[$i]=' ';
+      }
+    }
+    $r->print(<<ENDMENUOUT1);
+<input type="hidden" name="url" value="$ENV{'form.url'}">
+<input type="hidden" name="choice" value="$ENV{'form.choice'}">
+<input type="hidden" name="layout" value="$ENV{'form.layout'}">
+<input type="hidden" name="papersize" value="$ENV{'form.papersize'}">
+<input type="hidden" name="assignment" value="$ENV{'form.assignment'}">
+<input type="hidden" name="numberofcolumns" value="$ENV{'form.numberofcolumns'}">
+<h1>Mark item(s) which you want to print</h1>
+<script>
+    function checkall() {
+	for (i=0; i<document.forms.printform.elements.length; i++) {
+            if (document.forms.printform.elements[i].name.indexOf('whatfile')==0) {
+	      document.forms.printform.elements[i].checked=true;
+            }
+        }
+    }
+    function uncheckall() {
+	for (i=0; i<document.forms.printform.elements.length; i++) {
+            if 
+          (document.forms.printform.elements[i].name.indexOf('whatfile')==0) {
+	      document.forms.printform.elements[i].checked=false;
+            }
+        }
+    }
+</script>
+<b>
+<input type=button onClick="checkall()" value="Check All">&nbsp;
+<input type=button onClick="uncheckall()" value="Uncheck">&nbsp;
+<input type="submit" value="Submit">
+<p>
+ENDMENUOUT1
+    my $inc=0; 
+    for (my $i=0;$i<=$#master_seq_view;$i++) {
+      if ($key_to==1 && $master_seq[$i]=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
+	$r->print('<br /><input type=checkbox name="whatfile'.$inc.'" value="'.$master_seq[$i].'"> '."\n".'<b>'.
+                  $titles_master_seq[$i].'</b>&nbsp;&nbsp;&nbsp;<small>'.$master_seq_view[$i].'</small>');
+        $inc++;
+    } elsif ($key_to==0 && $master_seq[$i]=~/\.(problem|exam|quiz|assess|survey|form|library|xml|htm|html|page)$/) {
+	$r->print('<br /><input type=checkbox name="whatfile'.$inc.'" value="'.$master_seq[$i].'"> '."\n".'<b>'.
+                  $titles_master_seq[$i].'</b>&nbsp;&nbsp;&nbsp;<small>'.$master_seq_view[$i].'</small>');
+        $inc++;
+      }
+    }
+    $r->print(<<ENDMENUOUT2);
+<br /><br />
+<input type="hidden" name="numberoffiles" value="$inc">
+<input type="hidden" name="phase" value="three">
+<input type=button onClick="checkall()" value="Check All">&nbsp;
+<input type=button onClick="uncheckall()" value="Uncheck">&nbsp;
+<input type="submit" value="Submit">
+ENDMENUOUT2
+
+}
+
+
 sub problem_choice_menu {
     my $r = shift;
     my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
     $subdirtoprint =~ s/\/[^\/]+$//;
     my @list_of_files = ();
-    if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
-	$subdirtoprint =~ s/^[^~]*~(\w+)\//\/home\/$1\/public_html\//;
-    } else {
-	$subdirtoprint =~ s/.*(\/res\/)/$1/;
-    }
     my @content_directory = ();
-    if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
-	@content_directory = &Apache::lonnet::dirlist($subdirtoprint,$ENV{'user.domain'}, $ENV{'user.name'},'');
+    $r->print("Subdir: " . $subdirtoprint . "<br />");
+    if ($subdirtoprint =~ m|/home/([^/]+)/public_html|) {
+	#localmachine CSTR space
+	my $user=$1;
+	my $domain=$Apache::lonnet::perlvar{'lonDefDomain'};
+	@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]);
@@ -200,19 +285,23 @@ sub problem_choice_menu {
     }
 </script>
 <input type=button onClick="checkall()" value="Check All">&nbsp;
-<input type=button onClick="uncheckall()" value="Uncheck">
+<input type=button onClick="uncheckall()" value="Uncheck">&nbsp;
+<input type="submit" value="Submit">
 <p>
 ENDMENUOUT1
-    my $i;
-    foreach my $file (@list_of_files) {
+    my $i=0;
+    foreach my $file (sort @list_of_files) {
 	$r->print('<br /><input type=checkbox name="whattoprint'.$i.'" value="'.$file.'"> '.
                   $file);
 	$i++;
     }
     $r->print(<<ENDMENUOUT2);
-<br />
+<br /><br />
+<input type="hidden" name="papersize" value="$ENV{'form.papersize'}">
 <input type="hidden" name="numberofproblems" value="$i">
 <input type="hidden" name="phase" value="three">
+<input type=button onClick="checkall()" value="Check All">&nbsp;
+<input type=button onClick="uncheckall()" value="Uncheck">&nbsp;
 <input type="submit" value="Submit">
 ENDMENUOUT2
 }
@@ -225,6 +314,7 @@ sub additional_class_menu {
 <input type="hidden" name="choice" value="$ENV{'form.choice'}">
 <input type="hidden" name="layout" value="$ENV{'form.layout'}">
 <input type="hidden" name="numberofcolumns" value="$ENV{'form.numberofcolumns'}">
+<input type="hidden" name="assignment" value="$ENV{'form.assignment'}">
 <h1>Select student(s) whose assignment you want to print</h1>
 ENDMENUOUT1
     my %courselist=&Apache::lonnet::dump(
@@ -263,7 +353,7 @@ ENDMENUOUT1
     }
 </script>
 <input type=button onClick="checkall()" value="Check All">&nbsp;
-<input type=button onClick="checksec()" value="Check Section/Group">
+<input type=button onClick="checksec()" value="Type Section/Group then click">
 <input type=text size=5 name=chksec>&nbsp;
 <input type=button onClick="uncheckall()" value="Uncheck">
 <p>
@@ -280,6 +370,7 @@ ENDDISHEADER
               $sdom,$sname);
            my $section=&Apache::lonnet::usection
 	       ($sdom,$sname,$ENV{'request.course.id'});
+	   if ($section == -1) { $section = ''; }
            $r->print(
         '<br /><input type=checkbox name="whomtoprint'.$i.'" value="'.$section.':'.$_.'"> '.
 		      $reply{'firstname'}.' '. 
@@ -291,7 +382,13 @@ ENDDISHEADER
         } 
     }
     $r->print(<<ENDMENUOUT2);
-<br />
+<br /><br /><br />
+<table><tr><td width=300>Number of blank pages added to each student assignments to print these assignments on physically different sheets (<b>requires manual addjustment</b>): <select name="addedpages"><option selected>0</option>
+                                                                            <option>1</option>
+                                                                            <option>2</option>
+                                                                            <option>3</option>
+                                                  </select></td></tr></table>
+<br /> 
 <input type="hidden" name="papersize" value="$ENV{'form.papersize'}">
 <input type="hidden" name="numberofstudents" value="$i">
 <input type="hidden" name="phase" value="three">
@@ -309,6 +406,9 @@ sub additional_print_menu {
     for (my $i=0; $i<$ENV{'form.numberofproblems'};$i++) {
 	$what_to_print .= '<input type="hidden" name="whattoprint'.$i.'" value="'.$ENV{'form.whattoprint'.$i}.'">';
     }
+    for (my $i=0; $i<$ENV{'form.numberoffiles'};$i++) {
+	$what_to_print .= '<input type="hidden" name="whatfile'.$i.'" value="'.$ENV{'form.whatfile'.$i}.'">';
+    }
     $r->print(<<ENDMENUOUT);
     $what_to_print
 <input type="hidden" name="url" value="$ENV{'form.url'}">
@@ -317,7 +417,10 @@ sub additional_print_menu {
 <input type="hidden" name="papersize" value="$ENV{'form.papersize'}">
 <input type="hidden" name="numberofstudents" value="$ENV{'form.numberofstudents'}">
 <input type="hidden" name="numberofproblems" value="$ENV{'form.numberofproblems'}">
+<input type="hidden" name="numberoffiles" value="$ENV{'form.numberoffiles'}">
 <input type="hidden" name="numberofcolumns" value="$ENV{'form.numberofcolumns'}">
+<input type="hidden" name="assignment" value="$ENV{'form.assignment'}">
+<input type="hidden" name="addedpages" value="$ENV{'form.addedpages'}">
 Define one column layout parameters: <br />
 <b>Width</b>: <input type="text" name="width" width="8" value="9cm"> <br />
 <b>Height</b>: <input type="text" name="height" width="8" value="25.9cm"> <br />
@@ -347,88 +450,99 @@ ENDPART
     my $numberofcolumns = $ENV{'form.numberofcolumns'};  
     my $papersize = $ENV{'form.papersize'};          
     my $laystyle = 'book';
+    my $assignment =  $ENV{'form.assignment'};
+    if ($choice eq 'Subdirectory print') {
+	if ($ENV{'form.layout'} eq '') {$layout = 'CAPA';}
+	if ($ENV{'form.papersize'} eq '') {$papersize = 'Letter [8 1/2x11 in]';}
+	if ($ENV{'form.numberofcolumns'} eq '') {$numberofcolumns = 2;}
+    }
+    if (($choice eq 'Standard LaTeX output for current document') &&
+	($ENV{'form.url'}=~m|^/~|)) {
+	if ($ENV{'form.layout'} eq '') {$layout = 'CAPA';}
+	if ($ENV{'form.papersize'} eq '') {$papersize = 'Letter [8 1/2x11 in]';}
+	if ($ENV{'form.numberofcolumns'} eq '') {$numberofcolumns = 2;}
+    }
     my $result = '';
     my $number_of_columns = 1; #used only for pages to determine the width of the cell
     my $selectionmade = '';
     my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$layout,$numberofcolumns);
-    my $LaTeXwidth;
- 
+    if ($numberofcolumns == 1) {
+	$textwidth=$ENV{'form.width'};
+	$textheight=$ENV{'form.height'};
+    }
+    my $LaTeXwidth; 
     if ($textwidth=~/(\d+\s*cm)/) {
 	$LaTeXwidth = $1*10;
     } elsif ($textwidth=~/(\d+\s*mm)/) {
 	$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;
-      my %moreenv;
-      $moreenv{'form.grade_target'}='tex';
-      if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
+      if ($ENV{'form.url'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+        my %moreenv;
+        $moreenv{'form.grade_target'}='tex';
+        if (&Apache::lonnet::allowed('bre',$ENV{'form.url'})) {
 	  $ENV{'form.url'}=~s/http:\/\/[^\/]+//;
-      }
-      $moreenv{'request.filename'}=$ENV{'form.url'};
-      $moreenv{'form.textwidth'}=$LaTeXwidth;
-      &Apache::lonnet::appenv(%moreenv);
-      my $texversion=&Apache::lonnet::ssi($ENV{'form.url'});
-      &Apache::lonnet::delenv('form.grade_target','form.textwidth','form.counter');
-      $result .= $texversion;
-      if ($ENV{'form.url'}=~m/\.page\s*$/) {
+        }
+        $moreenv{'request.filename'}=$ENV{'form.url'};
+        $moreenv{'form.textwidth'}=$LaTeXwidth;
+        &Apache::lonnet::appenv(%moreenv);
+        my $texversion=&Apache::lonnet::ssi($ENV{'form.url'});
+        &Apache::lonnet::delenv('form.grade_target','form.textwidth','form.counter');
+        $result .= $texversion;
+        if ($ENV{'form.url'}=~m/\.page\s*$/) {
 	  ($result,$number_of_columns) = &page_cleanup($result);
+        }
+      } else {
+	  $result='\documentclass[letterpaper]{article}\usepackage{calc}\begin{document}Printout of this type of document is currently not supported: ';
+	  if ($ENV{'form.url'}=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) {
+	      $result.=$1;
+	  } else {
+	      $result.=$ENV{'form.url'};
+	  }
+	  $result.=' \end{document}'
       }
     } elsif ($choice eq 'Standard LaTeX output for the primary sequence' or 
              $choice eq 'Standard LaTeX output for whole primary sequence') {
       #-- minimal sequence to which the current document belongs
         #-- where is the primary sequence containing file?
-	my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
-	my @sequence = split('___',$symbolic);
-	my $primary_sequence = '/res/'.$sequence[0];   
-	my @master_seq = &coming_from_hash($primary_sequence,$sequence[0]);
+        my @master_seq = ();
+	for (my $i=0; $i<$ENV{'form.numberoffiles'};$i++) {
+	    if ($ENV{'form.whatfile'.$i}=~/\S/) {
+		push @master_seq,$ENV{'form.whatfile'.$i};
+	    }
+	}
         #-- produce an output string
 	my $flag_latex_header_remove = 'NO';
 	my $flag_page_in_sequence = 'NO';
 	for (my $i=0;$i<=$#master_seq;$i++) {
-            my ($urlp,$symb) = split /&&/, $master_seq[$i];		
+           my ($urlp,$symb) = split /&&/, $master_seq[$i];
 	    if ($choice eq 'Standard LaTeX output for the primary sequence') {
-            #prints only problems
-		$selectionmade = 2;
- 		if ($urlp =~ m/\.(problem|exam|quiz|assess|survey|form|library)/) {
-		    my %moreenv;
-		    $moreenv{'form.grade_target'}='tex';
-		    $moreenv{'form.textwidth'}=$LaTeXwidth;
-		    &Apache::lonnet::appenv(%moreenv);
-		    &Apache::lonnet::logthis("Trying to get $urlp with symb $symb");
-		    my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb));
-		    &Apache::lonnet::delenv('form.grade_target','form.textwidth');
-		    if ($flag_latex_header_remove ne 'NO') {
-			$texversion = &latex_header_footer_remove($texversion);
-		    } else {
-			$texversion =~ s/\\end{document}//;
-		    }
-		    $result .= $texversion;        
-		    $flag_latex_header_remove = 'YES';
-		}
-	    } elsif ($urlp =~ /\S+/) {
-              #prints problems, pages and any html/xml files
-		$selectionmade = 3;
-		my %moreenv;
-		$moreenv{'form.grade_target'}='tex';
-		&Apache::lonnet::appenv(%moreenv);
-		my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb));
-		&Apache::lonnet::delenv('form.grade_target');
-		if ($urlp =~ m/\.page/) {
-		    ($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
-		    if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;} 
-		    $texversion =~ s/\\end{document}\d*/\\end{document}/;
-		    $flag_page_in_sequence = 'YES';
-		} 
-		if ($flag_latex_header_remove ne 'NO') {
-		    $texversion = &latex_header_footer_remove($texversion);
-		} else {
-		    $texversion =~ s/\\end{document}//;
-		}
-		$result .= $texversion;         
-		$flag_latex_header_remove = 'YES';   
+              $selectionmade = 2;
+	    } elsif ($choice eq 'Standard LaTeX output for whole primary sequence') {
+              $selectionmade = 3;
 	    }
+	   my %moreenv;
+	   $moreenv{'form.grade_target'}='tex';
+	   $moreenv{'form.textwidth'}=$LaTeXwidth;
+	   &Apache::lonnet::appenv(%moreenv);
+	   #&Apache::lonnet::logthis("Trying to get $urlp with symb $symb");
+	   my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb));
+	   &Apache::lonnet::delenv('form.grade_target','form.textwidth');
+	   if ($urlp =~ m/\.page/) {
+	     ($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
+	     if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;} 
+	     $texversion =~ s/\\end{document}\d*/\\end{document}/;
+	     $flag_page_in_sequence = 'YES';
+	   } 
+	   if ($flag_latex_header_remove ne 'NO') {
+	     $texversion = &latex_header_footer_remove($texversion);
+	   } else {
+	     $texversion =~ s/\\end{document}//;
+	   }
+	   $result .= $texversion;         
+	   $flag_latex_header_remove = 'YES';   
 	}
 	&Apache::lonnet::delenv('form.counter');
 	if ($flag_page_in_sequence eq 'YES') {$result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;}	
@@ -436,14 +550,19 @@ ENDPART
     }  elsif ($choice eq 'Standard LaTeX output for the top level sequence') {
         # where is the main sequence of the course?
 	$selectionmade = 4;
-	my $main_seq = '/res/'.$ENV{'request.course.uri'};
-	my @file_seq = &coming_from_hash_whole($main_seq);
+	my $main_seq=&Apache::lonnet::clutter($ENV{'request.course.uri'});
+	my @file_seq = &coming_from_hash($main_seq);
+	for (my $i=0;$i<=$#file_seq;$i++) {
+	    my ($path,$title,$symb) = split /&&/,$file_seq[$i];
+	    $file_seq[$i] = $path.'&&'.$symb;
+	}
 	my $flag_latex_header_remove = 'NO';
         #-- produce an output string
 	for (my $i=0;$i<=$#file_seq;$i++) {
-            my ($urlp,$symb) = split /&&/, $file_seq[$i];
-	    $urlp=~s/\/home\/httpd\/html//;	    
-            if ($urlp=~m/\.(problem|exam|quiz|assess|survey|form|library)/) {
+	   if (not $file_seq[$i]=~/^&&/) {
+	     my ($urlp,$symb) = split /&&/, $file_seq[$i];
+	     $urlp=~s/\/home\/httpd\/html//;	    
+	     if ($urlp=~m/\.(problem|exam|quiz|assess|survey|form|library)/) {
 		my %moreenv;
 		$moreenv{'form.grade_target'}='tex';
 		$moreenv{'form.textwidth'}=$LaTeXwidth;
@@ -457,7 +576,8 @@ ENDPART
 		}
 		$result .= $texversion;  
 		$flag_latex_header_remove = 'YES';
-	    }		
+	     }		
+	   }
 	}	    
 	$result .= '\end{document}';
     } elsif ($choice eq 'All class print') { 
@@ -472,17 +592,24 @@ ENDPART
 	#where is the primary sequence containing current resource (the same for all students)?
 	my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
 	my @sequence = split('___',$symbolic);
-	my $primary_sequence = '/res/'.$sequence[0]; 	
-	my @master_seq = &coming_from_hash($primary_sequence,$sequence[0]); 
+	my $primary_sequence;
+
+	$primary_sequence=&Apache::lonnet::clutter($sequence[0]);
+	my @master_seq = &coming_from_hash($primary_sequence); 
+	for (my $i=0;$i<=$#master_seq;$i++) {
+	    my ($path,$title,$symb) = split /&&/,$master_seq[$i];
+	    $master_seq[$i] = $path.'&&'.$symb;
+	}
         #loop over students
 	my $flag_latex_header_remove = 'NO'; 
 	my %moreenv;
 	$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) {
 	    my $current_output = ''; 
 	    my ($usersection,$username,$userdomain) = split /:/,$person;
-	    my $fullname = &Apache::grades::get_fullname($username,$userdomain);
+	    my $fullname = &get_name($username,$userdomain);
             #goes through all resources, checks if they are available for current student, and produces output   
 	    foreach my $curresline (@master_seq)  {
 		my ($curres,$symb) = split /&&/, $curresline;
@@ -501,14 +628,21 @@ ENDPART
 		    $flag_latex_header_remove = 'YES';
 		}
 	    }
+	    my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
 	    if ($current_output=~/\\documentclass/) {
-		$current_output =~ s/\\begin{document}/\\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent\\fbox{\\textbf{$fullname}}\\hskip 1\.4in } \\vskip 5 mm /;
+		$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\vskip 3 mm /;
 	    } else {
-		$current_output = '\\vskip 3mm\noindent\parbox{\minipagewidth}{\noindent\fbox{\textbf{'.$fullname.'}}\hskip 1.4in } \vskip 5 mm '.$current_output;
+		my $blanspages = '';
+		for (my $j=0;$j<$ENV{'form.addedpages'};$j++) {$blanspages.='\clearpage\strut\clearpage';}
+		$current_output = '\strut\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage \\vskip 3mm'.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}} - '.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}\hskip 1.4in } \vskip 5 mm '.$current_output;
 	    }
 	    $result .= $current_output;
-	    &Apache::lonnet::delenv('form.counter');
+	    &Apache::lonnet::delenv('form.counter');	    
+	    &Apache::lonxml::init_counter(); 
+	    &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
+						    'last student '.$fullname);
 	}
+	&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
 	$result .= '\end{document}';
 	&Apache::lonnet::delenv('form.textwidth');
     } elsif ($choice eq 'Subdirectory print') {      
@@ -528,12 +662,33 @@ ENDPART
 		$moreenv{'form.grade_target'}='tex';
 		$moreenv{'form.textwidth'}=$LaTeXwidth;
 		&Apache::lonnet::appenv(%moreenv);
-		if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) { 
-		    $urlp =~ s/\/home\/([^\/]*)\/public_html/\/~$1/; 
+		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');
-		$texversion =~ s/(\\begin{document})/$1 {\\tiny\\begin{verbatim}$urlp\\end{verbatim}}/;
+                #this chunck is responsible for printing the path to problem
+		my $newurlp = '';
+		my $HowMany = length($urlp)*2;
+		if ($HowMany > $LaTeXwidth) {
+		    my @temporrary = split '/',$urlp;
+		    my $HowManyNew = 0;
+		    for (my $ii=0;$ii<=$#temporrary;$ii++) {
+			if ($temporrary[$ii] ne '') {
+			    $HowManyNew += length($temporrary[$ii])*2;
+			    if ($HowManyNew < $LaTeXwidth ) {
+				$newurlp .=  '/'.$temporrary[$ii];
+			    } else {
+				$HowManyNew = 0;
+				$newurlp .=  '|\vskip -1 mm \noindent \verb|';
+				$ii--;
+			    }
+			}
+		    }
+		}
+		$texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 {\\small\\noindent\\verb|$newurlp\|\\vskip 0 mm}/;
 		if ($flag_latex_header_remove ne 'NO') {
 		    $texversion = &latex_header_footer_remove($texversion);
 		} else {
@@ -546,7 +701,7 @@ ENDPART
 	$result .= '\end{document}';      	
     }
 #-------------------------------------------------------- corrections for the different page formats
-    $result = &page_format_transformation($papersize,$layout,$numberofcolumns,$choice,$result);
+    $result = &page_format_transformation($papersize,$layout,$numberofcolumns,$choice,$result,$assignment);
     if ($layout eq 'CBI') {
         $laystyle = 'album';
     }
@@ -574,7 +729,7 @@ FINALEND
 }
 
 
-sub coming_from_hash_whole {
+sub coming_from_hash {
 
     my $mainsequence = shift;
     my @resourcelist = ();
@@ -584,12 +739,11 @@ sub coming_from_hash_whole {
     my $current_resource = $mapstart;
     while ($current_resource ne $mapfinish) {
 	if ($hash{'src_'.$current_resource}=~/\.sequence$/) {
-	    push @resourcelist,&coming_from_hash_whole($hash{'src_'.$current_resource});
+	    push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource});
 	} else {
-            $mainsequence =~ /\/res\/(.*)$/;
-	    my $presymb = $1;
-	    my $rid = $hash{'ids_'.$hash{'src_'.$current_resource}};
-            if ($rid=~/,/) {
+	    my $presymb=&Apache::lonnet::declutter($mainsequence);
+	    my $rid = $current_resource;
+	    if ($rid=~/,/) {
 		my @rid = split /,/, $rid;
 		foreach my $rid_element (@rid) {
 		    if ($rid_element =~ m/^$mapid\.(\d*)/) {
@@ -598,33 +752,22 @@ sub coming_from_hash_whole {
 		    }
 		}
 	    } else {
-		$rid =~ m/^$mapid\.(\d*)/;
+	        $rid =~ m/^$mapid\.(\d*)/;
                 $rid = $1;  
 	    }
-	    $hash{'src_'.$current_resource} =~ m/\/res\/(.*)$/;
-	    my $symb = $presymb.'___'.$rid.'___'.$1;	    
-	    push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$symb;
+	    my $symb = $presymb.'___'.$rid.'___'.
+		&Apache::lonnet::declutter($hash{'src_'.$current_resource});
+	    push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$hash{'title_'.$current_resource}.'&&'.$symb;
 	}
 	$current_resource = $hash{'goesto_'.$hash{'to_'.$current_resource}};
-    }
-    return @resourcelist;
-}
-
-
-sub coming_from_hash {
-
-    my ($mainsequence,$symb) = @_;
-    my @resourcelist = ();
-    my $mapid = $hash{'map_pc_'.$mainsequence};
-    my $mapstart = $hash{'map_start_'.$mainsequence};
-    my $mapfinish = $hash{'map_finish_'.$mainsequence};
-    my ($presymb) = split(/___/,$symb);
-    $presymb = $presymb.'___';
-    my $current_resource = $mapstart;
-    while ($current_resource ne $mapfinish) {
-	if (not $hash{'src_'.$current_resource}=~/\.sequence$/) {
-	    my $rid = $hash{'ids_'.$hash{'src_'.$current_resource}};
-            if ($rid=~/,/) {
+    } 
+    #needs if final resource in the map (type="finish") contains something
+	if ($hash{'src_'.$current_resource}=~/\.sequence$/) {
+	    push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource});
+	} else {
+	    my $presymb=&Apache::lonnet::declutter($mainsequence);
+	    my $rid = $current_resource;
+	    if ($rid=~/,/) {
 		my @rid = split /,/, $rid;
 		foreach my $rid_element (@rid) {
 		    if ($rid_element =~ m/^$mapid\.(\d*)/) {
@@ -633,38 +776,14 @@ sub coming_from_hash {
 		    }
 		}
 	    } else {
-		$rid =~ m/^$mapid\.(\d*)/;
+	        $rid =~ m/^$mapid\.(\d*)/;
                 $rid = $1;  
 	    }
-	    $hash{'src_'.$current_resource} =~ m/\/res\/(.*)$/;
-	    $symb = $presymb.$rid.'___'.$1;
-	    push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$symb;
-	} else {
-	    push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource});
+	    my $symb = $presymb.'___'.$rid.'___'.
+		&Apache::lonnet::declutter($hash{'src_'.$current_resource});
+	    push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$hash{'title_'.$current_resource}.'&&'.$symb;
 	}
 	$current_resource = $hash{'goesto_'.$hash{'to_'.$current_resource}};
-    }
-    #needs if final resource in the map (type="finish") contains something
-    if (not $hash{'src_'.$current_resource}=~/\.sequence$/) {
-		    my $rid = $hash{'ids_'.$hash{'src_'.$current_resource}};
-            if ($rid=~/,/) {
-		my @rid = split /,/, $rid;
-		foreach my $rid_element (@rid) {
-		    if ($rid_element =~ m/^$mapid\.(\d*)/) {
-			$rid = $1; 
-			last;
-		    }
-		}
-	    } else {
-		$rid =~ m/^$mapid\.(\d*)/;
-                $rid = $1;  
-	    }
-	    $hash{'src_'.$current_resource} =~ m/\/res\/(.*)$/;
-	    $symb = $presymb.$rid.'___'.$1;
-	push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$symb;
-    } else {
-	push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource});
-    }
     return @resourcelist;
 }
 
@@ -679,326 +798,246 @@ sub latex_header_footer_remove {
 
 sub character_chart {
     my $result = shift;	
-    $result =~ s/&#0?0?7;//g;
-    $result =~ s/&#0?0?9;//g;
-    $result =~ s/&#0?10;//g;
-    $result =~ s/&#0?13;//g;
-    $result =~ s/&#0?32;/ /g;
-    $result =~ s/&#0?33;/!/g;
-    $result =~ s/&#0?34;/"/g;
-    $result =~ s/&quot;/"/g;   #"
-    $result =~ s/&#0?35;/\\#/g;
-#    $result =~ s/&#0?36;/\\\$/g;
-    $result =~ s/&#0?37;/\\%/g; 
-    $result =~ s/&#0?38;/\\&/g; 
-    $result =~ s/&amp;/\\&/g;
-    $result =~ s/&#0?39;/'/g;
-    $result =~ s/&#0?40;/(/g;
-    $result =~ s/&#0?41;/)/g;
-    $result =~ s/&#0?42;/\*/g;
-    $result =~ s/&#0?43;/\+/g;
-    $result =~ s/&#0?44;/,/g;
-    $result =~ s/&#0?45;/-/g;
-    $result =~ s/&#0?46;/\./g;
-    $result =~ s/&#0?47;/\//g;
-    $result =~ s/&#0?48;/0/g;
-    $result =~ s/&#0?49;/1/g;
-    $result =~ s/&#0?50;/2/g;
-    $result =~ s/&#0?51;/3/g;
-    $result =~ s/&#0?52;/4/g;
-    $result =~ s/&#0?53;/5/g;
-    $result =~ s/&#0?54;/6/g;
-    $result =~ s/&#0?55;/7/g;
-    $result =~ s/&#0?56;/8/g;
-    $result =~ s/&#0?57;/9/g;
-    $result =~ s/&#0?58;/:/g;
-    $result =~ s/&#0?59;/;/g;
-    $result =~ s/&#0?60;/\$<\$/g;
-    $result =~ s/&lt;/\$<\$/g;
-    $result =~ s/&#0?61;/\$=\$/g;
-    $result =~ s/&#0?62;/\$>\$/g;
-    $result =~ s/&gt;/\$>\$/g;
-    $result =~ s/&#0?63;/?/g;
-#    $result =~ s/&#0?64;//g;
-    $result =~ s/&#0?65;/A/g;
-    $result =~ s/&#0?66;/B/g;
-    $result =~ s/&#0?67;/C/g;
-    $result =~ s/&#0?68;/D/g;
-    $result =~ s/&#0?69;/E/g;
-    $result =~ s/&#0?70;/F/g;
-    $result =~ s/&#0?71;/G/g;
-    $result =~ s/&#0?72;/H/g;
-    $result =~ s/&#0?73;/I/g;
-    $result =~ s/&#0?74;/J/g;
-    $result =~ s/&#0?75;/K/g;
-    $result =~ s/&#0?76;/L/g;
-    $result =~ s/&#0?77;/M/g;
-    $result =~ s/&#0?78;/N/g;
-    $result =~ s/&#0?79;/O/g;
-    $result =~ s/&#0?80;/P/g;
-    $result =~ s/&#0?81;/Q/g;
-    $result =~ s/&#0?82;/R/g;
-    $result =~ s/&#0?83;/S/g;
-    $result =~ s/&#0?84;/T/g;
-    $result =~ s/&#0?85;/U/g;
-    $result =~ s/&#0?86;/V/g;
-    $result =~ s/&#0?87;/W/g;
-    $result =~ s/&#0?88;/X/g;
-    $result =~ s/&#0?89;/Y/g;
-    $result =~ s/&#0?90;/Z/g;
-    $result =~ s/&#0?91;/[/g;
-    $result =~ s/&#0?92;/\\/g;
-    $result =~ s/&#0?93;/]/g;
-#    $result =~ s/&#0?94;//g;
-#    $result =~ s/&#0?95;//g;
-    $result =~ s/&#0?96;/`/g;
-    $result =~ s/&#0?97;/a/g;
-    $result =~ s/&#0?98;/b/g;
-    $result =~ s/&#0?99;/c/g;
-    $result =~ s/&#100;/d/g;
-    $result =~ s/&#101;/e/g;
-    $result =~ s/&#102;/f/g;
-    $result =~ s/&#103;/g/g;
-    $result =~ s/&#104;/h/g;
-    $result =~ s/&#105;/i/g;
-    $result =~ s/&#106;/j/g;
-    $result =~ s/&#107;/k/g;
-    $result =~ s/&#108;/l/g;
-    $result =~ s/&#109;/m/g;
-    $result =~ s/&#110;/n/g;
-    $result =~ s/&#111;/o/g;
-    $result =~ s/&#112;/p/g;
-    $result =~ s/&#113;/q/g;
-    $result =~ s/&#114;/r/g;
-    $result =~ s/&#115;/s/g;
-    $result =~ s/&#116;/t/g;
-    $result =~ s/&#117;/u/g;
-    $result =~ s/&#118;/v/g;
-    $result =~ s/&#119;/w/g;
-    $result =~ s/&#120;/x/g;
-    $result =~ s/&#121;/y/g;
-    $result =~ s/&#122;/z/g;
-    $result =~ s/&#123;/\\{/g;
-    $result =~ s/&#124;/\|/g;
-    $result =~ s/&#125;/\\}/g;
-    $result =~ s/&#126;/\~/g;
-    $result =~ s/&#130;/,/g;
-#    $result =~ s/&#131;//g;
-    $result =~ s/&#132;/''/g;
-    $result =~ s/&#133;/\$\\ldots\$/g;
-    $result =~ s/&#134;/\$\\dagger\$/g;
-    $result =~ s/&#135;/\$\\ddagger\$/g;
-#    $result =~ s/&#136;//g;
-#    $result =~ s/&#137;//g;
-#    $result =~ s/&#138;//g;
-    $result =~ s/&#139;/\$<\$/g;
-#    $result =~ s/&#140;//g;
-    $result =~ s/&#145;/`/g;
-    $result =~ s/&#146;/'/g;
-    $result =~ s/&#147;/``/g;
-    $result =~ s/&#148;/''/g;
-    $result =~ s/&#149;/\$\\bullet\$/g;
-#    $result =~ s/&#150;//g;
-#    $result =~ s/&#151;//g;
-    $result =~ s/&#152;/~/g;
-#    $result =~ s/&#153;//g;
-#    $result =~ s/&#154;//g;
-    $result =~ s/&#155;/\$>\$/g;
-    $result =~ s/&#156;/\\{\\oe\\}/g;
-    $result =~ s/&#159;/\\"\\{Y\\}/g;
-    $result =~ s/&#160;//g;
-    $result =~ s/&nbsp;//g;
-    $result =~ s/&#161;/!`/g;
-    $result =~ s/&iexcl;/!`/g; #`
-#    $result =~ s/&#162;//g;
-#    $result =~ s/&cent;//g;
-    $result =~ s/&#163;/\\pounds/g; 
-    $result =~ s/&pound;/\\pounds/g;
-#    $result =~ s/&#164;//g;
-#    $result =~ s/&curren;//g;
-#    $result =~ s/&#165;//g;
-#    $result =~ s/&yen;//g;
-#    $result =~ s/&#166;//g;
-#    $result =~ s/&brvbar;//g;
-#    $result =~ s/&#167;//g;
-#    $result =~ s/&sect;//g;
-#    $result =~ s/&#168;//g;
-#    $result =~ s/&uml;//g;
-    $result =~ s/&#169;/\\copyright/g;
-    $result =~ s/&copy;/\\copyright/g;
-#    $result =~ s/&#170;//g;
-#    $result =~ s/&ordf;//g;
-#    $result =~ s/&#171;//g;
-#    $result =~ s/&laquo;//g;
-    $result =~ s/&#172;/\$\\neg\$/g;
-    $result =~ s/&not;/\$\\neg\$/g;
-#    $result =~ s/&#173;//g;
-#    $result =~ s/&shy;//g;
-#    $result =~ s/&#174;//g;
-#    $result =~ s/&reg;//g;
-#    $result =~ s/&#175;//g;
-#    $result =~ s/&macr;//g;
-    $result =~ s/&#176;/\$^{\\circ}\$/g;
-    $result =~ s/&deg;/\$^{\\circ}\$/g;
-    $result =~ s/&#177;/\$\\pm\$/g;
-    $result =~ s/&plusmn;/\$\\pm\$/g;
-    $result =~ s/&#178;/\$^2\$/g;
-    $result =~ s/&sup2;/\$^2\$/g;
-    $result =~ s/&#179;/\$^3\$/g;
-    $result =~ s/&sup3;/\$^3\$/g;
-#    $result =~ s/&#180;//g;
-#    $result =~ s/&acute;//g;
-    $result =~ s/&#181;/\$\\mu\$/g;
-    $result =~ s/&micro;/\$\\mu\$/g;
-    $result =~ s/&#182;/\\P/g;
-    $result =~ s/&para;/\\P/g;
-    $result =~ s/&#183;/\$\\cdot\$/g;
-    $result =~ s/&middot;/\$\\cdot\$/g;
-#    $result =~ s/&#184;//g;
-#    $result =~ s/&cedil;//g;
-    $result =~ s/&#185;/\$^1\$/g;
-    $result =~ s/&sup1;/\$^1\$/g;
-#    $result =~ s/&#186;//g;
-#    $result =~ s/&ordm;//g;
-#    $result =~ s/&#187;//g;
-#    $result =~ s/&raquo;//g;
-#    $result =~ s/&#188;//g;
-#    $result =~ s/&frac14;//g;
-#    $result =~ s/&#189;//g;
-#    $result =~ s/&frac12;//g;
-#    $result =~ s/&#190;//g;
-#    $result =~ s/&frac34;//g;
-    $result =~ s/&#191;/?`/g;   
-    $result =~ s/&iquest;/?`/g;      #`
-    $result =~ s/&#192;/\\`{A}/g; 
-    $result =~ s/&Agrave;/\\`{A}/g;  #` 
-    $result =~ s/&#193;/\\'{A}/g; 
-    $result =~ s/&Aacute;/\\'{A}/g;  #'
-    $result =~ s/&#194;/\\^{A}/g;
-    $result =~ s/&Acirc;/\\^{A}/g;
-    $result =~ s/&#195;/\\~{A}/g;
-    $result =~ s/&Atilde;/\\~{A}/g;
-    $result =~ s/&#196;/\\"{A}/g; 
-    $result =~ s/&Auml;/\\"{A}/g;    #"
-    $result =~ s/&#197;/{\\AA}/g;
-    $result =~ s/&Aring;/{\\AA}/g;
-    $result =~ s/&#198;/{\\AE}/g;
-    $result =~ s/&AElig;/{\\AE}/g;
-#    $result =~ s/&#199;//g;
-#    $result =~ s/&Ccedil;//g;
-    $result =~ s/&#200;/\\`{E}/g;  
-    $result =~ s/&Egrave;/\\`{E}/g;  #`
-    $result =~ s/&#201;/\\'{E}/g;    #'
-    $result =~ s/&Eacute;/\\'{E}/g;  #'
-    $result =~ s/&#202;/\\^{E}/g;
-    $result =~ s/&Ecirc;/\\^{E}/g;
-    $result =~ s/&#203;/\\`{E}/g;
-    $result =~ s/&Euml;/\\`{E}/g;    #`
-    $result =~ s/&#204;/\\`{I}/g;
-    $result =~ s/&Igrave;/\\`{I}/g;  #`
-    $result =~ s/&#205;/\\'{I}/g;    
-    $result =~ s/&Iacute;/\\'{I}/g;  #'
-    $result =~ s/&#206;/\\^{I}/g;
-    $result =~ s/&Icirc;/\\^{I}/g;
-    $result =~ s/&#207;/\\"{I}/g;    
-    $result =~ s/&Iuml;/\\"{I}/g;    #"
-#    $result =~ s/&#208;//g;
-#    $result =~ s/&ETH;//g;
-    $result =~ s/&#209;/\\~{N}/g;
-    $result =~ s/&Ntilde;/\\~{N}/g;
-    $result =~ s/&#210;/\\`{O}/g;
-    $result =~ s/&Ograve;/\\`{O}/g;  #`
-    $result =~ s/&#211;/\\'{O}/g;
-    $result =~ s/&Oacute;/\\'{O}/g;  #'
-    $result =~ s/&#212;/\\^{O}/g;
-    $result =~ s/&Ocirc;/\\^{O}/g;
-    $result =~ s/&#213;/\\~{O}/g;
-    $result =~ s/&Otilde;/\\~{O}/g;
-    $result =~ s/&#214;/\\"{O}/g;    
-    $result =~ s/&Ouml;/\\"{O}/g;    #"
-    $result =~ s/&#215;/\$\\times\$/g;
-    $result =~ s/&times;/\$\\times\$/g;
-    $result =~ s/&#216;/{\\O}/g;
-    $result =~ s/&Oslash;/{\\O}/g;
-    $result =~ s/&#217;/\\`{U}/g;    
-    $result =~ s/&Ugrave;/\\`{U}/g;  #`
-    $result =~ s/&#218;/\\'{U}/g;    #'
-    $result =~ s/&Uacute;/\\'{U}/g;  #'
-    $result =~ s/&#219;/\\^{U}/g;
-    $result =~ s/&Ucirc;/\\^{U}/g;
-    $result =~ s/&#220;/\\"{U}/g;    #"
-    $result =~ s/&Uuml;/\\"{U}/g;    #"
-    $result =~ s/&#221;/\\'{Y}/g;
-    $result =~ s/&Yacute;/\\'{Y}/g;  #'
-#    $result =~ s/&#222;//g;
-#    $result =~ s/&THORN;//g;
-#    $result =~ s/&#223;//g;
-#    $result =~ s/&szlig;//g;
-    $result =~ s/&#224;/\\`{a}/g;
-    $result =~ s/&agrave;/\\`{a}/g;  #`
-    $result =~ s/&#225;/\\'{a}/g;
-    $result =~ s/&aacute;/\\'{a}/g;  #'
-    $result =~ s/&#226;/\\^{a}/g;
-    $result =~ s/&acirc;/\\^{a}/g;
-    $result =~ s/&#227;/\\~{a}/g;
-    $result =~ s/&atilde;/\\~{a}/g;
-    $result =~ s/&#228;/\\"{a}/g;
-    $result =~ s/&auml;/\\"{a}/g;    #"
-    $result =~ s/&#229;/{\\aa}/g;
-    $result =~ s/&aring;/{\\aa}/g;
-    $result =~ s/&#230;/{\\ae}/g;
-    $result =~ s/&aelig;/{\\ae}/g;
-#    $result =~ s/&#231;//g;
-#    $result =~ s/&ccedil;//g;
-    $result =~ s/&#232;/\\`{e}/g;
-    $result =~ s/&egrave;/\\`{e}/g;  #`
-    $result =~ s/&#233;/\\'{e}/g;
-    $result =~ s/&eacute;/\\'{e}/g;  #'
-    $result =~ s/&#234;/\\^{e}/g;
-    $result =~ s/&ecirc;/\\^{e}/g;
-    $result =~ s/&#235;/\\"{e}/g;
-    $result =~ s/&euml;/\\"{e}/g;    #"
-    $result =~ s/&#236;/\\`{i}/g;
-    $result =~ s/&igrave;/\\`{i}/g;  #`
-    $result =~ s/&#237;/\\'{i}/g;
-    $result =~ s/&iacute;/\\'{i}/g;  #'
-    $result =~ s/&#238;/\\^{i}/g;
-    $result =~ s/&icirc;/\\^{i}/g;
-    $result =~ s/&#239;/\\"{i}/g;
-    $result =~ s/&iuml;/\\"{i}/g;    #"
-#    $result =~ s/&#240;//g;
-#    $result =~ s/&eth;//g;
-    $result =~ s/&#241;/\\~{n}/g;
-    $result =~ s/&ntilde;/\\~{n}/g;
-    $result =~ s/&#242;/\\`{o}/g;
-    $result =~ s/&ograve;/\\`{o}/g;  #`
-    $result =~ s/&#243;/\\'{o}/g;
-    $result =~ s/&oacute;/\\'{o}/g;  #'
-    $result =~ s/&#244;/\\^{o}/g;
-    $result =~ s/&ocirc;/\\^{o}/g;
-    $result =~ s/&#245;/\\~{o}/g;
-    $result =~ s/&otilde;/\\~{o}/g;
-    $result =~ s/&#246;/\\"{o}/g;
-    $result =~ s/&ouml;/\\"{o}/g;    #"
-    $result =~ s/&#247;/\$\\div\$/g;
-    $result =~ s/&divide;/\$\\div\$/g;
-    $result =~ s/&#248;/{\\o}/g;
-    $result =~ s/&oslash;/{\\o}/g;
-    $result =~ s/&#249;/\\`{u}/g; 
-    $result =~ s/&ugrave;/\\`{u}/g;  #` 
-    $result =~ s/&#250;/\\'{u}/g;
-    $result =~ s/&uacute;/\\'{u}/g;  #'
-    $result =~ s/&#251;/\\^{u}/g;
-    $result =~ s/&ucirc;/\\^{u}/g;
-    $result =~ s/&#252;/\\"{u}/g;
-    $result =~ s/&uuml;/\\"{u}/g;    #"
-    $result =~ s/&#253;/\\'{y}/g;
-    $result =~ s/&yacute;/\\'{y}/g;  #'
-#    $result =~ s/&#254;//g;
-#    $result =~ s/&thorn;//g;
-    $result =~ s/&#255;/\\"{y}/g;
-    $result =~ s/&yuml;/\\"{y}/g;    #"
-    $result =~ s/&#952;/\$\\theta\$/g; #converts theta from html into tex
+    $result =~ s/&\#0?0?(7|9);//g;
+    $result =~ s/&\#0?(10|13);//g;
+    $result =~ s/&\#0?32;/ /g;
+    $result =~ s/&\#0?33;/!/g;
+    $result =~ s/&(\#0?34|quot);/\"/g;
+    $result =~ s/&\#0?35;/\\\#/g;
+    $result =~ s/&\#0?36;/\\\$/g;
+    $result =~ s/&\#0?37;/\\%/g; 
+    $result =~ s/&(\#0?38|amp);/\\&/g; 
+    $result =~ s/&\#(0?39|146);/\'/g;
+    $result =~ s/&\#0?40;/(/g;
+    $result =~ s/&\#0?41;/)/g;
+    $result =~ s/&\#0?42;/\*/g;
+    $result =~ s/&\#0?43;/\+/g;
+    $result =~ s/&\#(0?44|130);/,/g;
+    $result =~ s/&\#0?45;/-/g;
+    $result =~ s/&\#0?46;/\./g;
+    $result =~ s/&\#0?47;/\//g;
+    $result =~ s/&\#0?48;/0/g;
+    $result =~ s/&\#0?49;/1/g;
+    $result =~ s/&\#0?50;/2/g;
+    $result =~ s/&\#0?51;/3/g;
+    $result =~ s/&\#0?52;/4/g;
+    $result =~ s/&\#0?53;/5/g;
+    $result =~ s/&\#0?54;/6/g;
+    $result =~ s/&\#0?55;/7/g;
+    $result =~ s/&\#0?56;/8/g;
+    $result =~ s/&\#0?57;/9/g;
+    $result =~ s/&\#0?58;/:/g;
+    $result =~ s/&\#0?59;/;/g;
+    $result =~ s/&(\#0?60|lt|\#139);/\$<\$/g;
+    $result =~ s/&\#0?61;/\$=\$/g;
+    $result =~ s/&(\#0?62|gt|\#155);/\$>\$/g;
+    $result =~ s/&\#0?63;/\?/g;
+    $result =~ s/&\#0?65;/A/g;
+    $result =~ s/&\#0?66;/B/g;
+    $result =~ s/&\#0?67;/C/g;
+    $result =~ s/&\#0?68;/D/g;
+    $result =~ s/&\#0?69;/E/g;
+    $result =~ s/&\#0?70;/F/g;
+    $result =~ s/&\#0?71;/G/g;
+    $result =~ s/&\#0?72;/H/g;
+    $result =~ s/&\#0?73;/I/g;
+    $result =~ s/&\#0?74;/J/g;
+    $result =~ s/&\#0?75;/K/g;
+    $result =~ s/&\#0?76;/L/g;
+    $result =~ s/&\#0?77;/M/g;
+    $result =~ s/&\#0?78;/N/g;
+    $result =~ s/&\#0?79;/O/g;
+    $result =~ s/&\#0?80;/P/g;
+    $result =~ s/&\#0?81;/Q/g;
+    $result =~ s/&\#0?82;/R/g;
+    $result =~ s/&\#0?83;/S/g;
+    $result =~ s/&\#0?84;/T/g;
+    $result =~ s/&\#0?85;/U/g;
+    $result =~ s/&\#0?86;/V/g;
+    $result =~ s/&\#0?87;/W/g;
+    $result =~ s/&\#0?88;/X/g;
+    $result =~ s/&\#0?89;/Y/g;
+    $result =~ s/&\#0?90;/Z/g;
+    $result =~ s/&\#0?91;/[/g;
+    $result =~ s/&\#0?92;/\$\\setminus\$/g;
+    $result =~ s/&\#0?93;/]/g;
+    $result =~ s/&\#(0?94|136);/\$\\wedge\$/g;
+    $result =~ s/&\#(0?95|138|154);/\\underline{\\makebox[2mm]{\\strut}}/g;
+    $result =~ s/&\#(0?96|145);/\`/g;
+    $result =~ s/&\#0?97;/a/g;
+    $result =~ s/&\#0?98;/b/g;
+    $result =~ s/&\#0?99;/c/g;
+    $result =~ s/&\#100;/d/g;
+    $result =~ s/&\#101;/e/g;
+    $result =~ s/&\#102;/f/g;
+    $result =~ s/&\#103;/g/g;
+    $result =~ s/&\#104;/h/g;
+    $result =~ s/&\#105;/i/g;
+    $result =~ s/&\#106;/j/g;
+    $result =~ s/&\#107;/k/g;
+    $result =~ s/&\#108;/l/g;
+    $result =~ s/&\#109;/m/g;
+    $result =~ s/&\#110;/n/g;
+    $result =~ s/&\#111;/o/g;
+    $result =~ s/&\#112;/p/g;
+    $result =~ s/&\#113;/q/g;
+    $result =~ s/&\#114;/r/g;
+    $result =~ s/&\#115;/s/g;
+    $result =~ s/&\#116;/t/g;
+    $result =~ s/&\#117;/u/g;
+    $result =~ s/&\#118;/v/g;
+    $result =~ s/&\#119;/w/g;
+    $result =~ s/&\#120;/x/g;
+    $result =~ s/&\#121;/y/g;
+    $result =~ s/&\#122;/z/g;
+    $result =~ s/&\#123;/\\{/g;
+    $result =~ s/&\#124;/\|/g;
+    $result =~ s/&\#125;/\\}/g;
+    $result =~ s/&\#126;/\~/g;
+    $result =~ s/&\#131;/\\textflorin /g;
+    $result =~ s/&\#132;/\"/g;
+    $result =~ s/&\#133;/\$\\ldots\$/g;
+    $result =~ s/&\#134;/\$\\dagger\$/g;
+    $result =~ s/&\#135;/\$\\ddagger\$/g;
+    $result =~ s/&\#137;/\\textperthousand /g;
+    $result =~ s/&\#140;/{\\OE}/g;
+    $result =~ s/&\#147;/\`\`/g;
+    $result =~ s/&\#148;/\'\'/g;
+    $result =~ s/&\#149;/\$\\bullet\$/g;
+    $result =~ s/&\#150;/--/g;
+    $result =~ s/&\#151;/---/g;
+    $result =~ s/&\#152;/\$\\sim\$/g;
+    $result =~ s/&\#153;/\\texttrademark /g;
+    $result =~ s/&\#156;/\\oe/g;
+    $result =~ s/&\#159;/\\\"Y/g;
+    $result =~ s/&(\#160|nbsp);//g;
+    $result =~ s/&(\#161|iexcl);/!\`/g;
+    $result =~ s/&(\#162|cent);/\\textcent /g;
+    $result =~ s/&(\#163|pound);/\\pounds /g; 
+    $result =~ s/&(\#164|curren);/\\textcurrency /g;
+    $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/&(\#169|copy);/\\copyright /g;
+    $result =~ s/&(\#170|ordf);/\\textordfeminine /g;
+    $result =~ s/&(\#172|not);/\$\\neg\$/g;
+    $result =~ s/&(\#173|shy);/ - /g;
+    $result =~ s/&(\#174|reg);/\\textregistered /g;
+    $result =~ s/&(\#175|macr);/\$^{-}\$/g;
+    $result =~ s/&(\#176|deg);/\$^{\\circ}\$/g;
+    $result =~ s/&(\#177|plusmn);/\$\\pm\$/g;
+    $result =~ s/&(\#178|sup2);/\$^2\$/g;
+    $result =~ s/&(\#179|sup3);/\$^3\$/g;
+    $result =~ s/&(\#180|acute);/\\textacute /g;
+    $result =~ s/&(\#181|micro);/\$\\mu\$/g;
+    $result =~ s/&(\#182|para);/\\P/g;
+    $result =~ s/&(\#183|middot);/\$\\cdot\$/g;
+    $result =~ s/&(\#184|cedil);/\\c{\\strut}/g;
+    $result =~ s/&(\#185|sup1);/\$^1\$/g;
+    $result =~ s/&(\#186|ordm);/\\textordmasculine /g;
+    $result =~ s/&(\#188|frac14);/\\textonequarter /g;
+    $result =~ s/&(\#189|frac12);/\\textonehalf /g;
+    $result =~ s/&(\#190|frac34);/\\textthreequarters /g;
+    $result =~ s/&(\#191|iquest);/?\`/g;   
+    $result =~ s/&(\#192|Agrave);/\\\`{A}/g;  
+    $result =~ s/&(\#193|Aacute);/\\\'{A}/g; 
+    $result =~ s/&(\#194|Acirc);/\\^{A}/g;
+    $result =~ s/&(\#195|Atilde);/\\~{A}/g;
+    $result =~ s/&(\#196|Auml);/\\\"{A}/g; 
+    $result =~ s/&(\#197|Aring);/{\\AA}/g;
+    $result =~ s/&(\#198|AElig);/{\\AE}/g;
+    $result =~ s/&(\#199|Ccedil);/\\c{c}/g;
+    $result =~ s/&(\#200|Egrave);/\\\`{E}/g;  
+    $result =~ s/&(\#201|Eacute);/\\\'{E}/g;    
+    $result =~ s/&(\#202|Ecirc);/\\^{E}/g;
+    $result =~ s/&(\#203|Euml);/\\\"{E}/g;
+    $result =~ s/&(\#204|Igrave);/\\\`{I}/g;
+    $result =~ s/&(\#205|Iacute);/\\\'{I}/g;    
+    $result =~ s/&(\#206|Icirc);/\\^{I}/g;
+    $result =~ s/&(\#207|Iuml);/\\\"{I}/g;    
+    $result =~ s/&(\#209|Ntilde);/\\~{N}/g;
+    $result =~ s/&(\#210|Ograve);/\\\`{O}/g;
+    $result =~ s/&(\#211|Oacute);/\\\'{O}/g;
+    $result =~ s/&(\#212|Ocirc);/\\^{O}/g;
+    $result =~ s/&(\#213|Otilde);/\\~{O}/g;
+    $result =~ s/&(\#214|Ouml);/\\\"{O}/g;    
+    $result =~ s/&(\#215|times);/\$\\times\$/g;
+    $result =~ s/&(\#216|Oslash);/{\\O}/g;
+    $result =~ s/&(\#217|Ugrave);/\\\`{U}/g;    
+    $result =~ s/&(\#218|Uacute);/\\\'{U}/g;
+    $result =~ s/&(\#219|Ucirc);/\\^{U}/g;
+    $result =~ s/&(\#220|Uuml);/\\\"{U}/g;
+    $result =~ s/&(\#221|Yacute);/\\\'{Y}/g;
+    $result =~ s/&(\#223|szlig);/\\ss/g;
+    $result =~ s/&(\#224|agrave);/\\\`{a}/g;
+    $result =~ s/&(\#225|aacute);/\\\'{a}/g;
+    $result =~ s/&(\#226|acirc);/\\^{a}/g;
+    $result =~ s/&(\#227|atilde);/\\~{a}/g;
+    $result =~ s/&(\#228|auml);/\\\"{a}/g;
+    $result =~ s/&(\#229|aring);/{\\aa}/g;
+    $result =~ s/&(\#230|aelig);/{\\ae}/g;
+    $result =~ s/&(\#231|ccedil);/\\c{c}/g;
+    $result =~ s/&(\#232|egrave);/\\\`{e}/g;
+    $result =~ s/&(\#233|eacute);/\\\'{e}/g;
+    $result =~ s/&(\#234|ecirc);/\\^{e}/g;
+    $result =~ s/&(\#235|euml);/\\\"{e}/g;
+    $result =~ s/&(\#236|igrave);/\\\`{i}/g;
+    $result =~ s/&(\#237|iacute);/\\\'{i}/g;
+    $result =~ s/&(\#238|icirc);/\\^{i}/g;
+    $result =~ s/&(\#239|iuml);/\\\"{i}/g;
+    $result =~ s/&(\#240|eth);/\$\\partial\$/g;
+    $result =~ s/&(\#241|ntilde);/\\~{n}/g;
+    $result =~ s/&(\#242|ograve);/\\\`{o}/g;
+    $result =~ s/&(\#243|oacute);/\\\'{o}/g;
+    $result =~ s/&(\#244|ocirc);/\\^{o}/g;
+    $result =~ s/&(\#245|otilde);/\\~{o}/g;
+    $result =~ s/&(\#246|ouml);/\\\"{o}/g;
+    $result =~ s/&(\#247|divide);/\$\\div\$/g;
+    $result =~ s/&(\#248|oslash);/{\\o}/g;
+    $result =~ s/&(\#249|ugrave);/\\\`{u}/g; 
+    $result =~ s/&(\#250|uacute);/\\\'{u}/g;
+    $result =~ s/&(\#251|ucirc);/\\^{u}/g;
+    $result =~ s/&(\#252|uuml);/\\\"{u}/g;
+    $result =~ s/&(\#253|yacute);/\\\'{y}/g;
+    $result =~ s/&(\#255|yuml);/\\\"{y}/g;
+    $result =~ s/&\#952;/\$\\theta\$/g;
+#Greek Alphabet
+    $result =~ s/&(alpha|\#945);/\$\\alpha \$/g;
+    $result =~ s/&(beta|\#946);/\$\\beta \$/g;
+    $result =~ s/&(gamma|\#947);/\$\\gamma \$/g;
+    $result =~ s/&(delta|\#948);/\$\\delta \$/g;
+    $result =~ s/&(epsilon|\#949);/\$\\epsilon \$/g;
+    $result =~ s/&(zeta|\#950);/\$\\zeta \$/g;
+    $result =~ s/&(eta|\#951);/\$\\eta \$/g;
+    $result =~ s/&(theta|\#952);/\$\\theta \$/g;
+    $result =~ s/&(iota|\#953);/\$\\iota \$/g;
+    $result =~ s/&(kappa|\#954);/\$\\kappa \$/g;
+    $result =~ s/&(lambda|\#955);/\$\\lambda \$/g;
+    $result =~ s/&(mu|\#956);/\$\\mu \$/g;
+    $result =~ s/&(nu|\#957);/\$\\nu \$/g;
+    $result =~ s/&(xi|\#958);/\$\\xi \$/g;
+    $result =~ s/&(pi|\#960);/\$\\pi \$/g;
+    $result =~ s/&(rho|\#961);/\$\\rho \$/g;
+    $result =~ s/&(sigma|\#963);/\$\\sigma \$/g;
+    $result =~ s/&(tau|\#964);/\$\\tau \$/g;
+    $result =~ s/&(upsilon|\#965);/\$\\upsilon \$/g;
+    $result =~ s/&(phi|\#966);/\$\\phi \$/g;
+    $result =~ s/&(chi|\#967);/\$\\chi \$/g;
+    $result =~ s/&(psi|\#968);/\$\\psi \$/g;
+    $result =~ s/&(omega|\#969);/\$\\omega \$/g;
+    $result =~ s/&(Gamma|\#915);/\$\\Gamma \$/g;
+    $result =~ s/&(Delta|\#916);/\$\\Delta \$/g;
+    $result =~ s/&(Theta|\#920);/\$\\Theta \$/g;
+    $result =~ s/&(Lambda|\#923);/\$\\Lambda \$/g;
+    $result =~ s/&(Xi|\#926);/\$\\Xi \$/g;
+    $result =~ s/&(Pi|\#928);/\$\\Pi \$/g;
+    $result =~ s/&(Sigma|\#931);/\$\\Sigma \$/g;
+    $result =~ s/&(Upsilon|\#933);/\$\\Upsilon \$/g;
+    $result =~ s/&(Phi|\#934);/\$\\Phi \$/g;
+    $result =~ s/&(Psi|\#936);/\$\\Psi \$/g;
+    $result =~ s/&(Omega|\#937);/\$\\Omega \$/g;
+
     return $result;
 }
 
@@ -1067,26 +1106,157 @@ sub character_chart {
 #    } elsif($papersize=~/A6/) {
 	}
 	return $textwidth,$textheight,$oddoffset,$evenoffset;
+}
+
+
+sub page_format_new {
+#
+#Correspondence between $papersize variable and real paper format:
+# 0 - "Letter [8 1/2x11 in]"
+# 1 - "Legal [8 1/2x14 in]"
+# 2 - "Ledger/Tabloid [11x17 in]"
+# 3 - "Executive [7 1/2x10 in]"
+# 4 - "A2 [420x594 mm]"
+# 5 - "A3 [297x420 mm]"
+# 6 - "A4 [210x297 mm]"
+# 7 - "A5 [148x210 mm]"
+# 8 - "A6 [105x148 mm]"
+# 
+    my ($papersize,$layout,$numberofcolumns) = @_; 
+    my ($textwidth,$textheight,$oddoffset,$evenoffset) = (0,0,0,0);
+    if ($papersize eq '0') {
+	if ($layout eq 'book') {
+	    if ($numberofcolumns == 1) {
+		$textwidth = '18 cm';
+		$textheight = '25.9 cm';
+		$oddoffset = '-0.57 in';
+		$evenoffset = '-0.57 in';
+	    } elsif ($numberofcolumns == 2) {
+		$textwidth = '93 mm';
+		$textheight = '25.9 cm';
+		$oddoffset = '-0.57 in';
+		$evenoffset = '-0.57 in';
+	    }
+	} elsif ($layout eq 'album') {
+	    if ($numberofcolumns eq '1') {
+		$textwidth = '8.8 in';
+		$textheight = '6.8 in';
+		$oddoffset = '-40 pt';
+		$evenoffset = '-60 pt';
+	    } elsif ($numberofcolumns == 2) {
+		$textwidth = '4.2 in';
+		$textheight = '6.8 in';
+		$oddoffset = '-40 pt';
+		$evenoffset = '-60 pt';
+	    }
+	}
+#    } elsif($papersize eq '1') {
+#    } elsif($papersize eq '2') {
+#    } elsif($papersize eq '3'/) {
+    } elsif($papersize eq '6') {
+	if ($layout eq 'book') {
+	    if ($numberofcolumns == 1) {
+		$textwidth = '18 cm';
+		$textheight = '28 cm';
+		$oddoffset = '-0.57 in';
+		$evenoffset = '-0.57 in';
+	    } elsif ($numberofcolumns == 2) {
+		$textwidth = '96 mm';
+		$textheight = '2 cm';
+		$oddoffset = '-0.57 in';
+		$evenoffset = '-0.57 in';
+	    }
+	} elsif ($layout eq 'album') {
+	    if ($numberofcolumns eq '1') {
+		$textwidth = '8.5 in';
+		$textheight = '7.7 in';
+		$oddoffset = '-40 pt';
+		$evenoffset = '-60 pt';
+	    } elsif ($numberofcolumns == 2) {
+		$textwidth = '3.9 in';
+		$textheight = '7.7 in';
+		$oddoffset = '-40 pt';
+		$evenoffset = '-60 pt';
+	    }
+	}
+#    } elsif($papersize eq '5') {
+#    } elsif($papersize eq '4') {
+#    } elsif($papersize eq '7') {
+#    } elsif($papersize eq '8') {
     }
+    return $textwidth,$textheight,$oddoffset,$evenoffset;
+}
 
 
+sub get_name {
+    my ($uname,$udom)=@_;
+    if (!defined($uname)) { $uname=$ENV{'user.name'}; }
+    if (!defined($udom)) { $uname=$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');
+}
+
 sub page_format_transformation {
-	my ($papersize,$layout,$numberofcolumns,$choice,$text) = @_; 
-	my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$layout,$numberofcolumns);
-	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\}\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1}\\noindent\\parbox{\\minipagewidth}{\\noindent\\fbox{\\textbf{$ENV{'environment.firstname'} $ENV{'environment.lastname'}}} \\hfill  $courseidinfo} \\vskip 5 mm /;
-	    } else {
-		$text =~ s/\\begin{document}/\\setlength{\\textheight}{$textheight}\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}\\setlength{\\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 /;
-	    }
+    my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment) = @_; 
+    my ($textwidth,$textheight,$oddoffset,$evenoffset);
+	$assignment=~s/_/ /g;
+        if ($numberofcolumns != 1) {
+          ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$layout,$numberofcolumns);
+	} else {
+	  ($textwidth,$textheight,$oddoffset,$evenoffset) = ($ENV{'form.width'},$ENV{'form.height'},$ENV{'form.leftmargin'},$ENV{'form.leftmargin'});
+	}
+    my $name = &get_name();
+    if ($name =~ /^\s*$/) {
+	$name=&Apache::lonxml::latex_special_symbols($ENV{'user.name'},undef,
+						     undef,'header');
+    }
+    my $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'','','header');
+    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{$name}} \\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\}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{\\textbf{$name} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}/;
+	} else {
+	    $text =~ s/\\pagestyle{fancy}\\rhead{}\\chead{}\s*\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\begin{document}\\voffset=-0\.8cm\\setcounter{page}{1}  \\vskip 5 mm /;
+
 	}
-	return $text;
+    }
+    return $text;
 }
 
 
+sub page_format_transformation_new {
+    my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment) = @_; 
+    my ($textwidth,$textheight,$oddoffset,$evenoffset);
+	$assignment=~s/_/ /g;
+        if ($numberofcolumns != 1) {
+          ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format_new($papersize,$layout,$numberofcolumns);
+	} else {
+	  ($textwidth,$textheight,$oddoffset,$evenoffset) = ($ENV{'form.width'},$ENV{'form.height'},$ENV{'form.leftmargin'},$ENV{'form.leftmargin'});
+	}
+    my $name = &get_name();
+    if ($name =~ /^\s*$/) {
+	$name=&Apache::lonxml::latex_special_symbols($ENV{'user.name'},undef,
+						     undef,'header');
+    }
+    my $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'','','header');
+    if ($layout eq 'album') {
+	    $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{$name}} \\hfill  $courseidinfo} \\vskip 5 mm /;
+    } elsif ($layout eq 'book') {
+	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\}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{\\textbf{$name} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}/;
+	} else {
+	    $text =~ s/\\pagestyle{fancy}\\rhead{}\\chead{}\s*\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\begin{document}\\voffset=-0\.8cm\\setcounter{page}{1}  \\vskip 5 mm /;
+
+	}
+    }
+    return $text;
+}
+
+
+
 sub page_cleanup {
     my $result = shift;	
  
@@ -1106,15 +1276,17 @@ sub details_for_menu {
     my $name_of_resourse = $hash{'title_'.$hash{'ids_'.$ENV{'form.postdata'}}};
     my $symbolic = &Apache::lonnet::symbread($ENV{'form.postdata'});
     my ($map,$id,$resource)=split(/___/,$symbolic);
-    my $name_of_sequence = $hash{'title_'.$hash{'ids_/res/'.$map}};
+    $map=&Apache::lonnet::clutter($map);
+    my $name_of_sequence;
+    $name_of_sequence = $hash{'title_'.$hash{'ids_'.$map}};
     if ($name_of_sequence =~ /^\s*$/) {
-      $map =~ m|([^/]+)$|;
-      $name_of_sequence = $1;
+	$map =~ m|([^/]+)$|;
+	$name_of_sequence = $1;
     }
-    my $name_of_map = $hash{'title_'.$hash{'ids_/res/'.$ENV{'request.course.uri'}}};
+    my $name_of_map = $hash{'title_'.$hash{'ids_'.&Apache::lonnet::clutter($ENV{'request.course.uri'})}};
     if ($name_of_map =~ /^\s*$/) {
-      $ENV{'request.course.uri'} =~ m|([^/]+)$|;
-      $name_of_map = $1;
+	$ENV{'request.course.uri'} =~ m|([^/]+)$|;
+	$name_of_map = $1;
     }
     return ($name_of_resourse,$name_of_sequence,$name_of_map);
 
@@ -1127,9 +1299,9 @@ sub latex_corrections {
 
     $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g;
     $result =~ s/\$number_of_columns/$number_of_columns/g;
-    $result =~ s/(\\end{document})/\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License  $1/;
-    $result =~ s/(\\end{longtable}\s*)(\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g;
-    $result =~ s/(\\end{longtable}\s*)\\newline/$1/g;
+    $result =~ s/(\\end{document})/\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License  $1/;
+    $result =~ s/(\\end{longtable}\s*)(\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g;
+    $result =~ s/(\\end{longtable}\s*)\\strut\\newline/$1/g;
 #-- LaTeX corrections     
     my $first_comment = index($result,'<!--',0);
     while ($first_comment != -1) {
@@ -1138,7 +1310,7 @@ sub latex_corrections {
 	$first_comment = index($result,'<!--',$first_comment);
     }
     $result =~ s/^\s+$//gm; #remove empty lines
-    $result =~ s/(\s)+/$1/g; #removes more than one empty space
+    $result =~ s/(\s)(\s+)/$1/g; #removes more than one empty space
     $result =~ s/\\\\\s*\\vskip/\\vskip/gm;
     $result =~ s/\\\\\s*\\noindent\s*(\\\\)+/\\\\\\noindent /g;
     $result =~ s/{\\par }\s*\\\\/\\\\/gm;
@@ -1155,16 +1327,284 @@ sub latex_corrections {
 }
 
 
+sub output_data_new {
+    my ($r,$helper) = @_;
+    $r->print(<<ENDPART);
+<html>
+<head>
+<title>LON-CAPA output for printing</title>
+</head>
+<body bgcolor="FFFFFF">
+<hr>
+ENDPART
+
+    my $format_from_helper = $helper->{'VARS'}->{'FORMAT'};
+    my ($result,$selectionmade) = ('','');
+    my $number_of_columns = 1; #used only for pages to determine the width of the cell
+    my @temporary_array=split /\|/,$format_from_helper;
+    my ($laystyle,$numberofcolumns,$papersize)=@temporary_array;
+    if ($laystyle eq 'L') {
+	$laystyle='album';
+    } else {
+	$laystyle='book';
+    }
+    my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format_new($papersize,$laystyle,$numberofcolumns);
+    my $assignment =  $ENV{'form.assignment'};
+    my $LaTeXwidth; 
+    if ($textwidth=~/(\d+)\s*cm/) {
+	$LaTeXwidth = $1*10;
+    } elsif ($textwidth=~/(\d+)\s*mm/) {
+	$LaTeXwidth = $1;
+    } elsif ($textwidth=~/(\d+)\s*in/) {
+	$LaTeXwidth = $1*25.4;
+    }
+    $LaTeXwidth.=' mm';
+    
+    if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
+      #-- single document - problem, page, html, xml, ...
+	my $currentURL;
+	if (not defined $helper->{'VARS'}->{'construction'}) {
+	    $currentURL=$helper->{'VARS'}->{'postdata'};
+	} else {
+	    $currentURL=$helper->{'VARS'}->{'construction'};
+	}
+	$selectionmade = 1;
+	if ($currentURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+        my %moreenv;
+        $moreenv{'form.grade_target'}='tex';
+	if (&Apache::lonnet::allowed('bre',$currentURL)) {
+	    $currentURL=~s/http:\/\/[^\/]+//;
+	}
+        $moreenv{'request.filename'}=$currentURL;
+        $moreenv{'form.textwidth'}=$LaTeXwidth;
+        &Apache::lonnet::appenv(%moreenv);
+        my $texversion=&Apache::lonnet::ssi($currentURL);
+        &Apache::lonnet::delenv('form.grade_target','form.textwidth','form.counter');
+        $result .= $texversion;
+        if ($currentURL=~m/\.page\s*$/) {
+	  ($result,$number_of_columns) = &page_cleanup($result);
+        }
+      } else {
+#	  $result='\documentclass[letterpaper]{article}\usepackage{calc}\begin{document}Printout of this type of document is currently not supported: ';
+#	  if ($ENV{'form.url'}=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) {
+#	      $result.=$1;
+#	  } else {
+#	      $result.=$ENV{'form.url'};
+#	  }
+#	  $result.=' \end{document}'
+      }
+
+
+    } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') or
+             ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or
+             ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')) { 
+        #-- produce an output string
+	my $flag_latex_header_remove = 'NO';
+	my $flag_page_in_sequence = 'NO';
+	my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
+	for (my $i=0;$i<=$#master_seq;$i++) {
+	    $master_seq[$i]=~/___\d+___(.*)$/;
+	    my $urlp='/res/'.$1;
+	    if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') {
+		$selectionmade = 2;
+	    } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') {
+		$selectionmade = 3;
+	    } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') {
+		$selectionmade = 4;
+	    }
+	    my %moreenv;
+	    $moreenv{'form.grade_target'}='tex';
+	    $moreenv{'form.textwidth'}=$LaTeXwidth;
+	    &Apache::lonnet::appenv(%moreenv);
+	    #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]");
+	    my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$master_seq[$i]));
+	    &Apache::lonnet::delenv('form.grade_target','form.textwidth');
+	    if ($urlp=~/\.page$/) {
+		($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
+		if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;} 
+		$texversion =~ s/\\end{document}\d*/\\end{document}/;
+		$flag_page_in_sequence = 'YES';
+	    } 
+	    if ($flag_latex_header_remove ne 'NO') {
+		$texversion = &latex_header_footer_remove($texversion);
+	    } else {
+		$texversion =~ s/\\end{document}//;
+	    }
+	    $result .= $texversion;         
+	    $flag_latex_header_remove = 'YES';   
+	}
+	&Apache::lonnet::delenv('form.counter');
+	if ($flag_page_in_sequence eq 'YES') {$result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;}	
+	$result .= '\end{document}';
+     } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') { 
+     #-- prints assignments for whole class or for selected students  
+	 $selectionmade=5;
+	 my @students=split /\|\|\|/, $helper->{'VARS'}->{'STUDENTS'};
+	 my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
+	 #loop over students
+	 my $flag_latex_header_remove = 'NO'; 
+	 my %moreenv;
+	 $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) {
+	    my $current_output = ''; 
+#	    my ($usersection,$username,$userdomain) = split /:/,$person;
+	    my ($username,$userdomain) = split /:/,$person;
+	    my $fullname = &get_name($username,$userdomain);
+            #goes through all resources, checks if they are available for current student, and produces output   
+	    foreach my $curresline (@master_seq)  {
+		if ($curresline=~ m/\.(problem|exam|quiz|assess|survey|form|library)$/) {
+		    my ($map,$id,$res_url) = split(/___/,$curresline);
+		    if (&Apache::lonnet::allowed('bre',$res_url)) {
+			my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,
+                                                                        $ENV{'request.course.id'},'tex');
+			if ($flag_latex_header_remove eq 'YES') {
+			    $rendered = &latex_header_footer_remove($rendered);
+			} else {
+			    $rendered =~ s/\\end{document}//;
+			}
+			$current_output .= $rendered;
+		    }
+		    $flag_latex_header_remove = 'YES';
+		}
+	    }
+	    my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+	    if ($current_output=~/\\documentclass/) {
+		$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\vskip 3 mm /;
+	    } else {
+		my $blanspages = '';
+		for (my $j=0;$j<$helper->{'VARS'}->{'EMPTY_PAGES'};$j++) {$blanspages.='\clearpage\strut\clearpage';}
+		$current_output = '\strut\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage \\vskip 3mm'.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}} - '.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}\hskip 1.4in } \vskip 5 mm '.$current_output;
+	    }
+	    $result .= $current_output;
+	    &Apache::lonnet::delenv('form.counter');	    
+	    &Apache::lonxml::init_counter(); 
+	    &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
+						    'last student '.$fullname);
+	}
+	&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+	$result .= '\end{document}';
+	&Apache::lonnet::delenv('form.textwidth');
+    } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_from_directory') {      
+    #prints selected problems from the subdirectory 
+	$selectionmade = 6;
+        my @list_of_files=split /\|\|\|/, $helper->{'VARS'}->{'FILES'};
+	@list_of_files=sort @list_of_files;
+	my $flag_latex_header_remove = 'NO';  
+	for (my $i=0;$i<=$#list_of_files;$i++) {
+	    my $urlp = $list_of_files[$i];
+	    if ($urlp=~/\//) {
+		my %moreenv;
+		$moreenv{'form.grade_target'}='tex';
+		$moreenv{'form.textwidth'}=$LaTeXwidth;
+		&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');
+                #this chunck is responsible for printing the path to problem
+		my $newurlp = '';
+		my $HowMany = length($urlp)*2;
+		if ($HowMany > $LaTeXwidth) {
+		    my @temporrary = split '/',$urlp;
+		    my $HowManyNew = 0;
+		    for (my $ii=0;$ii<=$#temporrary;$ii++) {
+			if ($temporrary[$ii] ne '') {
+			    $HowManyNew += length($temporrary[$ii])*2;
+			    if ($HowManyNew < $LaTeXwidth ) {
+				$newurlp .=  '/'.$temporrary[$ii];
+			    } else {
+				$HowManyNew = 0;
+				$newurlp .=  '|\vskip -1 mm \noindent \verb|';
+				$ii--;
+			    }
+			}
+		    }
+		}
+		$texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 {\\small\\noindent\\verb|$newurlp\|\\vskip 0 mm}/;
+		if ($flag_latex_header_remove ne 'NO') {
+		    $texversion = &latex_header_footer_remove($texversion);
+		} else {
+		    $texversion =~ s/\\end{document}//;
+		}
+		$result .= $texversion;
+	    }
+	    $flag_latex_header_remove = 'YES';  
+	}
+	$result .= '\end{document}';      	
+    }
+#-------------------------------------------------------- corrections for the different page formats
+    $result = &page_format_transformation_new($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'});
+#    if ($layout eq 'CBI') {
+#        $laystyle = 'album';
+#    }
+    $result = &latex_corrections($number_of_columns,$result);
+#    #changes page's parameters for the one column output 
+#    if ($ENV{'form.numberofcolumns'} == 1) {
+#	$result =~ s/\\textwidth= 9cm/\\textwidth= $ENV{'form.width'}/;
+#	$result =~ s/\\textheight 25\.9cm/\\textheight $ENV{'form.height'}/;
+#	$result =~ s/\\evensidemargin = -0\.57in/\\evensidemargin= $ENV{'form.leftmargin'}/;
+#	$result =~ s/\\oddsidemargin = -0\.57in/\\oddsidemargin= $ENV{'form.leftmargin'}/;
+#    }
+#-- writing .tex file in prtspool 
+    my $temp_file;
+    my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout_".time."_".rand(10000000).".tex";
+    unless ($temp_file = Apache::File->new('>'.$filename)) {
+	$r->log_error("Couldn't open $filename for output $!");
+	return SERVER_ERROR; 
+    } 
+    print $temp_file $result;
+
+#<meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle&$numberofcolumns&$selectionmade">
+$r->print(<<FINALEND);
+<meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle&$numberofcolumns&$selectionmade">
+</body>
+</html>
+FINALEND
+}
+
+
+
 sub handler {
 
     my $r = shift;
+    my $helper;
+
+    # A hook for me to work without disturbing Alex.
+    if (!$ENV{'form.jeremy'}) {
+        my $result = printHelper($r);
+        if (!ref($result)) {
+            return $result;
+        }
+        $helper = $result;
+	
+	
+#	my $key; 
+#	foreach $key (keys %{$helper->{'VARS'}}) {
+#	    $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<br />');
+#	}
+#	return OK;
+	
+	
+	&output_data_new($r,$helper);
+
+
 
-    my $loaderror=&Apache::lonnet::overloaderror($r);
-    if ($loaderror) { return $loaderror; }
-    $loaderror=
-       &Apache::lonnet::overloaderror($r,
-         $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
-    if ($loaderror) { return $loaderror; }
+
+
+
+    return OK;
+    }
+#    my $loaderror=&Apache::lonnet::overloaderror($r);
+#    if ($loaderror) { return $loaderror; }
+#    $loaderror=
+#       &Apache::lonnet::overloaderror($r,
+#         $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
+#    if ($loaderror) { return $loaderror; }
 
     $r->content_type('text/html');
     $r->send_http_header;
@@ -1183,7 +1623,11 @@ sub handler {
     }
 #-- additional menu for class printing
      if ($ENV{'form.phase'} eq 'two') {
-	 if($ENV{'form.choice'} eq 'All class print') {
+	 if($ENV{'form.choice'} eq 'Standard LaTeX output for whole primary sequence') {
+	     &sequence_content_menu(0,$r);
+	 } elsif($ENV{'form.choice'} eq 'Standard LaTeX output for the primary sequence') {
+	     &sequence_content_menu(1,$r);
+	 } elsif($ENV{'form.choice'} eq 'All class print') {
 	     &additional_class_menu($r);
 	 } elsif($ENV{'form.choice'} eq 'Subdirectory print') {
 	     &problem_choice_menu($r);
@@ -1208,7 +1652,514 @@ sub handler {
    
 } 
 
+use Apache::lonhelper;
+
+sub printHelper {
+    my $r = shift;
+
+    if ($ENV{'request.course.id'}) {
+	my $fn=$ENV{'request.course.fn'};
+	tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640);
+    }
+
+    if ($r->header_only) {
+        if ($ENV{'browser.mathml'}) {
+            $r->content_type('text/xml');
+        } else {
+            $r->content_type('text/html');
+        }
+        $r->send_http_header;
+        return OK;
+    }
+
+    # Send header, nocache
+    if ($ENV{'browser.mathml'}) {
+        $r->content_type('text/xml');
+    } else {
+        $r->content_type('text/html');
+    }
+    &Apache::loncommon::no_cache($r);
+    $r->send_http_header;
+    $r->rflush();
+
+    # Unfortunately, this helper is so complicated we have to
+    # write it by hand
+
+    Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});
+    
+    my $helper = Apache::lonhelper::helper->new("Printing Wizard");
+    $helper->declareVar('symb');
+    $helper->declareVar('postdata');
+    
+    # This will persistently load in the data we want from the
+    # very first screen.
+    if ($ENV{'form.postdata'}) {
+	if ($ENV{'form.postdata'}!~/\/res\//) {$helper->{VARS}->{'construction'} = $ENV{'form.postdata'};}
+        $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($ENV{'form.postdata'});
+    }
+    if ($ENV{'form.symb'}) {
+        $helper->{VARS}->{'symb'} = $ENV{'form.symb'};
+    }
+    if ($ENV{'form.url'}) {
+        $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
+
+    }
+
+    
+    my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu;
+    $helper->{VARS}->{'assignment'} = $sequenceTitle;
+
+    # Extract map
+    my $symb = $helper->{VARS}->{'symb'};
+    my ($map, $id, $url) = split(/___/, $symb);
+    $helper->{VARS}->{'postdata'} = Apache::lonnet::clutter($url);
+
+    if (!$resourceTitle) { # if the resource doesn't have a title, use the filename
+        my $url = $helper->{VARS}->{'postdata'};
+        $resourceTitle = substr($url, rindex($url, '/') + 1);
+    }
+
+    Apache::lonhelper::registerHelperTags();
+
+    my $subdir = &Apache::lonnet::filelocation("", $url);
+
+    # "Delete everything after the last slash."
+    $subdir =~ s|/[^/]+$||;
+    if (not defined $helper->{VARS}->{'construction'}) {
+	$subdir =  '/home/httpd/html/res'.$subdir;   
+    } else {
+	$helper->{VARS}->{'construction'}=~/^([^\/]+)\/\/([^\/]+)(.*)\/[^\/]*$/;
+	$subdir = $3;
+	$subdir=~/\/~([^\/]+)\/(.*)$/;
+	$subdir = '/home/'.$1.'/public_html/'.$2;
+    }
+####    $r->print('Dir:  '.$subdir.'  ');
+####    return OK;
+
+
+    # What can be printed is a very dynamic decision based on
+    # lots of factors. So we need to dynamically build this list.
+    # To prevent security leaks, states are only added to the wizard
+    # if they can be reached, which ensures manipulating the form input
+    # won't allow anyone to reach states they shouldn't have permission
+    # to reach.
+
+    # printChoices is tracking the kind of printing the user can
+    # do, and will be used in a choices construction later.
+    # In the meantime we will be adding states and elements to
+    # the helper by hand.
+    my $printChoices = [];
+    my $paramHash;
+    # We can always print the current screen.
+
+    push @{$printChoices}, ["Current resource <b>$resourceTitle</b> (prints what you just saw on the screen)", 'current_document', 'PAGESIZE'];
+
+    # If we're in a sequence...
+    if (not defined $helper->{'VARS'}->{'construction'}) {
+        # Allow problems from sequence
+        push @{$printChoices}, ["Problem(s) from <b>$sequenceTitle</b>", 'map_problems', 'CHOOSE_PROBLEMS'];
+        # Allow all resources from sequence
+        push @{$printChoices}, ["Everything (problem(s), page(s), html/xml file(s)) from <b>$sequenceTitle</b>", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
+
+        my $isProblem = '$res->is_problem();';
+        my $isProblemOrMap = '$res->is_problem() || $res->is_map()';
+        my $isNotMap = '!$res->is_map();';
+        my $symb = '$res->symb();';
+        my $helperFragment = <<HELPERFRAGMENT;
+  <state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">
+    <message>(mark them then click "next" button) <br /></message>
+    <resource variable="RESOURCES" multichoice="1" toponly='1'>
+      <nextstate>PAGESIZE</nextstate>
+      <filterfunc>return $isProblem</filterfunc>
+      <mapurl>$map</mapurl>
+      <valuefunc>return $symb</valuefunc>
+      </resource>
+    </state>
+
+  <state name="CHOOSE_PROBLEMS_HTML" title="Select Resource(s) to print">
+    <message>(mark them then click "next" button) <br /></message>
+    <resource variable="RESOURCES" multichoice="1" toponly='1'>
+      <nextstate>PAGESIZE</nextstate>
+      <filterfunc>return $isNotMap;</filterfunc>
+      <mapurl>$map</mapurl>
+      <valuefunc>return $symb</valuefunc>
+      </resource>
+    </state>
+HELPERFRAGMENT
+
+        &Apache::lonxml::xmlparse($r, 'helper', $helperFragment); 
+    }
+
+    # If the user is priviledged, allow them to print all 
+    # problems in the course, optionally for selected students
+    if (($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) and ($helper->{VARS}->{'postdata'}=~/\/res\//)) { 
+        push @{$printChoices}, ['<b>Problems</b> in this course', 'all_problems', 'ALL_PROBLEMS'];
+        push @{$printChoices}, ["Problems from <b>$sequenceTitle</b> for selected students", 'problems_for_students', 'CHOOSE_STUDENTS'];
+
+        my $isProblem = '$res->is_problem();';
+        my $isProblemOrMap = '$res->is_problem() || $res->is_map()';
+        my $symb = '$res->symb();';
+        &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
+  <state name="ALL_PROBLEMS" title="Select Problem(s) to print">
+    <message>(mark them then click "next" button) <br /></message>
+    <resource variable="RESOURCES" multichoice="1">
+      <nextstate>PAGESIZE</nextstate>
+      <filterfunc>return $isProblemOrMap</filterfunc>
+      <choicefunc>return $isProblem</choicefunc>
+      <valuefunc>return $symb</valuefunc>
+      </resource>
+    </state>
+
+  <state name="CHOOSE_STUDENTS" title="Choose Students whose assignments you want to print">
+    <message>(do not forget to select assignment itself - make another selection below) <br /></message>
+    <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />
+    <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
+    <resource variable="RESOURCES" multichoice="1">
+      <filterfunc>return $isProblem</filterfunc>
+      <mapurl>$map</mapurl>
+      <valuefunc>return $symb</valuefunc>
+      </resource>
+    <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
+    <choices variable="EMPTY_PAGES">
+      <choice computer='0'>Print students assignments without separations (as uniform flow)</choice>
+      <choice computer='1'>Start student assignment from new page (add pagefeed after each student)</choice>
+      <choice computer='2'>Add one emty page after each student assignment</choice> 
+      <choice computer='3'>Add two emty page after each student assignment</choice> 
+      </choices>
+    </state>
+CHOOSE_STUDENTS
+    }
+
+    # FIXME: That RE should come from a library somewhere.
+    if (((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) or defined $helper->{'VARS'}->{'construction'}) {    
+        push @{$printChoices}, ["Problems from current subdirectory <b>$subdir</b>", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
+        
+        my $f = '$filename';
+        my $xmlfrag = <<CHOOSE_FROM_SUBDIR;
+  <state name="CHOOSE_FROM_SUBDIR" title="Select File(s) from <b><small>$subdir</small></b> to print">
+    <message>(mark them then click "next" button) <br /></message>
+    <files variable="FILES" multichoice='1'>
+      <nextstate>PAGESIZE</nextstate>
+      <filechoice>return '$subdir';</filechoice>
+CHOOSE_FROM_SUBDIR
+        
+        $xmlfrag .= <<'CHOOSE_FROM_SUBDIR';
+      <filefilter>return $filename =~ 
+           m/^[^\.]+\.(problem|exam|quiz|assess|survey|form|library)$/;
+      </filefilter>
+      </files>
+    </state>
+CHOOSE_FROM_SUBDIR
+        &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
+    }
+
+    # Generate the first state, to select which resources get printed.
+    Apache::lonhelper::state->new("START", "What do you want to print? Make a choice.");
+    $paramHash = Apache::lonhelper::getParamHash();
+    $paramHash->{MESSAGE_TEXT} = "";
+    Apache::lonhelper::message->new();
+    $paramHash = Apache::lonhelper::getParamHash();
+    $paramHash->{'variable'} = 'PRINT_TYPE';
+    $helper->declareVar('PRINT_TYPE');
+    $paramHash->{CHOICES} = $printChoices;
+    Apache::lonhelper::choices->new();
+    Apache::lonprintout::page_format_state->new("FORMAT");
+
+    # Generate the PAGESIZE state which will offer the user the margin
+    # choices if they select one column
+    Apache::lonhelper::state->new("PAGESIZE", "Set Margins");
+    Apache::lonprintout::page_size_state->new('pagesize', 'FORMAT', 'FINAL');
+
+
+    $helper->process();
+
+    # MANUAL BAILOUT CONDITION:
+    # If we're in the "final" state, bailout and return to handler
+    if ($helper->{STATE} eq 'FINAL') {
+        return $helper;
+    }    
+
+    $r->print($helper->display());
+
+    Apache::lonhelper::unregisterHelperTags();
+
+    untie %hash;
+
+    return OK;
+}
+
+
+1;
+
+package Apache::lonprintout::page_format_state;
+
+=pod
+
+=head1 Helper element: page_format_state
+
+See lonhelper.pm documentation for discussion of the helper framework.
+
+Apache::lonprintout::page_format_state is an element that gives the 
+user an opportunity to select the page layout they wish to print 
+with: Number of columns, portrait/landscape, and paper size. If you 
+want to change the paper size choices, change the @paperSize array 
+contents in this package.
+
+page_format_state is always directly invoked in lonprintout.pm, so there
+is no tag interface. You actually pass parameters to the constructor.
+
+=over 4
+
+=item * B<new>(varName): varName is where the print information will be stored in the format FIXME.
+
+=back
+
+=cut
+
+use Apache::lonhelper;
+
+no strict;
+@ISA = ("Apache::lonhelper::element");
+use strict;
+
+my $maxColumns = 2;
+my @paperSize = ("Letter [8 1/2x11 in]", "Legal [8 1/2x14 in]", 
+                 "Ledger/Tabloid [11x17 in]", "Executive [7 1/2x10 in]",
+                 "A2 [420x594 mm]", "A3 [297x420 mm]", "A4 [210x297 mm]", 
+                 "A5 [148x210 mm]", "A6 [105x148 mm]" );
+
+# Tentative format: Orientation (L = Landscape, P = portrait) | Colnum |
+#                   Paper type
+
+sub new { 
+    my $self = Apache::lonhelper::element->new();
+
+    shift;
+
+    $self->{'variable'} = shift;
+    my $helper = Apache::lonhelper::getHelper();
+    $helper->declareVar($self->{'variable'});
+    bless($self);
+    return $self;
+}
+
+sub render {
+    my $self = shift;
+    my $helper = Apache::lonhelper::getHelper();
+    my $result = '';
+    my $var = $self->{'variable'};
+
+    $result .= <<STATEHTML;
+
+<p><big><i><b>What page format do you prefer?</b></i></big></p>
+<table cellpadding="3">
+  <tr>
+    <td align="center"><b>Page layout</b></td>
+    <td align="center"><b>Number of columns</b></td>
+    <td align="center"><b>Paper type</b></td>
+  </tr>
+  <tr>
+    <td>
+      <input type="radio" name="${var}.layout" value="L" /> Landscape<br />
+      <input type="radio" name="${var}.layout" value="P" checked='1'  /> Portrait
+    </td>
+    <td align="center">
+      <select name="${var}.cols">
+STATEHTML
+
+    my $i;
+    for ($i = 1; $i <= $maxColumns; $i++) {
+        if ($i == 2) {
+            $result .= "<option value='$i' selected>$i</option>\n";
+        } else {
+            $result .= "<option value='$i'>$i</option>\n";
+        }
+    }
+
+    $result .= "</select></td><td>\n";
+    $result .= "<select name='${var}.paper'>\n";
+
+    $i = 0;
+    foreach (@paperSize) {
+        if ($i == 0) {
+            $result .= "<option selected value='$i'>" . $paperSize[$i] . "</option>\n";
+        } else {
+            $result .= "<option value='$i'>" . $paperSize[$i] . "</option>\n";
+        }
+        $i++;
+    }
+
+    $result .= "</select></td></tr></table>";
+    return $result;
+}
+
+sub postprocess {
+    my $self = shift;
+
+    my $var = $self->{'variable'};
+    my $helper = Apache::lonhelper->getHelper();
+    $helper->{VARS}->{$var} = 
+        $ENV{"form.$var.layout"} . '|' . $ENV{"form.$var.cols"} . '|' .
+        $ENV{"form.$var.paper"};
+    return 1;
+}
 
 1;
+
+package Apache::lonprintout::page_size_state;
+
+=pod
+
+=head1 Helper element: page_size_state
+
+See lonhelper.pm documentation for discussion of the helper framework.
+
+Apache::lonprintout::page_size_state is an element that gives the 
+user the opportunity to further refine the page settings if they
+select a single-column page.
+
+page_size_state is always directly invoked in lonprintout.pm, so there
+is no tag interface. You actually pass parameters to the constructor.
+
+=over 4
+
+=item * B<new>(varName): varName is where the print information will be stored in the format FIXME.
+
+=back
+
+=cut
+
+use Apache::lonhelper;
+
+no strict;
+@ISA = ("Apache::lonhelper::element");
+use strict;
+
+
+
+sub new { 
+    my $self = Apache::lonhelper::element->new();
+
+    shift; # disturbs me (probably prevents subclassing) but works (drops
+           # package descriptor)... - Jeremy
+
+    $self->{'variable'} = shift;
+    my $helper = Apache::lonhelper::getHelper();
+    $helper->declareVar($self->{'variable'});
+
+    # The variable name of the format element, so we can look into 
+    # $helper->{VARS} to figure out whether the columns are one or two
+    $self->{'formatvar'} = shift;
+
+    # The state to transition to after selection, or after discovering
+    # the cols are not set to 1
+    $self->{NEXTSTATE} = shift;
+    bless($self);
+    return $self;
+}
+
+sub render {
+    my $self = shift;
+    my $helper = Apache::lonhelper::getHelper();
+    my $result = '';
+    my $var = $self->{'variable'};
+
+    if (defined $self->{ERROR_MSG}) {
+        $result .= '<br /><font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br />';
+    }
+
+    $result .= <<ELEMENTHTML;
+
+<p>How should the column be formatted?</p>
+
+<table cellpadding='3'>
+  <tr>
+    <td align='right'><b>Width</b>:</td>
+    <td align='left'><input type='text' name='$var.width' value='18' size='4'></td>
+    <td align='left'>
+      <select name='$var.widthunit'>
+        <option>cm</option><option>in</option>
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <td align='right'><b>Height</b>:</td>
+    <td align='left'><input type='text' name="$var.height" value="25.9" size='4'></td>
+    <td align='left'>
+      <select name='$var.heightunit'>
+        <option>cm</option><option>in</option>
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <td align='right'><b>Left margin</b>:</td>
+    <td align='left'><input type='text' name='$var.lmargin' value='-1.5' size='4'></td>
+    <td align='left'>
+      <select name='$var.heightunit'>
+        <option>cm</option><option>in</option>
+      </select>
+    </td>
+  </tr>
+</table>
+
+<p>Hint: Some instructors like to leave scratch space for the student by
+making the width much smaller then the width of the page.</p>
+
+ELEMENTHTML
+
+    return $result;
+}
+
+# If the user didn't select 1 column, skip this state.
+sub preprocess {
+    my $self = shift;
+    my $helper = Apache::lonhelper::getHelper();
+
+    my $format = $helper->{VARS}->{$self->{'formatvar'}};
+    if (substr($format, 2, 1) ne '1') {
+        $helper->changeState($self->{NEXTSTATE});
+    }
+   
+    return 1;
+}
+
+sub postprocess {
+    my $self = shift;
+
+    my $var = $self->{'variable'};
+    my $helper = Apache::lonhelper->getHelper();
+    my $width = $helper->{VARS}->{$var .'.width'} = $ENV{"form.${var}.width"}; 
+    my $height = $helper->{VARS}->{$var .'.height'} = $ENV{"form.${var}.height"}; 
+    my $lmargin = $helper->{VARS}->{$var .'.lmargin'} = $ENV{"form.${var}.lmargin"}; 
+    $helper->{VARS}->{$var .'.widthunit'} = $ENV{"form.${var}.widthunit"}; 
+    $helper->{VARS}->{$var .'.heightunit'} = $ENV{"form.${var}.heightunit"}; 
+    $helper->{VARS}->{$var .'.lmarginunit'} = $ENV{"form.${var}.lmarginunit"}; 
+
+    my $error = '';
+
+    # /^-?[0-9]+(\.[0-9]*)?$/ -> optional minus, at least on digit, followed 
+    # by an optional period, followed by digits, ending the string
+
+    if ($width !~  /^-?[0-9]+(\.[0-9]*)?$/) {
+        $error .= "Invalid width; please type only a number.<br />\n";
+    }
+    if ($height !~  /^-?[0-9]+(\.[0-9]*)?$/) {
+        $error .= "Invalid height; please type only a number.<br />\n";
+    }
+    if ($lmargin !~  /^-?[0-9]+(\.[0-9]*)?$/) {
+        $error .= "Invalid left margin; please type only a number.<br />\n";
+    }
+
+    if (!$error) {
+        Apache::lonhelper::getHelper()->changeState($self->{NEXTSTATE});
+        return 1;
+    } else {
+        $self->{ERROR_MSG} = $error;
+        return 0;
+    }
+}
+
+
+
 __END__