loncom/interface/lonprintout.pm - diff

Return to lonprintout.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonprintout.pm between versions 1.93 and 1.130

-version 1.93, 2002/11/20 17:26:52
+version 1.130, 2003/04/21 17:53:10
  Line 66  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
- }
+     }
  }
- Line 81  sub menu_for_output {
+ Line 82  sub menu_for_output {
      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">
- Line 98  ENDMENUOUT1
+ Line 100  ENDMENUOUT1
  <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.adv'}) {
+ 	$r->print(<<ENDMENUOUT27);
+ <input type="radio" name="choice" value="Standard LaTeX output for the primary sequence with answers">  Problem(s) from <b>$title_for_sequence</b> with <font color="red"><b><i>answers</i></b></font><br />
+ ENDMENUOUT27
+     }
      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 />
- Line 142  ENDMENUOUT4
+ Line 149  ENDMENUOUT4
                                             </select>
     </td>
   </tr>
  </table>
  </br>
  <input type="submit" value="Submit your choice">
- Line 151  ENDMENUOUT5
+ Line 159  ENDMENUOUT5
  sub sequence_content_menu {
      my ($key_to,$r) = @_;
+     my $primary_sequence;
      my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
      my @sequence = split('___',$symbolic);
-     my $primary_sequence = '/res/'.$sequence[0];
+     $primary_sequence=&Apache::lonnet::clutter($sequence[0]);
-     my @master_seq = &coming_from_hash($primary_sequence,$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;
-     for (my $i=0;$i<=$#master_seq_view;$i++) {
+     if ($ENV{'user.adv'}) {
- 	$master_seq_view[$i]=~/\/([^\/]+)$/;
+       for (my $i=0;$i<=$#master_seq_view;$i++) {
- 	$master_seq_view[$i]=$1;
+ 	 $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'}">
- Line 171  sub sequence_content_menu {
+ Line 192  sub sequence_content_menu {
  <script>
      function checkall() {
  	for (i=0; i<document.forms.printform.elements.length; i++) {
-             if
+             if (document.forms.printform.elements[i].name.indexOf('whatfile')==0) {
-           (document.forms.printform.elements[i].name.indexOf('whatfile')==0) {
  	      document.forms.printform.elements[i].checked=true;
              }
          }
- Line 186  sub sequence_content_menu {
+ Line 206  sub sequence_content_menu {
          }
      }
  </script>
+ <b>
  <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 $inc=0;
      for (my $i=0;$i<=$#master_seq_view;$i++) {
-       if ($key_to==1 && $master_seq_view[$i]=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
+       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].'"> '.
+ 	$r->print('<br /><input type=checkbox name="whatfile'.$inc.'" value="'.$master_seq[$i].'"> '."\n".'<b>'.
-                   $master_seq_view[$i]);
+                   $titles_master_seq[$i].'</b>&nbsp;&nbsp;&nbsp;<small>'.$master_seq_view[$i].'</small>');
          $inc++;
-     } elsif ($key_to==0 && $master_seq_view[$i]=~/\.(problem|exam|quiz|assess|survey|form|library|xml|htm|html|page)$/) {
+     } 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].'"> '.
+ 	$r->print('<br /><input type=checkbox name="whatfile'.$inc.'" value="'.$master_seq[$i].'"> '."\n".'<b>'.
-                   $master_seq_view[$i]);
+                   $titles_master_seq[$i].'</b>&nbsp;&nbsp;&nbsp;<small>'.$master_seq_view[$i].'</small>');
          $inc++;
        }
      }
      $r->print(<<ENDMENUOUT2);
- <br />
+ <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
- Line 217  sub problem_choice_menu {
+ Line 241  sub problem_choice_menu {
      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\./) {
+     $r->print("Subdir: " . $subdirtoprint . "<br />");
- 	@content_directory = &Apache::lonnet::dirlist($subdirtoprint,$ENV{'user.domain'}, $ENV{'user.name'},'');
+     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]);
- Line 265  sub problem_choice_menu {
+ Line 290  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=0;
-     foreach my $file (@list_of_files) {
+     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
  }
- Line 330  ENDMENUOUT1
+ Line 358  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>
- Line 347  ENDDISHEADER
+ Line 375  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'}.' '.
- Line 358  ENDDISHEADER
+ Line 387  ENDDISHEADER
          }
      }
      $r->print(<<ENDMENUOUT2);
- <br />Number of blank pages to add: <select name="addedpages"><option selected>0</option>
+ <br /><br /><br />
-                                                               <option>1</option>
+ <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>2</option>
+                                                                             <option>1</option>
-                                                               <option>3</option>
+                                                                             <option>2</option>
-                                     </select>
+                                                                             <option>3</option>
+                                                   </select></td></tr></table>
  <br />
  <input type="hidden" name="papersize" value="$ENV{'form.papersize'}">
  <input type="hidden" name="numberofstudents" value="$i">
- Line 431  ENDPART
+ Line 461  ENDPART
  	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{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./)) {
+     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;}
- Line 440  ENDPART
+ Line 471  ENDPART
      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;
        if ($ENV{'form.url'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
          my %moreenv;
- Line 465  ENDPART
+ Line 499  ENDPART
          if ($ENV{'form.url'}=~m/\.page\s*$/) {
  	  ($result,$number_of_columns) = &page_cleanup($result);
          }
-       } else{
+       } else {
-         $result='\documentclass[letterpaper]{article}\usepackage{calc}\begin{document}You are trying to print eather sequence or something simular. Currently this option is not supported. Sorry for the inconvenience. Bye. Your current URL is '.$ENV{'form.url'}.' \end{document}'
+ 	  $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') {
+              $choice eq 'Standard LaTeX output for whole primary sequence' or
+              $choice eq 'Standard LaTeX output for the primary sequence with answers') {
        #-- minimal sequence to which the current document belongs
          #-- where is the primary sequence containing file?
          my @master_seq = ();
- Line 482  ENDPART
+ Line 523  ENDPART
  	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];
  	    if ($choice eq 'Standard LaTeX output for the primary sequence') {
                $selectionmade = 2;
  	    } elsif ($choice eq 'Standard LaTeX output for whole primary sequence') {
- Line 491  ENDPART
+ Line 532  ENDPART
  	   my %moreenv;
  	   $moreenv{'form.grade_target'}='tex';
  	   $moreenv{'form.textwidth'}=$LaTeXwidth;
+ 	   if ($choice eq 'Standard LaTeX output for the primary sequence with answers') {$moreenv{'form.texaward'}='SHOW_ANSWER';}
  	   &Apache::lonnet::appenv(%moreenv);
- 	   &Apache::lonnet::logthis("Trying to get $urlp with symb $symb");
+ 	   #&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');
+ 	   &Apache::lonnet::delenv('form.grade_target','form.textwidth','form.texaward');
  	   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;}
- Line 515  ENDPART
+ Line 557  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 $main_seq=&Apache::lonnet::clutter($ENV{'request.course.uri'});
- 	my @file_seq = &coming_from_hash_whole($main_seq);
+ 	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];
+ 	   if (not $file_seq[$i]=~/^&&/) {
- 	    $urlp=~s/\/home\/httpd\/html//;
+ 	     my ($urlp,$symb) = split /&&/, $file_seq[$i];
-             if ($urlp=~m/\.(problem|exam|quiz|assess|survey|form|library)/) {
+ 	     $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;
- Line 536  ENDPART
+ Line 583  ENDPART
  		}
  		$result .= $texversion;
  		$flag_latex_header_remove = 'YES';
- 	    }
+ 	     }
+ 	   }
  	}
  	$result .= '\end{document}';
      } elsif ($choice eq 'All class print') {
- Line 551  ENDPART
+ Line 599  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 $primary_sequence;
- 	my @master_seq = &coming_from_hash($primary_sequence,$sequence[0]);
+ 	$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;
- Line 580  ENDPART
+ Line 635  ENDPART
  		    $flag_latex_header_remove = 'YES';
  		}
  	    }
+ 	    my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
  	    if ($current_output=~/\\documentclass/) {
- 		my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+ 		$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 /;
- 		$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm}\\setlength{\\headheight}{1cm}\\setlength{\\headsep}{0.5cm}\\pagestyle{myheadings}\\markboth{}{{$courseidinfo  - $assignment}}\\begin{document}\\noindent\\textit{\\textbf{$fullname}}\\vskip 3 mm /;
  	    } else {
  		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 } \\vskip 3mm'.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\textit{\textbf{'.$fullname.'}}\hskip 1.4in } \vskip 5 mm '.$current_output;
+ 		$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 ($choice eq 'Subdirectory print') {
- Line 610  ENDPART
+ Line 669  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\./) {
+ 		if ($urlp =~ m|/home/([^/]+)/public_html|) {
- 		    $urlp =~ s/\/home\/([^\/]*)\/public_html/\/~$1/;
+ 		    $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');
- Line 675  FINALEND
+ Line 736  FINALEND
  }
- sub coming_from_hash_whole {
+ sub coming_from_hash {
      my $mainsequence = shift;
      my @resourcelist = ();
- Line 685  sub coming_from_hash_whole {
+ Line 746  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=&Apache::lonnet::declutter($mainsequence);
- 	    my $presymb = $1;
+ 	    my $rid = $current_resource;
- 	    my $rid = $hash{'ids_'.$hash{'src_'.$current_resource}};
+ 	    if ($rid=~/,/) {
-             if ($rid=~/,/) {
  		my @rid = split /,/, $rid;
  		foreach my $rid_element (@rid) {
  		    if ($rid_element =~ m/^$mapid\.(\d*)/) {
- Line 699  sub coming_from_hash_whole {
+ Line 759  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.'___'.
- 	    my $symb = $presymb.'___'.$rid.'___'.$1;
+ 		&Apache::lonnet::declutter($hash{'src_'.$current_resource});
- 	    push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$symb;
+ 	    push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$hash{'title_'.$current_resource}.'&&'.$symb;
  	}
  	$current_resource = $hash{'goesto_'.$hash{'to_'.$current_resource}};
      }
-     return @resourcelist;
+     #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 {
- sub coming_from_hash {
+ 	    my $presymb=&Apache::lonnet::declutter($mainsequence);
+ 	    my $rid = $current_resource;
-     my ($mainsequence,$symb) = @_;
+ 	    if ($rid=~/,/) {
-     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=~/,/) {
  		my @rid = split /,/, $rid;
  		foreach my $rid_element (@rid) {
  		    if ($rid_element =~ m/^$mapid\.(\d*)/) {
- Line 734  sub coming_from_hash {
+ Line 783  sub coming_from_hash {
  		    }
  		}
  	    } else {
- 		$rid =~ m/^$mapid\.(\d*)/;
+ 	        $rid =~ m/^$mapid\.(\d*)/;
                  $rid = $1;
  	    }
- 	    $hash{'src_'.$current_resource} =~ m/\/res\/(.*)$/;
+ 	    my $symb = $presymb.'___'.$rid.'___'.
- 	    $symb = $presymb.$rid.'___'.$1;
+ 		&Apache::lonnet::declutter($hash{'src_'.$current_resource});
- 	    push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$symb;
+ 	    push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$hash{'title_'.$current_resource}.'&&'.$symb;
- 	} else {
- 	    push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource});
  	}
  	$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;
  }
- Line 780  sub latex_header_footer_remove {
+ Line 805  sub latex_header_footer_remove {
  sub character_chart {
      my $result = shift;
-     $result =~ s/&#0?0?7;//g;
+     $result =~ s/&\#0?0?(7|9);//g;
-     $result =~ s/&#0?0?9;//g;
+     $result =~ s/&\#0?(10|13);//g;
-     $result =~ s/&#0?10;//g;
+     $result =~ s/&\#0?32;/ /g;
-     $result =~ s/&#0?13;//g;
+     $result =~ s/&\#0?33;/!/g;
-     $result =~ s/&#0?32;/ /g;
+     $result =~ s/&(\#0?34|quot);/\"/g;
-     $result =~ s/&#0?33;/!/g;
+     $result =~ s/&\#0?35;/\\\#/g;
-     $result =~ s/&#0?34;/"/g;
+     $result =~ s/&\#0?36;/\\\$/g;
-     $result =~ s/&quot;/"/g;   #"
+     $result =~ s/&\#0?37;/\\%/g;
-     $result =~ s/&#0?35;/\\#/g;
+     $result =~ s/&(\#0?38|amp);/\\&/g;
- #    $result =~ s/&#0?36;/\\\$/g;
+     $result =~ s/&\#(0?39|146);/\'/g;
-     $result =~ s/&#0?37;/\\%/g;
+     $result =~ s/&\#0?40;/(/g;
-     $result =~ s/&#0?38;/\\&/g;
+     $result =~ s/&\#0?41;/)/g;
-     $result =~ s/&amp;/\\&/g;
+     $result =~ s/&\#0?42;/\*/g;
-     $result =~ s/&#0?39;/'/g;
+     $result =~ s/&\#0?43;/\+/g;
-     $result =~ s/&#0?40;/(/g;
+     $result =~ s/&\#(0?44|130);/,/g;
-     $result =~ s/&#0?41;/)/g;
+     $result =~ s/&\#0?45;/-/g;
-     $result =~ s/&#0?42;/\*/g;
+     $result =~ s/&\#0?46;/\./g;
-     $result =~ s/&#0?43;/\+/g;
+     $result =~ s/&\#0?47;/\//g;
-     $result =~ s/&#0?44;/,/g;
+     $result =~ s/&\#0?48;/0/g;
-     $result =~ s/&#0?45;/-/g;
+     $result =~ s/&\#0?49;/1/g;
-     $result =~ s/&#0?46;/\./g;
+     $result =~ s/&\#0?50;/2/g;
-     $result =~ s/&#0?47;/\//g;
+     $result =~ s/&\#0?51;/3/g;
-     $result =~ s/&#0?48;/0/g;
+     $result =~ s/&\#0?52;/4/g;
-     $result =~ s/&#0?49;/1/g;
+     $result =~ s/&\#0?53;/5/g;
-     $result =~ s/&#0?50;/2/g;
+     $result =~ s/&\#0?54;/6/g;
-     $result =~ s/&#0?51;/3/g;
+     $result =~ s/&\#0?55;/7/g;
-     $result =~ s/&#0?52;/4/g;
+     $result =~ s/&\#0?56;/8/g;
-     $result =~ s/&#0?53;/5/g;
+     $result =~ s/&\#0?57;/9/g;
-     $result =~ s/&#0?54;/6/g;
+     $result =~ s/&\#0?58;/:/g;
-     $result =~ s/&#0?55;/7/g;
+     $result =~ s/&\#0?59;/;/g;
-     $result =~ s/&#0?56;/8/g;
+     $result =~ s/&(\#0?60|lt|\#139);/\$<\$/g;
-     $result =~ s/&#0?57;/9/g;
+     $result =~ s/&\#0?61;/\$=\$/g;
-     $result =~ s/&#0?58;/:/g;
+     $result =~ s/&(\#0?62|gt|\#155);/\$>\$/g;
-     $result =~ s/&#0?59;/;/g;
+     $result =~ s/&\#0?63;/\?/g;
-     $result =~ s/&#0?60;/\$<\$/g;
+     $result =~ s/&\#0?65;/A/g;
-     $result =~ s/&lt;/\$<\$/g;
+     $result =~ s/&\#0?66;/B/g;
-     $result =~ s/&#0?61;/\$=\$/g;
+     $result =~ s/&\#0?67;/C/g;
-     $result =~ s/&#0?62;/\$>\$/g;
+     $result =~ s/&\#0?68;/D/g;
-     $result =~ s/&gt;/\$>\$/g;
+     $result =~ s/&\#0?69;/E/g;
-     $result =~ s/&#0?63;/?/g;
+     $result =~ s/&\#0?70;/F/g;
- #    $result =~ s/&#0?64;//g;
+     $result =~ s/&\#0?71;/G/g;
-     $result =~ s/&#0?65;/A/g;
+     $result =~ s/&\#0?72;/H/g;
-     $result =~ s/&#0?66;/B/g;
+     $result =~ s/&\#0?73;/I/g;
-     $result =~ s/&#0?67;/C/g;
+     $result =~ s/&\#0?74;/J/g;
-     $result =~ s/&#0?68;/D/g;
+     $result =~ s/&\#0?75;/K/g;
-     $result =~ s/&#0?69;/E/g;
+     $result =~ s/&\#0?76;/L/g;
-     $result =~ s/&#0?70;/F/g;
+     $result =~ s/&\#0?77;/M/g;
-     $result =~ s/&#0?71;/G/g;
+     $result =~ s/&\#0?78;/N/g;
-     $result =~ s/&#0?72;/H/g;
+     $result =~ s/&\#0?79;/O/g;
-     $result =~ s/&#0?73;/I/g;
+     $result =~ s/&\#0?80;/P/g;
-     $result =~ s/&#0?74;/J/g;
+     $result =~ s/&\#0?81;/Q/g;
-     $result =~ s/&#0?75;/K/g;
+     $result =~ s/&\#0?82;/R/g;
-     $result =~ s/&#0?76;/L/g;
+     $result =~ s/&\#0?83;/S/g;
-     $result =~ s/&#0?77;/M/g;
+     $result =~ s/&\#0?84;/T/g;
-     $result =~ s/&#0?78;/N/g;
+     $result =~ s/&\#0?85;/U/g;
-     $result =~ s/&#0?79;/O/g;
+     $result =~ s/&\#0?86;/V/g;
-     $result =~ s/&#0?80;/P/g;
+     $result =~ s/&\#0?87;/W/g;
-     $result =~ s/&#0?81;/Q/g;
+     $result =~ s/&\#0?88;/X/g;
-     $result =~ s/&#0?82;/R/g;
+     $result =~ s/&\#0?89;/Y/g;
-     $result =~ s/&#0?83;/S/g;
+     $result =~ s/&\#0?90;/Z/g;
-     $result =~ s/&#0?84;/T/g;
+     $result =~ s/&\#0?91;/[/g;
-     $result =~ s/&#0?85;/U/g;
+     $result =~ s/&\#0?92;/\$\\setminus\$/g;
-     $result =~ s/&#0?86;/V/g;
+     $result =~ s/&\#0?93;/]/g;
-     $result =~ s/&#0?87;/W/g;
+     $result =~ s/&\#(0?94|136);/\$\\wedge\$/g;
-     $result =~ s/&#0?88;/X/g;
+     $result =~ s/&\#(0?95|138|154);/\\underline{\\makebox[2mm]{\\strut}}/g;
-     $result =~ s/&#0?89;/Y/g;
+     $result =~ s/&\#(0?96|145);/\`/g;
-     $result =~ s/&#0?90;/Z/g;
+     $result =~ s/&\#0?97;/a/g;
-     $result =~ s/&#0?91;/[/g;
+     $result =~ s/&\#0?98;/b/g;
-     $result =~ s/&#0?92;/\\/g;
+     $result =~ s/&\#0?99;/c/g;
-     $result =~ s/&#0?93;/]/g;
+     $result =~ s/&\#100;/d/g;
- #    $result =~ s/&#0?94;//g;
+     $result =~ s/&\#101;/e/g;
- #    $result =~ s/&#0?95;//g;
+     $result =~ s/&\#102;/f/g;
-     $result =~ s/&#0?96;/`/g;
+     $result =~ s/&\#103;/g/g;
-     $result =~ s/&#0?97;/a/g;
+     $result =~ s/&\#104;/h/g;
-     $result =~ s/&#0?98;/b/g;
+     $result =~ s/&\#105;/i/g;
-     $result =~ s/&#0?99;/c/g;
+     $result =~ s/&\#106;/j/g;
-     $result =~ s/&#100;/d/g;
+     $result =~ s/&\#107;/k/g;
-     $result =~ s/&#101;/e/g;
+     $result =~ s/&\#108;/l/g;
-     $result =~ s/&#102;/f/g;
+     $result =~ s/&\#109;/m/g;
-     $result =~ s/&#103;/g/g;
+     $result =~ s/&\#110;/n/g;
-     $result =~ s/&#104;/h/g;
+     $result =~ s/&\#111;/o/g;
-     $result =~ s/&#105;/i/g;
+     $result =~ s/&\#112;/p/g;
-     $result =~ s/&#106;/j/g;
+     $result =~ s/&\#113;/q/g;
-     $result =~ s/&#107;/k/g;
+     $result =~ s/&\#114;/r/g;
-     $result =~ s/&#108;/l/g;
+     $result =~ s/&\#115;/s/g;
-     $result =~ s/&#109;/m/g;
+     $result =~ s/&\#116;/t/g;
-     $result =~ s/&#110;/n/g;
+     $result =~ s/&\#117;/u/g;
-     $result =~ s/&#111;/o/g;
+     $result =~ s/&\#118;/v/g;
-     $result =~ s/&#112;/p/g;
+     $result =~ s/&\#119;/w/g;
-     $result =~ s/&#113;/q/g;
+     $result =~ s/&\#120;/x/g;
-     $result =~ s/&#114;/r/g;
+     $result =~ s/&\#121;/y/g;
-     $result =~ s/&#115;/s/g;
+     $result =~ s/&\#122;/z/g;
-     $result =~ s/&#116;/t/g;
+     $result =~ s/&\#123;/\\{/g;
-     $result =~ s/&#117;/u/g;
+     $result =~ s/&\#124;/\|/g;
-     $result =~ s/&#118;/v/g;
+     $result =~ s/&\#125;/\\}/g;
-     $result =~ s/&#119;/w/g;
+     $result =~ s/&\#126;/\~/g;
-     $result =~ s/&#120;/x/g;
+     $result =~ s/&\#131;/\\textflorin /g;
-     $result =~ s/&#121;/y/g;
+     $result =~ s/&\#132;/\"/g;
-     $result =~ s/&#122;/z/g;
+     $result =~ s/&\#133;/\$\\ldots\$/g;
-     $result =~ s/&#123;/\\{/g;
+     $result =~ s/&\#134;/\$\\dagger\$/g;
-     $result =~ s/&#124;/\|/g;
+     $result =~ s/&\#135;/\$\\ddagger\$/g;
-     $result =~ s/&#125;/\\}/g;
+     $result =~ s/&\#137;/\\textperthousand /g;
-     $result =~ s/&#126;/\~/g;
+     $result =~ s/&\#140;/{\\OE}/g;
-     $result =~ s/&#130;/,/g;
+     $result =~ s/&\#147;/\`\`/g;
- #    $result =~ s/&#131;//g;
+     $result =~ s/&\#148;/\'\'/g;
-     $result =~ s/&#132;/''/g;
+     $result =~ s/&\#149;/\$\\bullet\$/g;
-     $result =~ s/&#133;/\$\\ldots\$/g;
+     $result =~ s/&\#150;/--/g;
-     $result =~ s/&#134;/\$\\dagger\$/g;
+     $result =~ s/&\#151;/---/g;
-     $result =~ s/&#135;/\$\\ddagger\$/g;
+     $result =~ s/&\#152;/\$\\sim\$/g;
- #    $result =~ s/&#136;//g;
+     $result =~ s/&\#153;/\\texttrademark /g;
- #    $result =~ s/&#137;//g;
+     $result =~ s/&\#156;/\\oe/g;
- #    $result =~ s/&#138;//g;
+     $result =~ s/&\#159;/\\\"Y/g;
-     $result =~ s/&#139;/\$<\$/g;
+     $result =~ s/&(\#160|nbsp);?//g;
- #    $result =~ s/&#140;//g;
+     $result =~ s/&(\#161|iexcl);/!\`/g;
-     $result =~ s/&#145;/`/g;
+     $result =~ s/&(\#162|cent);/\\textcent /g;
-     $result =~ s/&#146;/'/g;
+     $result =~ s/&(\#163|pound);/\\pounds /g;
-     $result =~ s/&#147;/``/g;
+     $result =~ s/&(\#164|curren);/\\textcurrency /g;
-     $result =~ s/&#148;/''/g;
+     $result =~ s/&(\#165|yen);/\\textyen /g;
-     $result =~ s/&#149;/\$\\bullet\$/g;
+     $result =~ s/&(\#166|brvbar);/\\textbrokenbar /g;
- #    $result =~ s/&#150;//g;
+     $result =~ s/&(\#167|sect);/\\textsection /g;
- #    $result =~ s/&#151;//g;
+     $result =~ s/&(\#168|uml);/\\texthighdieresis /g;
-     $result =~ s/&#152;/~/g;
+     $result =~ s/&(\#169|copy);/\\copyright /g;
- #    $result =~ s/&#153;//g;
+     $result =~ s/&(\#170|ordf);/\\textordfeminine /g;
- #    $result =~ s/&#154;//g;
+     $result =~ s/&(\#172|not);/\$\\neg\$/g;
-     $result =~ s/&#155;/\$>\$/g;
+     $result =~ s/&(\#173|shy);/ - /g;
-     $result =~ s/&#156;/\\{\\oe\\}/g;
+     $result =~ s/&(\#174|reg);/\\textregistered /g;
-     $result =~ s/&#159;/\\"\\{Y\\}/g;
+     $result =~ s/&(\#175|macr);/\$^{-}\$/g;
-     $result =~ s/&#160;//g;
+     $result =~ s/&(\#176|deg);/\$^{\\circ}\$/g;
-     $result =~ s/&nbsp;//g;
+     $result =~ s/&(\#177|plusmn);/\$\\pm\$/g;
-     $result =~ s/&#161;/!`/g;
+     $result =~ s/&(\#178|sup2);/\$^2\$/g;
-     $result =~ s/&iexcl;/!`/g; #`
+     $result =~ s/&(\#179|sup3);/\$^3\$/g;
- #    $result =~ s/&#162;//g;
+     $result =~ s/&(\#180|acute);/\\textacute /g;
- #    $result =~ s/&cent;//g;
+     $result =~ s/&(\#181|micro);/\$\\mu\$/g;
-     $result =~ s/&#163;/\\pounds/g;
+     $result =~ s/&(\#182|para);/\\P/g;
-     $result =~ s/&pound;/\\pounds/g;
+     $result =~ s/&(\#183|middot);/\$\\cdot\$/g;
- #    $result =~ s/&#164;//g;
+     $result =~ s/&(\#184|cedil);/\\c{\\strut}/g;
- #    $result =~ s/&curren;//g;
+     $result =~ s/&(\#185|sup1);/\$^1\$/g;
- #    $result =~ s/&#165;//g;
+     $result =~ s/&(\#186|ordm);/\\textordmasculine /g;
- #    $result =~ s/&yen;//g;
+     $result =~ s/&(\#188|frac14);/\\textonequarter /g;
- #    $result =~ s/&#166;//g;
+     $result =~ s/&(\#189|frac12);/\\textonehalf /g;
- #    $result =~ s/&brvbar;//g;
+     $result =~ s/&(\#190|frac34);/\\textthreequarters /g;
- #    $result =~ s/&#167;//g;
+     $result =~ s/&(\#191|iquest);/?\`/g;
- #    $result =~ s/&sect;//g;
+     $result =~ s/&(\#192|Agrave);/\\\`{A}/g;
- #    $result =~ s/&#168;//g;
+     $result =~ s/&(\#193|Aacute);/\\\'{A}/g;
- #    $result =~ s/&uml;//g;
+     $result =~ s/&(\#194|Acirc);/\\^{A}/g;
-     $result =~ s/&#169;/\\copyright/g;
+     $result =~ s/&(\#195|Atilde);/\\~{A}/g;
-     $result =~ s/&copy;/\\copyright/g;
+     $result =~ s/&(\#196|Auml);/\\\"{A}/g;
- #    $result =~ s/&#170;//g;
+     $result =~ s/&(\#197|Aring);/{\\AA}/g;
- #    $result =~ s/&ordf;//g;
+     $result =~ s/&(\#198|AElig);/{\\AE}/g;
- #    $result =~ s/&#171;//g;
+     $result =~ s/&(\#199|Ccedil);/\\c{c}/g;
- #    $result =~ s/&laquo;//g;
+     $result =~ s/&(\#200|Egrave);/\\\`{E}/g;
-     $result =~ s/&#172;/\$\\neg\$/g;
+     $result =~ s/&(\#201|Eacute);/\\\'{E}/g;
-     $result =~ s/&not;/\$\\neg\$/g;
+     $result =~ s/&(\#202|Ecirc);/\\^{E}/g;
- #    $result =~ s/&#173;//g;
+     $result =~ s/&(\#203|Euml);/\\\"{E}/g;
- #    $result =~ s/&shy;//g;
+     $result =~ s/&(\#204|Igrave);/\\\`{I}/g;
- #    $result =~ s/&#174;//g;
+     $result =~ s/&(\#205|Iacute);/\\\'{I}/g;
- #    $result =~ s/&reg;//g;
+     $result =~ s/&(\#206|Icirc);/\\^{I}/g;
- #    $result =~ s/&#175;//g;
+     $result =~ s/&(\#207|Iuml);/\\\"{I}/g;
- #    $result =~ s/&macr;//g;
+     $result =~ s/&(\#209|Ntilde);/\\~{N}/g;
-     $result =~ s/&#176;/\$^{\\circ}\$/g;
+     $result =~ s/&(\#210|Ograve);/\\\`{O}/g;
-     $result =~ s/&deg;/\$^{\\circ}\$/g;
+     $result =~ s/&(\#211|Oacute);/\\\'{O}/g;
-     $result =~ s/&#177;/\$\\pm\$/g;
+     $result =~ s/&(\#212|Ocirc);/\\^{O}/g;
-     $result =~ s/&plusmn;/\$\\pm\$/g;
+     $result =~ s/&(\#213|Otilde);/\\~{O}/g;
-     $result =~ s/&#178;/\$^2\$/g;
+     $result =~ s/&(\#214|Ouml);/\\\"{O}/g;
-     $result =~ s/&sup2;/\$^2\$/g;
+     $result =~ s/&(\#215|times);/\$\\times\$/g;
-     $result =~ s/&#179;/\$^3\$/g;
+     $result =~ s/&(\#216|Oslash);/{\\O}/g;
-     $result =~ s/&sup3;/\$^3\$/g;
+     $result =~ s/&(\#217|Ugrave);/\\\`{U}/g;
- #    $result =~ s/&#180;//g;
+     $result =~ s/&(\#218|Uacute);/\\\'{U}/g;
- #    $result =~ s/&acute;//g;
+     $result =~ s/&(\#219|Ucirc);/\\^{U}/g;
-     $result =~ s/&#181;/\$\\mu\$/g;
+     $result =~ s/&(\#220|Uuml);/\\\"{U}/g;
-     $result =~ s/&micro;/\$\\mu\$/g;
+     $result =~ s/&(\#221|Yacute);/\\\'{Y}/g;
-     $result =~ s/&#182;/\\P/g;
+     $result =~ s/&(\#223|szlig);/\\ss/g;
-     $result =~ s/&para;/\\P/g;
+     $result =~ s/&(\#224|agrave);/\\\`{a}/g;
-     $result =~ s/&#183;/\$\\cdot\$/g;
+     $result =~ s/&(\#225|aacute);/\\\'{a}/g;
-     $result =~ s/&middot;/\$\\cdot\$/g;
+     $result =~ s/&(\#226|acirc);/\\^{a}/g;
- #    $result =~ s/&#184;//g;
+     $result =~ s/&(\#227|atilde);/\\~{a}/g;
- #    $result =~ s/&cedil;//g;
+     $result =~ s/&(\#228|auml);/\\\"{a}/g;
-     $result =~ s/&#185;/\$^1\$/g;
+     $result =~ s/&(\#229|aring);/{\\aa}/g;
-     $result =~ s/&sup1;/\$^1\$/g;
+     $result =~ s/&(\#230|aelig);/{\\ae}/g;
- #    $result =~ s/&#186;//g;
+     $result =~ s/&(\#231|ccedil);/\\c{c}/g;
- #    $result =~ s/&ordm;//g;
+     $result =~ s/&(\#232|egrave);/\\\`{e}/g;
- #    $result =~ s/&#187;//g;
+     $result =~ s/&(\#233|eacute);/\\\'{e}/g;
- #    $result =~ s/&raquo;//g;
+     $result =~ s/&(\#234|ecirc);/\\^{e}/g;
- #    $result =~ s/&#188;//g;
+     $result =~ s/&(\#235|euml);/\\\"{e}/g;
- #    $result =~ s/&frac14;//g;
+     $result =~ s/&(\#236|igrave);/\\\`{i}/g;
- #    $result =~ s/&#189;//g;
+     $result =~ s/&(\#237|iacute);/\\\'{i}/g;
- #    $result =~ s/&frac12;//g;
+     $result =~ s/&(\#238|icirc);/\\^{i}/g;
- #    $result =~ s/&#190;//g;
+     $result =~ s/&(\#239|iuml);/\\\"{i}/g;
- #    $result =~ s/&frac34;//g;
+     $result =~ s/&(\#240|eth);/\$\\partial\$/g;
-     $result =~ s/&#191;/?`/g;
+     $result =~ s/&(\#241|ntilde);/\\~{n}/g;
-     $result =~ s/&iquest;/?`/g;      #`
+     $result =~ s/&(\#242|ograve);/\\\`{o}/g;
-     $result =~ s/&#192;/\\`{A}/g;
+     $result =~ s/&(\#243|oacute);/\\\'{o}/g;
-     $result =~ s/&Agrave;/\\`{A}/g;  #`
+     $result =~ s/&(\#244|ocirc);/\\^{o}/g;
-     $result =~ s/&#193;/\\'{A}/g;
+     $result =~ s/&(\#245|otilde);/\\~{o}/g;
-     $result =~ s/&Aacute;/\\'{A}/g;  #'
+     $result =~ s/&(\#246|ouml);/\\\"{o}/g;
-     $result =~ s/&#194;/\\^{A}/g;
+     $result =~ s/&(\#247|divide);/\$\\div\$/g;
-     $result =~ s/&Acirc;/\\^{A}/g;
+     $result =~ s/&(\#248|oslash);/{\\o}/g;
-     $result =~ s/&#195;/\\~{A}/g;
+     $result =~ s/&(\#249|ugrave);/\\\`{u}/g;
-     $result =~ s/&Atilde;/\\~{A}/g;
+     $result =~ s/&(\#250|uacute);/\\\'{u}/g;
-     $result =~ s/&#196;/\\"{A}/g;
+     $result =~ s/&(\#251|ucirc);/\\^{u}/g;
-     $result =~ s/&Auml;/\\"{A}/g;    #"
+     $result =~ s/&(\#252|uuml);/\\\"{u}/g;
-     $result =~ s/&#197;/{\\AA}/g;
+     $result =~ s/&(\#253|yacute);/\\\'{y}/g;
-     $result =~ s/&Aring;/{\\AA}/g;
+     $result =~ s/&(\#255|yuml);/\\\"{y}/g;
-     $result =~ s/&#198;/{\\AE}/g;
+     $result =~ s/&\#952;/\$\\theta\$/g;
-     $result =~ s/&AElig;/{\\AE}/g;
+ #Greek Alphabet
- #    $result =~ s/&#199;//g;
+     $result =~ s/&(alpha|\#945);/\$\\alpha \$/g;
- #    $result =~ s/&Ccedil;//g;
+     $result =~ s/&(beta|\#946);/\$\\beta \$/g;
-     $result =~ s/&#200;/\\`{E}/g;
+     $result =~ s/&(gamma|\#947);/\$\\gamma \$/g;
-     $result =~ s/&Egrave;/\\`{E}/g;  #`
+     $result =~ s/&(delta|\#948);/\$\\delta \$/g;
-     $result =~ s/&#201;/\\'{E}/g;    #'
+     $result =~ s/&(epsilon|\#949);/\$\\epsilon \$/g;
-     $result =~ s/&Eacute;/\\'{E}/g;  #'
+     $result =~ s/&(zeta|\#950);/\$\\zeta \$/g;
-     $result =~ s/&#202;/\\^{E}/g;
+     $result =~ s/&(eta|\#951);/\$\\eta \$/g;
-     $result =~ s/&Ecirc;/\\^{E}/g;
+     $result =~ s/&(theta|\#952);/\$\\theta \$/g;
-     $result =~ s/&#203;/\\`{E}/g;
+     $result =~ s/&(iota|\#953);/\$\\iota \$/g;
-     $result =~ s/&Euml;/\\`{E}/g;    #`
+     $result =~ s/&(kappa|\#954);/\$\\kappa \$/g;
-     $result =~ s/&#204;/\\`{I}/g;
+     $result =~ s/&(lambda|\#955);/\$\\lambda \$/g;
-     $result =~ s/&Igrave;/\\`{I}/g;  #`
+     $result =~ s/&(mu|\#956);/\$\\mu \$/g;
-     $result =~ s/&#205;/\\'{I}/g;
+     $result =~ s/&(nu|\#957);/\$\\nu \$/g;
-     $result =~ s/&Iacute;/\\'{I}/g;  #'
+     $result =~ s/&(xi|\#958);/\$\\xi \$/g;
-     $result =~ s/&#206;/\\^{I}/g;
+     $result =~ s/&(pi|\#960);/\$\\pi \$/g;
-     $result =~ s/&Icirc;/\\^{I}/g;
+     $result =~ s/&(rho|\#961);/\$\\rho \$/g;
-     $result =~ s/&#207;/\\"{I}/g;
+     $result =~ s/&(sigma|\#963);/\$\\sigma \$/g;
-     $result =~ s/&Iuml;/\\"{I}/g;    #"
+     $result =~ s/&(tau|\#964);/\$\\tau \$/g;
- #    $result =~ s/&#208;//g;
+     $result =~ s/&(upsilon|\#965);/\$\\upsilon \$/g;
- #    $result =~ s/&ETH;//g;
+     $result =~ s/&(phi|\#966);/\$\\phi \$/g;
-     $result =~ s/&#209;/\\~{N}/g;
+     $result =~ s/&(chi|\#967);/\$\\chi \$/g;
-     $result =~ s/&Ntilde;/\\~{N}/g;
+     $result =~ s/&(psi|\#968);/\$\\psi \$/g;
-     $result =~ s/&#210;/\\`{O}/g;
+     $result =~ s/&(omega|\#969);/\$\\omega \$/g;
-     $result =~ s/&Ograve;/\\`{O}/g;  #`
+     $result =~ s/&(Gamma|\#915);/\$\\Gamma \$/g;
-     $result =~ s/&#211;/\\'{O}/g;
+     $result =~ s/&(Delta|\#916);/\$\\Delta \$/g;
-     $result =~ s/&Oacute;/\\'{O}/g;  #'
+     $result =~ s/&(Theta|\#920);/\$\\Theta \$/g;
-     $result =~ s/&#212;/\\^{O}/g;
+     $result =~ s/&(Lambda|\#923);/\$\\Lambda \$/g;
-     $result =~ s/&Ocirc;/\\^{O}/g;
+     $result =~ s/&(Xi|\#926);/\$\\Xi \$/g;
-     $result =~ s/&#213;/\\~{O}/g;
+     $result =~ s/&(Pi|\#928);/\$\\Pi \$/g;
-     $result =~ s/&Otilde;/\\~{O}/g;
+     $result =~ s/&(Sigma|\#931);/\$\\Sigma \$/g;
-     $result =~ s/&#214;/\\"{O}/g;
+     $result =~ s/&(Upsilon|\#933);/\$\\Upsilon \$/g;
-     $result =~ s/&Ouml;/\\"{O}/g;    #"
+     $result =~ s/&(Phi|\#934);/\$\\Phi \$/g;
-     $result =~ s/&#215;/\$\\times\$/g;
+     $result =~ s/&(Psi|\#936);/\$\\Psi \$/g;
-     $result =~ s/&times;/\$\\times\$/g;
+     $result =~ s/&(Omega|\#937);/\$\\Omega \$/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
      return $result;
  }
- Line 1171  sub character_chart {
+ Line 1116  sub character_chart {
      }
+ 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,$assignment) = @_;
+     my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment) = @_;
- 	my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$layout,$numberofcolumns);
+     my ($textwidth,$textheight,$oddoffset,$evenoffset);
- 	my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+ 	$assignment=~s/_/ /g;
- 	if ($layout eq 'CBI') {
+         if ($numberofcolumns != 1) {
- 	    $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 /;
+           ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$layout,$numberofcolumns);
- 	} elsif ($layout eq 'CAPA') {
+ 	} else {
-  	    if ($choice ne 'All class print') {
+ 	  ($textwidth,$textheight,$oddoffset,$evenoffset) = ($ENV{'form.width'},$ENV{'form.height'},$ENV{'form.leftmargin'},$ENV{'form.leftmargin'});
- 		$text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\setlength{\\topmargin}{1cm}\\setlength{\\headheight}{1cm}\\setlength{\\headsep}{0.5cm}\\markboth{}{\\textbf{$ENV{'environment.firstname'} $ENV{'environment.lastname'}} $courseidinfo  - $assignment}\\pagestyle{myheadings}\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1}/;
- 	    } else {
- 		$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 /;
- 	    }
  	}
- 	return $text;
+     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;
  }
- Line 1207  sub details_for_menu {
+ Line 1174  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|([^/]+)$|;
+ 	$map =~ m|([^/]+)$|;
-       $name_of_sequence = $1;
+ 	$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|([^/]+)$|;
+ 	$ENV{'request.course.uri'} =~ m|([^/]+)$|;
-       $name_of_map = $1;
+ 	$name_of_map = $1;
      }
      return ($name_of_resourse,$name_of_sequence,$name_of_map);
  }
- Line 1239  sub latex_corrections {
+ Line 1208  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;
- Line 1260  sub handler {
+ Line 1229  sub handler {
      my $r = shift;
-     my $loaderror=&Apache::lonnet::overloaderror($r);
+     # A hook for me to work without disturbing Alex.
-     if ($loaderror) { return $loaderror; }
+     if ($ENV{'form.jeremy'}) {
-     $loaderror=
+ 	printWizard($r);
-        &Apache::lonnet::overloaderror($r,
+ 	return OK;
-          $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
+     }
-     if ($loaderror) { return $loaderror; }
+ #    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;
- Line 1288  sub handler {
+ Line 1263  sub handler {
  	     &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 'Standard LaTeX output for the primary sequence with answers') {
+ 	     &sequence_content_menu(1,$r);
  	 } elsif($ENV{'form.choice'} eq 'All class print') {
  	     &additional_class_menu($r);
  	 } elsif($ENV{'form.choice'} eq 'Subdirectory print') {
- Line 1313  sub handler {
+ Line 1290  sub handler {
  }
+ sub new_output_data {
+     my $r = shift;
+     $r->print(<<ENDPART);
+ <html>
+ <head>
+ <title>LON-CAPA output for printing</title>
+ </head>
+ <body bgcolor="FFFFFF">
+ <hr>
+ ENDPART
+     my $choice = $ENV{'form.PRINT_TYPE'};
+     my $layout = $ENV{'form.FORMAT.layout'};
+     my $numberofcolumns = $ENV{'form.FORMAT.cols'};
+     my $papersize = $ENV{'form.FORMAT.paper'};
+     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 'current_document') && ($ENV{'form.url'}=~m|^/~|)) {
+ 	if ($ENV{'form.FORMAT.layout'} eq '') {$layout = 'CAPA';}
+ 	if ($ENV{'form.FORMAT.paper'} eq '') {$papersize = 'Letter [8 1/2x11 in]';}
+ 	if ($ENV{'form.FORMAT.cols'} 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);
+     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 'current_document') {
+       #-- single document - problem, page, html, xml, ...
+       $selectionmade = 1;
+       if ($ENV{'form.url'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+         my %moreenv;
+         $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*$/) {
+ 	  ($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 @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];
+ 	    if ($choice eq 'Standard LaTeX output for the primary sequence') {
+               $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}/;}
+ 	$result .= '\end{document}';
+     }  elsif ($choice eq 'Standard LaTeX output for the top level sequence') {
+         # where is the main sequence of the course?
+ 	$selectionmade = 4;
+ 	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++) {
+ 	   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;
+ 		&Apache::lonnet::appenv(%moreenv);
+ 		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';
+ 	     }
+ 	   }
+ 	}
+ 	$result .= '\end{document}';
+     } elsif ($choice eq 'All class print') {
+     #-- prints assignments for whole class or for selected students
+ 	$selectionmade = 5;
+         my @students = ();
+ 	for (my $i=0; $i<$ENV{'form.numberofstudents'};$i++) {
+ 	    if ($ENV{'form.whomtoprint'.$i}=~/:/) {
+ 		push @students,$ENV{'form.whomtoprint'.$i};
+ 	    }
+ 	}
+ 	#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;
+ 	$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 = &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;
+                 if ($curres=~ m/\.(problem|exam|quiz|assess|survey|form|library)/) {
+ 		    my ($map,$id,$res_url) = split(/___/,$symb);
+ 		    if (&Apache::lonnet::allowed('bre',$res_url)) {
+ 			my $rendered = &Apache::loncommon::get_student_view($symb,$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<$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::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') {
+     #prints selected problems from the subdirectory
+ 	$selectionmade = 6;
+         my @list_of_files = ();
+ 	for (my $i=0; $i<$ENV{'form.numberofproblems'};$i++) {
+ 	    if ($ENV{'form.whattoprint'.$i}=~/^\//) {
+ 		push @list_of_files,$ENV{'form.whattoprint'.$i};
+ 	    }
+ 	}
+ 	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($papersize,$layout,$numberofcolumns,$choice,$result,$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;
+ $r->print(<<FINALEND);
+ <meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle&$numberofcolumns&$selectionmade">
+ </body>
+ </html>
+ FINALEND
+ }
+ ########################################################################################
+ use Apache::lonwizard;
+ sub printWizard {
+     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;
+     }
+     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();
+     my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu;
+     #if the resource doesn't have a title, use the filename
+     if (!$resourceTitle) {
+       my $url = $ENV{'form.postdata'};
+       $resourceTitle = substr($url, rindex($url, '/') + 1);
+     }
+     my $wizard = Apache::lonwizard->new("Printing Wizard", $ENV{QUERY_STRING});
+     $wizard->declareVars(['PRINT_TYPE', 'FORMAT', 'url', 'symb', 'postdata' , 'RESOURCES', 'FILES', 'STUDENTS']);
+     $wizard->{VARS}->{'postdata'} = $ENV{'form.postdata'};
+     $wizard->{VARS}->{'url'} = $ENV{'form.postdata'};
+     $wizard->{VARS}->{'symb'} = &Apache::lonnet::symbread($ENV{'form.postdata'});
+     my $subdir = &Apache::lonnet::filelocation("", $ENV{'form.postdata'});
+     $subdir =~ s|/[^/]+$||;
+     my $symb = $wizard->{VARS}->{'symb'};  # Extract map
+     my ($map, $id, $url) = split(/__/, $symb);
+     # This really ought to be in some repository in loncommon or something where it can just be grabbed.
+     my $problemFilter = sub {
+         my $name = shift;
+         return $name =~ m/^[^\.]+\.(problem|exam|quiz|assess|survey|form|library)$/;
+     };
+     # 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
+     # querystring won't allow anyone to reach states they shouldn't have permission to reach.
+     my $printChoices = [];
+     # We can always print the current screen.
+     push @{$printChoices}, ['current_document', "Current resource \"<b>$resourceTitle</b>\" (prints what you just saw on the screen)", 'CHOOSE_FORMAT'];
+     if ($ENV{'form.postdata'}=~ /\/res\//) {
+         # Allow problems from sequence
+         push @{$printChoices}, ['map_problems', "Problems from <b>$sequenceTitle</b>", 'CHOOSE_PROBLEMS'];
+         Apache::lonwizard::resource_multichoice->new($wizard, "CHOOSE_PROBLEMS", 'Select Problems', "Select problems to print from <b>$sequenceTitle</b>:", 'CHOOSE_FORMAT', 'RESOURCES', sub {my $res = shift; return $res->is_problem()}, undef, $map);
+         # Allow all resources from sequence
+         push @{$printChoices}, ['map_problems_pages', "Problem(s) and page(s) or html/xml file(s) from \"<b>$sequenceTitle</b>\"", 'CHOOSE_PROBLEMS_HTML'];
+         Apache::lonwizard::resource_multichoice->new($wizard, "CHOOSE_PROBLEMS_HTML", 'Select Resources', "Select resources to print from <b>$sequenceTitle</b>:", "CHOOSE_FORMAT", 'RESOURCES', sub {my $res = shift; return !$res->is_map()}, undef, $map);
+     }
+     # 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 ($ENV{'form.postdata'}=~/\/res\//)) {
+         push @{$printChoices}, ['all_problems', 'All problems in this course (<b>warning:</b> this may be time consuming)', 'CHOOSE_FORMAT'];
+         push @{$printChoices}, ['problems_for_students', "Problems from <b>$sequenceTitle</b> for selected students", 'CHOOSE_STUDENTS'];
+         Apache::lonwizard::choose_student->new($wizard, "CHOOSE_STUDENTS", "Choose Students", "Select the students you wish to print the problems for:", 'CHOOSE_FORMAT', 'STUDENTS', 1);
+     }
+     # FIXME: That RE should come from a library somewhere.
+     if ((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($ENV{'form.postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) {
+         push @{$printChoices}, ['problems_from_directory', "Problems from current subdirectory <br /><b><small>$subdir</small></b>", 'CHOOSE_FROM_SUBDIR'];
+         Apache::lonwizard::choose_files->new($wizard, "CHOOSE_FROM_SUBDIR", "Select Files","Select problems you wish to print from <b>$subdir</b>:", 'CHOOSE_FORMAT', 'FILES', $subdir, $problemFilter);
+     }
+     # Despite the appearance of states before here, this is the first state.
+     Apache::lonwizard::switch_state->new($wizard, "START", "What do you want to print? Make a choice.", "PRINT_TYPE", $printChoices, "", "");
+     Apache::lonprintout::page_format_state->new($wizard, "CHOOSE_FORMAT", "You can change page layout parameters here.", "FORMAT");
+     if ($ENV{'form.printWizDone'} ne 1) {
+       $r->print($wizard->display());
+     } else {
+       &new_output_data($r);
+     }
+     untie %hash;
+     return OK;
+ }
 ;
+ package Apache::lonprintout::page_format_state;
+ =pod
+ =head1 Wizard state: page_format_state
+ See lonwizard.pm documentation for discussion of the wizard framework.
+ Apache::lonprintout::page_format_state is a state 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.
+ =over 4
+ =item * B<new>(parentLonWizReference, stateName, stateTitle, varName, nextState): varName is where the print information will be stored in the format FIXME. nextState is the state that follows this one.
+ =back
+ =cut
+ use Apache::lonwizard;
+ no strict;
+ @ISA = ("Apache::lonwizard::state");
+ 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 $proto = shift;
+     my $class = ref($proto) || $proto;
+     my $self = bless $proto->SUPER::new(shift, shift, shift);
+     $self->{VAR_NAME} = shift;
+     $self->{NEXT_STATE} = shift;
+     return $self;
+ }
+ sub render {
+     my $self = shift;
+     my $wizard = $self->{WIZARD};
+     my $result = '';
+     my $var = $self->{VAR_NAME};
+     my $curVal = $self->{WIZARD}->{VARS}->{$var};
+     my ($layout, $cols, $paper) = split(/\|/, $curVal);
+     my $landscapeChecked = ($layout ne "L")? '' : 'checked ';
+     my $portraitChecked = $landscapeChecked ? '' : 'checked ';
+     $result .= <<STATEHTML;
+ <p>How should the printing be formatted?</p>
+ <table cellpadding="3">
+   <tr>
+     <td align="center"><b>Orientation</b></td>
+     <td align="center"><b>Number of Columns</b></td>
+     <td align="center"><b>Paper size (<small>[width x height]</small>)</b></td>
+   </tr>
+   <tr>
+     <td>
+       <input type="radio" name="${var}.layout" value="CBI" $landscapeChecked> Landscape<br />
+       <input type="radio" name="${var}.layout" value="CAPA" $portraitChecked> Portrait
+     </td>
+     <td align="center">
+       <select name="${var}.cols">
+ STATEHTML
+     my $i;
+     $cols = 2;
+     for ($i = 1; $i <= $maxColumns; $i++) {
+         if ($i == $cols) {
+             $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 ($paper == $i) {
+             $result .= "<option selected value='$paperSize[$i]'>" . $paperSize[$i] . "</option>\n";
+         } else {
+             $result .= "<option value='$paperSize[$i]'>" . $paperSize[$i] . "</option>\n";
+         }
+         $i++;
+     }
+     $result .= "</select></td></tr></table>";
+     $result .= '<input type="hidden" name="printWizDone" value="1" />';
+     return $result;
+ }
+;
  __END__

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.93
changed lines
	Added in v.1.130