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.170 and 1.387

-version 1.170, 2003/05/14 18:06:36
+version 1.387, 2005/08/22 09:48:25
  Line 1
- # The LearningOnline Network
+ #  The LearningOnline Network
  # Printout
  #
  # $Id$
  Line 25
  #
  # http://www.lon-capa.org/
  #
- # (Internal Server Error Handler
- #
- # (Login Screen
- # 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14,
- # 1/14/00,5/29,5/30,6/1,6/29,7/1,11/9 Gerd Kortemeyer)
- #
- # 3/1/1 Gerd Kortemeyer)
- #
- # 3/1 Gerd Kortemeyer
- #
- # 9/17 Alex Sakharuk
  #
  package Apache::lonprintout;
- Line 49  use Apache::grades;
+ Line 38  use Apache::grades;
  use Apache::edit;
  use Apache::File();
  use Apache::lonnavmaps;
+ use Apache::lonratedt;
  use POSIX qw(strftime);
- use GDBM_File;
+ use Apache::lonlocal;
+ my $resources_printed = '';
- my %hash;
+ #
- my $LaTeXwidth = 0;
+ #   Convert a numeric code to letters
+ #
- sub headerform {
+ sub num_to_letters {
-     my $r = shift;
+     my ($num) = @_;
-     $r->print(<<ENDHEADER);
+     my @nums= split('',$num);
- <html>
+     my @num_to_let=('A'..'Z');
- <head>
+     my $word;
- <title>LON-CAPA output for printing</title>
+     foreach my $digit (@nums) { $word.=$num_to_let[$digit]; }
- </head>
+     return $word;
- <body bgcolor="FFFFFF">
- <form method="post" enctype="multipart/form-data" action="/adm/printout" name="printform">
- ENDHEADER
-     if ($ENV{'form.postdata'}=~m|^/res/|) {
- 	$r->print(<<ENDHEADER1);
- <b>Path to current document: </b><tt>$ENV{'form.postdata'}</tt><p>
- ENDHEADER1
-     }
  }
+ #   Convert a letter code to numeric.
+ #
- sub menu_for_output {
+ sub letters_to_num {
-     my $r = shift;
+     my ($letters) = @_;
-     my ($title_for_single_resource,$title_for_sequence,$title_for_main_map) = &details_for_menu;
+     my @letters = split('', uc($letters));
-     my $assignment = $title_for_sequence;
+     my %substitution;
-     if ($title_for_single_resource ne '') {$title_for_single_resource = '"'.$title_for_single_resource.'"';}
+     my $digit = 0;
-     if ($title_for_sequence ne '') {$title_for_sequence = '"'.$title_for_sequence.'"';}
+     foreach my $letter ('A'..'J') {
-     if ($title_for_main_map ne '') {$title_for_main_map = '"'.$title_for_main_map.'"';}
+ 	$substitution{$letter} = $digit;
-     $ENV{'form.postdata'} =~ s|http://[^/]+||;
+ 	$digit++;
-     my $subdir_to_print = $ENV{'form.postdata'};
+     }
-     $subdir_to_print =~ m/\/([^\/]+)$/;
+     #  The substitution is done as below to preserve leading
-     $subdir_to_print =~ s/\Q$1\E//;
+     #  zeroes which are needed to keep the code size exact
-     $r->print(<<ENDMENUOUT1);
+     #
- <h1>What do you want to print? Make a choice.</h1><br />
+     my $result ="";
- <input type="hidden" name="phase" value="two">
+     foreach my $letter (@letters) {
- <input type="hidden" name="url" value="$ENV{'form.postdata'}">
+ 	$result.=$substitution{$letter};
- <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 ($ENV{'form.postdata'}=~/\/res\//) {
- 	$r->print(<<ENDMENUOUT2);
- <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\./) 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 />
- <input type="radio" name="choice" value="All class print">  All problems from <b>$title_for_sequence</b> for selected students<br /><br />
- ENDMENUOUT6
      }
-       my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
+     return $result;
-       $subdirtoprint =~ s/\/[^\/]+$//;
-       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
-       }
-     $r->print(<<ENDMENUOUT5);
- <br /><hr /><br />
- <h1>And what page format do you prefer?</h1>
- <table>
-  <tr>
-    <td>
-      <input type="radio" name="layout" value="CBI"> Landscape <br />
-      <input type="radio" name="layout" value="CAPA" checked>  Portrait <br />
-    </td>
-    <td>&nbsp;</td>
-    <td rawspan="2">
-      Number of columns: <select name="numberofcolumns">
-                          <option> 1 </option>
-                          <option selected> 2 </option>
-                         </select>
-    </td>
-    <td rawspan="2">
-      Paper size (format [width x height]): <select name="papersize">
-                                             <option selected> Letter [8 1/2x11 in] </option>
-                                             <option> Legal [8 1/2x14 in] </option>
-                                             <option> Ledger/Tabloid [11x17 in] </option>
-                                             <option> Executive [7 1/2x10 in] </option>
-                                             <option> A2 [420x594 mm] </option>
-                                             <option> A3 [297x420 mm] </option>
-                                             <option> A4 [210x297 mm] </option>
-                                             <option> A5 [148x210 mm] </option>
-                                             <option> A6 [105x148 mm] </option>
-                                            </select>
-    </td>
-  </tr>
- </table>
- </br>
- <input type="submit" value="Submit your choice">
- ENDMENUOUT5
  }
+ #  Determine if a code is a valid numeric code.  Valid
+ #  numeric codes must be comprised entirely of digits and
+ #  have a correct number of digits.
+ #
+ #  Parameters:
+ #     value      - proposed code value.
+ #     num_digits - Number of digits required.
+ #
+ sub is_valid_numeric_code {
+     my ($value, $num_digits) = @_;
+     #   Remove leading/trailing whitespace;
+     $value =~ s/^\s*//g;
+     $value =~ s/\s*$//g;
+     #  All digits?
+     if ($value !~ /^[0-9]+$/) {
+ 	return "Numeric code $value has invalid characters - must only be digits";
+     }
+     if (length($value) != $num_digits) {
+ 	return "Numeric code $value incorrect number of digits (correct = $num_digits)";
+     }
+     return undef;
+ }
+ #   Determines if a code is a valid alhpa code.  Alpha codes
+ #   are ciphers that map  [A-J,a-j] -> 0..9 0..9.
+ #   They also have a correct digit count.
+ # Parameters:
+ #     value          - Proposed code value.
+ #     num_letters    - correct number of letters.
+ # Note:
+ #    leading and trailing whitespace are ignored.
+ #
+ sub is_valid_alpha_code {
+     my ($value, $num_letters) = @_;
+      # strip leading and trailing spaces.
- sub sequence_content_menu {
+     $value =~ s/^\s*//g;
-     my ($key_to,$r) = @_;
+     $value =~ s/\s*$//g;
-     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 {
+     #  All alphas in the right range?
-     my $r = shift;
+     if ($value !~ /^[A-J,a-j]+$/) {
-     my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
+ 	return "Invalid letter code $value must only contain A-J";
-     $subdirtoprint =~ s/\/[^\/]+$//;
+     }
-     my @list_of_files = ();
+     if (length($value) != $num_letters) {
-     my @content_directory = ();
+ 	return "Letter code $value has incorrect number of letters (correct = $num_letters)";
-     $r->print("Subdir: " . $subdirtoprint . "<br />");
+     }
-     if ($subdirtoprint =~ m|/home/([^/]+)/public_html|) {
+     return undef;
- 	#localmachine CSTR space
+ }
- 	my $user=$1;
- 	my $domain=$Apache::lonnet::perlvar{'lonDefDomain'};
+ #   Determine if a code entered by the user in a helper is valid.
- 	@content_directory = &Apache::lonnet::dirlist($subdirtoprint,
+ #   valid depends on the code type and the type of code selected.
- 						      $domain, $user,'');
+ #   The type of code selected can either be numeric or
-     } else {
+ #   Alphabetic.  If alphabetic, the code, in fact is a simple
-         #local library server res space (allows to print only from the own library server)
+ #   substitution cipher for the actual numeric code: 0->A, 1->B ...
- 	@content_directory = &Apache::lonnet::dirlist($subdirtoprint,$ENV{'user.domain'}, $ENV{'user.name'},'');
+ #   We'll be nice and be case insensitive for alpha codes.
+ # Parameters:
+ #    code_value    - the value of the code the user typed in.
+ #    code_option   - The code type selected from the set in the scantron format
+ #                    table.
+ # Returns:
+ #    undef         - The code is valid.
+ #    other         - An error message indicating what's wrong.
+ #
+ sub is_code_valid {
+     my ($code_value, $code_option) = @_;
+     my ($code_type, $code_length) = ('letter', 6);	# defaults.
+     open(FG, $Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
+     foreach my $line (<FG>) {
+ 	my ($name, $type, $length) = (split(/:/, $line))[0,2,4];
+ 	if($name eq $code_option) {
+ 	    $code_length = $length;
+ 	    if($type eq 'number') {
+ 		$code_type = 'number';
+ 	    }
+ 	}
      }
-     for (my $iy=0;$iy<=$#content_directory;$iy++) {
+     my $valid;
- 	my @tempo_array = split(/&/,$content_directory[$iy]);
+     if ($code_type eq 'number') {
- 	if ($tempo_array[0] =~ m/^[^\.]+\.(problem|exam|quiz|assess|survey|form|library)$/) {
+ 	return &is_valid_numeric_code($code_value, $code_length);
- 	    push(@list_of_files,$tempo_array[0]);
+     } else {
- 	}
+ 	return &is_valid_alpha_code($code_value, $code_length);
-     }
-     $subdirtoprint =~ s/\/$//;
-     for (my $i=0;$i<=$#list_of_files;$i++) {
- 	$list_of_files[$i] = $subdirtoprint.'/'.$list_of_files[$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="numberofcolumns" value="$ENV{'form.numberofcolumns'}">
- <h1>Mark problems 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('whattoprint')==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('whattoprint')==0) {
- 	      document.forms.printform.elements[i].checked=false;
-             }
-         }
-     }
- </script>
- <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 $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 />
- <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
  }
+ #   Compare two students by name.  The students are in the form
+ #   returned by the helper:
+ #      user:domain:section:last,   first:status
+ #   This is a helper function for the perl sort built-in  therefore:
+ # Implicit Inputs:
+ #    $a     - The first element to compare (global)
+ #    $b     - The second element to compare (global)
+ # Returns:
+ #   -1   - $a < $b
+ #    0   - $a == $b
+ #   +1   - $a > $b
+ #   Note that the initial comparison is done on the last names with the
+ #   first names only used to break the tie.
+ #
+ #
+ sub compare_names {
+     #  First split the names up into the primary fields.
- sub additional_class_menu {
+     my ($u1, $d1, $s1, $n1, $stat1) = split(/:/, $a);
-     my $r = shift;
+     my ($u2, $d2, $s2, $n2, $stat2) = split(/:/, $b);
-     $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="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(
-                    'classlist',
- 		   $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
- 		   $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
-     my $now=time;
-     $r->print(<<ENDDISHEADER);
- <script>
-     function checkall() {
- 	for (i=0; i<document.forms.printform.elements.length; i++) {
-             if
-           (document.forms.printform.elements[i].name.indexOf('whomtoprint')==0) {
- 	      document.forms.printform.elements[i].checked=true;
-             }
-         }
-     }
-     function checksec() {
- 	for (i=0; i<document.forms.printform.elements.length; i++) {
-             if
-           (document.forms.printform.elements[i].value.indexOf
-            (document.forms.printform.chksec.value)==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('whomtoprint')==0) {
- 	      document.forms.printform.elements[i].checked=false;
-             }
-         }
-     }
- </script>
- <input type=button onClick="checkall()" value="Check All">&nbsp;
- <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>
- ENDDISHEADER
-     my $i = 0;
-     foreach (sort keys %courselist) {
-         my ($end,$start)=split(/\:/,$courselist{$_});
-         my $active=1;
-         if (($end) && ($now>$end)) { $active=0; }
-         if ($active) {
-            my ($sname,$sdom)=split(/\:/,$_);
-            my %reply=&Apache::lonnet::get('environment',
-               ['firstname','middlename','lastname','generation'],
-               $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'}.' '.
-                       $reply{'middlename'}.' '.
-                       $reply{'lastname'}.' '.
-                       $reply{'generation'}.
-                       ' ('.$_.') '.$section);
- 	   $i++;
-         }
-     }
-     $r->print(<<ENDMENUOUT2);
- <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">
- <input type="submit" value="Submit">
- ENDMENUOUT2
- }
- sub additional_print_menu {
+     # Now split the last name and first name of each n:
-     my $r = shift;
+     #
-     my $what_to_print = '';
-     for (my $i=0; $i<$ENV{'form.numberofstudents'};$i++) {
- 	$what_to_print .= '<input type="hidden" name="whomtoprint'.$i.'" value="'.$ENV{'form.whomtoprint'.$i}.'">';
-     }
-     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'}">
- <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="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 />
- <b>Left margin</b>: <input type="text" name="leftmargin" width="8" value="-0.57in"> <br />
- <input type="hidden" name="phase" value="four">
- <input type="submit" value="Submit">
- </form>
- </body>
- </html>
- ENDMENUOUT
- }
+     my ($l1,$f1) = split(/,/, $n1);
+     my ($l2,$f2) = split(/,/, $n2);
- sub output_data {
+     # We don't bother to remove the leading/trailing whitespace from the
-     my $r = shift;
+     # firstname, unless the last names compare identical.
-     $r->print(<<ENDPART);
- <html>
- <head>
- <title>LON-CAPA output for printing</title>
- </head>
- <body bgcolor="FFFFFF">
- <hr>
- ENDPART
-     my $choice = $ENV{'form.choice'};
+     if($l1 lt $l2) {
-     my $layout = $ENV{'form.layout'};
+ 	return -1;
-     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);
-     if ($numberofcolumns == 1) {
- 	$textwidth=$ENV{'form.width'};
- 	$textheight=$ENV{'form.height'};
      }
-     my $LaTeXwidth;
+     if($l1 gt $l2) {
-     if ($textwidth=~/(\d+\s*cm)/) {
+ 	return  1;
- 	$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, ...
-       $selectionmade = 1;
-       if ($ENV{'form.url'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
-         my %moreenv;
-         if (&Apache::lonnet::allowed('bre',$ENV{'form.url'})) {
- 	  $ENV{'form.url'}=~s/http:\/\/[^\/]+//;
-         }
-         $moreenv{'request.filename'}=$ENV{'form.url'};
- 	my %form;
-         $form{'textwidth'}=$LaTeXwidth;
-         $form{'grade_target'}='tex';
-         &Apache::lonnet::appenv(%moreenv);
-         my $texversion=&Apache::lonnet::ssi($ENV{'form.url'},%form);
-         &Apache::lonnet::delenv('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 %form;
- 	   $form{'textwidth'}=$LaTeXwidth;
- 	   $form{'grade_target'}='tex';
- 	   $form{'symb'}=$symb;
- 	   #&Apache::lonnet::logthis("Trying to get $urlp with symb $symb");
- 	   my $texversion=&Apache::lonnet::ssi($urlp,%form);
- 	   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 %form;
- 		$form{'grade_target'}='tex';
- 		$form{'textwidth'}=$LaTeXwidth;
- 		$form{'symb'}=$symb;
- 		my $texversion=&Apache::lonnet::ssi($urlp,%form);
- 		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]);
+     # Break the tie on the first name, but there are leading (possibly trailing
- 	my @master_seq = &coming_from_hash($primary_sequence);
+     # whitespaces to get rid of first
- 	for (my $i=0;$i<=$#master_seq;$i++) {
+     #
- 	    my ($path,$title,$symb) = split /&&/,$master_seq[$i];
+     $f1 =~ s/^\s+//;		# Remove leading...
- 	    $master_seq[$i] = $path.'&&'.$symb;
+     $f1 =~ s/\s+$//;		# Trailing spaces from first 1...
- 	}
-         #loop over students
+     $f2 =~ s/^\s+//;
- 	my $flag_latex_header_remove = 'NO';
+     $f2 =~ s/\s+$//;		# And the same for first 2...
- 	my %moreenv;
- 	$moreenv{'form.textwidth'}=$LaTeXwidth;
+     if($f1 lt $f2) {
- 	&Apache::lonnet::appenv(%moreenv);
+ 	return -1;
- 	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 %form;
- 		$form{'grade_target'}='tex';
- 		$form{'textwidth'}=$LaTeXwidth;
- 		if ($urlp =~ m|/home/([^/]+)/public_html|) {
- 		    $urlp =~ s|/home/([^/]*)/public_html|/~$1|;
- 		} else {
- 		    $urlp =~ s|^/home/httpd/html||;
- 		}
- 		my $texversion=&Apache::lonnet::ssi($urlp,%form);
-                 #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);
+     if($f1 gt $f2) {
-     #changes page's parameters for the one column output
+ 	return 1;
-     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;
+     #  Must be the same name.
-     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
- }
- sub coming_from_hash {
-     my $mainsequence = shift;
+     return 0;
-     my @resourcelist = ();
-     my $mapid = $hash{'map_pc_'.$mainsequence};
-     my $mapstart = $hash{'map_start_'.$mainsequence};
-     my $mapfinish = $hash{'map_finish_'.$mainsequence};
-     my $current_resource = $mapstart;
-     while ($current_resource ne $mapfinish) {
- 	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*)/) {
- 			$rid = $1;
- 			last;
- 		    }
- 		}
- 	    } else {
- 	        $rid =~ m/^$mapid\.(\d*)/;
-                 $rid = $1;
- 	    }
- 	    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 ($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*)/) {
- 			$rid = $1;
- 			last;
- 		    }
- 		}
- 	    } else {
- 	        $rid =~ m/^$mapid\.(\d*)/;
-                 $rid = $1;
- 	    }
- 	    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 latex_header_footer_remove {
      my $text = shift;
      $text =~ s/\\end{document}//;
- Line 826  sub character_chart {
+ Line 261  sub character_chart {
      $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?61;/\\ensuremath\{=\}/g;
-     $result =~ s/&(\#0?62|gt|\#155);/\$>\$/g;
+     $result =~ s/&(\#0?62|gt|\#155);/\\ensuremath\{>\}/g;
      $result =~ s/&\#0?63;/\?/g;
      $result =~ s/&\#0?65;/A/g;
      $result =~ s/&\#0?66;/B/g;
- Line 856  sub character_chart {
+ Line 291  sub character_chart {
      $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?92;/\\ensuremath\{\\setminus\}/g;
      $result =~ s/&\#0?93;/]/g;
-     $result =~ s/&\#(0?94|136);/\$\\wedge\$/g;
+     $result =~ s/&\#(0?94|136);/\\ensuremath\{\\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;
- Line 893  sub character_chart {
+ Line 328  sub character_chart {
      $result =~ s/&\#126;/\~/g;
      $result =~ s/&\#131;/\\textflorin /g;
      $result =~ s/&\#132;/\"/g;
-     $result =~ s/&\#133;/\$\\ldots\$/g;
+     $result =~ s/&\#133;/\\ensuremath\{\\ldots\}/g;
-     $result =~ s/&\#134;/\$\\dagger\$/g;
+     $result =~ s/&\#134;/\\ensuremath\{\\dagger\}/g;
-     $result =~ s/&\#135;/\$\\ddagger\$/g;
+     $result =~ s/&\#135;/\\ensuremath\{\\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/&\#149;/\\ensuremath\{\\bullet\}/g;
      $result =~ s/&\#150;/--/g;
      $result =~ s/&\#151;/---/g;
-     $result =~ s/&\#152;/\$\\sim\$/g;
+     $result =~ s/&\#152;/\\ensuremath\{\\sim\}/g;
      $result =~ s/&\#153;/\\texttrademark /g;
      $result =~ s/&\#156;/\\oe/g;
      $result =~ s/&\#159;/\\\"Y/g;
-     $result =~ s/&(\#160|nbsp);//g;
+     $result =~ s/&(\#160|nbsp);/~/g;
      $result =~ s/&(\#161|iexcl);/!\`/g;
      $result =~ s/&(\#162|cent);/\\textcent /g;
      $result =~ s/&(\#163|pound);/\\pounds /g;
- Line 918  sub character_chart {
+ Line 353  sub character_chart {
      $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/&(\#172|not);/\\ensuremath\{\\neg\}/g;
      $result =~ s/&(\#173|shy);/ - /g;
      $result =~ s/&(\#174|reg);/\\textregistered /g;
-     $result =~ s/&(\#175|macr);/\$^{-}\$/g;
+     $result =~ s/&(\#175|macr);/\\ensuremath\{^{-}\}/g;
-     $result =~ s/&(\#176|deg);/\$^{\\circ}\$/g;
+     $result =~ s/&(\#176|deg);/\\ensuremath\{^{\\circ}\}/g;
-     $result =~ s/&(\#177|plusmn);/\$\\pm\$/g;
+     $result =~ s/&(\#177|plusmn);/\\ensuremath\{\\pm\}/g;
-     $result =~ s/&(\#178|sup2);/\$^2\$/g;
+     $result =~ s/&(\#178|sup2);/\\ensuremath\{^2\}/g;
-     $result =~ s/&(\#179|sup3);/\$^3\$/g;
+     $result =~ s/&(\#179|sup3);/\\ensuremath\{^3\}/g;
      $result =~ s/&(\#180|acute);/\\textacute /g;
-     $result =~ s/&(\#181|micro);/\$\\mu\$/g;
+     $result =~ s/&(\#181|micro);/\\ensuremath\{\\mu\}/g;
      $result =~ s/&(\#182|para);/\\P/g;
-     $result =~ s/&(\#183|middot);/\$\\cdot\$/g;
+     $result =~ s/&(\#183|middot);/\\ensuremath\{\\cdot\}/g;
      $result =~ s/&(\#184|cedil);/\\c{\\strut}/g;
-     $result =~ s/&(\#185|sup1);/\$^1\$/g;
+     $result =~ s/&(\#185|sup1);/\\ensuremath\{^1\}/g;
      $result =~ s/&(\#186|ordm);/\\textordmasculine /g;
      $result =~ s/&(\#188|frac14);/\\textonequarter /g;
      $result =~ s/&(\#189|frac12);/\\textonehalf /g;
- Line 959  sub character_chart {
+ Line 394  sub character_chart {
      $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/&(\#215|times);/\\ensuremath\{\\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/&(\#223|szlig);/{\\ss}/g;
      $result =~ s/&(\#224|agrave);/\\\`{a}/g;
      $result =~ s/&(\#225|aacute);/\\\'{a}/g;
      $result =~ s/&(\#226|acirc);/\\^{a}/g;
- Line 983  sub character_chart {
+ Line 418  sub character_chart {
      $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/&(\#240|eth);/\\ensuremath\{\\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/&(\#247|divide);/\\ensuremath\{\\div\}/g;
      $result =~ s/&(\#248|oslash);/{\\o}/g;
      $result =~ s/&(\#249|ugrave);/\\\`{u}/g;
      $result =~ s/&(\#250|uacute);/\\\'{u}/g;
- Line 998  sub character_chart {
+ Line 433  sub character_chart {
      $result =~ s/&(\#252|uuml);/\\\"{u}/g;
      $result =~ s/&(\#253|yacute);/\\\'{y}/g;
      $result =~ s/&(\#255|yuml);/\\\"{y}/g;
-     $result =~ s/&\#952;/\$\\theta\$/g;
+     $result =~ s/&\#952;/\\ensuremath\{\\theta\}/g;
  #Greek Alphabet
-     $result =~ s/&(alpha|\#945);/\$\\alpha \$/g;
+     $result =~ s/&(alpha|\#945);/\\ensuremath\{\\alpha\}/g;
-     $result =~ s/&(beta|\#946);/\$\\beta \$/g;
+     $result =~ s/&(beta|\#946);/\\ensuremath\{\\beta\}/g;
-     $result =~ s/&(gamma|\#947);/\$\\gamma \$/g;
+     $result =~ s/&(gamma|\#947);/\\ensuremath\{\\gamma\}/g;
-     $result =~ s/&(delta|\#948);/\$\\delta \$/g;
+     $result =~ s/&(delta|\#948);/\\ensuremath\{\\delta\}/g;
-     $result =~ s/&(epsilon|\#949);/\$\\epsilon \$/g;
+     $result =~ s/&(epsilon|\#949);/\\ensuremath\{\\epsilon\}/g;
-     $result =~ s/&(zeta|\#950);/\$\\zeta \$/g;
+     $result =~ s/&(zeta|\#950);/\\ensuremath\{\\zeta\}/g;
-     $result =~ s/&(eta|\#951);/\$\\eta \$/g;
+     $result =~ s/&(eta|\#951);/\\ensuremath\{\\eta\}/g;
-     $result =~ s/&(theta|\#952);/\$\\theta \$/g;
+     $result =~ s/&(theta|\#952);/\\ensuremath\{\\theta\}/g;
-     $result =~ s/&(iota|\#953);/\$\\iota \$/g;
+     $result =~ s/&(iota|\#953);/\\ensuremath\{\\iota\}/g;
-     $result =~ s/&(kappa|\#954);/\$\\kappa \$/g;
+     $result =~ s/&(kappa|\#954);/\\ensuremath\{\\kappa\}/g;
-     $result =~ s/&(lambda|\#955);/\$\\lambda \$/g;
+     $result =~ s/&(lambda|\#955);/\\ensuremath\{\\lambda\}/g;
-     $result =~ s/&(mu|\#956);/\$\\mu \$/g;
+     $result =~ s/&(mu|\#956);/\\ensuremath\{\\mu\}/g;
-     $result =~ s/&(nu|\#957);/\$\\nu \$/g;
+     $result =~ s/&(nu|\#957);/\\ensuremath\{\\nu\}/g;
-     $result =~ s/&(xi|\#958);/\$\\xi \$/g;
+     $result =~ s/&(xi|\#958);/\\ensuremath\{\\xi\}/g;
-     $result =~ s/&(pi|\#960);/\$\\pi \$/g;
+     $result =~ s/&(omicron|\#959);/o/g;
-     $result =~ s/&(rho|\#961);/\$\\rho \$/g;
+     $result =~ s/&(pi|\#960);/\\ensuremath\{\\pi\}/g;
-     $result =~ s/&(sigma|\#963);/\$\\sigma \$/g;
+     $result =~ s/&(rho|\#961);/\\ensuremath\{\\rho\}/g;
-     $result =~ s/&(tau|\#964);/\$\\tau \$/g;
+     $result =~ s/&(sigma|\#963);/\\ensuremath\{\\sigma\}/g;
-     $result =~ s/&(upsilon|\#965);/\$\\upsilon \$/g;
+     $result =~ s/&(tau|\#964);/\\ensuremath\{\\tau\}/g;
-     $result =~ s/&(phi|\#966);/\$\\phi \$/g;
+     $result =~ s/&(upsilon|\#965);/\\ensuremath\{\\upsilon\}/g;
-     $result =~ s/&(chi|\#967);/\$\\chi \$/g;
+     $result =~ s/&(phi|\#966);/\\ensuremath\{\\phi\}/g;
-     $result =~ s/&(psi|\#968);/\$\\psi \$/g;
+     $result =~ s/&(chi|\#967);/\\ensuremath\{\\chi\}/g;
-     $result =~ s/&(omega|\#969);/\$\\omega \$/g;
+     $result =~ s/&(psi|\#968);/\\ensuremath\{\\psi\}/g;
-     $result =~ s/&(Gamma|\#915);/\$\\Gamma \$/g;
+     $result =~ s/&(omega|\#969);/\\ensuremath\{\\omega\}/g;
-     $result =~ s/&(Delta|\#916);/\$\\Delta \$/g;
+     $result =~ s/&(thetasym|\#977);/\\ensuremath\{\\vartheta\}/g;
-     $result =~ s/&(Theta|\#920);/\$\\Theta \$/g;
+     $result =~ s/&(piv|\#982);/\\ensuremath\{\\varpi\}/g;
-     $result =~ s/&(Lambda|\#923);/\$\\Lambda \$/g;
+     $result =~ s/&(Alpha|\#913);/A/g;
-     $result =~ s/&(Xi|\#926);/\$\\Xi \$/g;
+     $result =~ s/&(Beta|\#914);/B/g;
-     $result =~ s/&(Pi|\#928);/\$\\Pi \$/g;
+     $result =~ s/&(Gamma|\#915);/\\ensuremath\{\\Gamma\}/g;
-     $result =~ s/&(Sigma|\#931);/\$\\Sigma \$/g;
+     $result =~ s/&(Delta|\#916);/\\ensuremath\{\\Delta\}/g;
-     $result =~ s/&(Upsilon|\#933);/\$\\Upsilon \$/g;
+     $result =~ s/&(Epsilon|\#917);/E/g;
-     $result =~ s/&(Phi|\#934);/\$\\Phi \$/g;
+     $result =~ s/&(Zeta|\#918);/Z/g;
-     $result =~ s/&(Psi|\#936);/\$\\Psi \$/g;
+     $result =~ s/&(Eta|\#919);/H/g;
-     $result =~ s/&(Omega|\#937);/\$\\Omega \$/g;
+     $result =~ s/&(Theta|\#920);/\\ensuremath\{\\Theta\}/g;
+     $result =~ s/&(Iota|\#921);/I/g;
+     $result =~ s/&(Kappa|\#922);/K/g;
+     $result =~ s/&(Lambda|\#923);/\\ensuremath\{\\Lambda\}/g;
+     $result =~ s/&(Mu|\#924);/M/g;
+     $result =~ s/&(Nu|\#925);/N/g;
+     $result =~ s/&(Xi|\#926);/\\ensuremath\{\\Xi\}/g;
+     $result =~ s/&(Omicron|\#927);/O/g;
+     $result =~ s/&(Pi|\#928);/\\ensuremath\{\\Pi\}/g;
+     $result =~ s/&(Rho|\#929);/P/g;
+     $result =~ s/&(Sigma|\#931);/\\ensuremath\{\\Sigma\}/g;
+     $result =~ s/&(Tau|\#932);/T/g;
+     $result =~ s/&(Upsilon|\#933);/\\ensuremath\{\\Upsilon\}/g;
+     $result =~ s/&(Phi|\#934);/\\ensuremath\{\\Phi\}/g;
+     $result =~ s/&(Chi|\#935);/X/g;
+     $result =~ s/&(Psi|\#936);/\\ensuremath\{\\Psi\}/g;
+     $result =~ s/&(Omega|\#937);/\\ensuremath\{\\Omega\}/g;
+ #Arrows (extended HTML 4.01)
+     $result =~ s/&(larr|\#8592);/\\ensuremath\{\\leftarrow\}/g;
+     $result =~ s/&(uarr|\#8593);/\\ensuremath\{\\uparrow\}/g;
+     $result =~ s/&(rarr|\#8594);/\\ensuremath\{\\rightarrow\}/g;
+     $result =~ s/&(darr|\#8595);/\\ensuremath\{\\downarrow\}/g;
+     $result =~ s/&(harr|\#8596);/\\ensuremath\{\\leftrightarrow\}/g;
+     $result =~ s/&(lArr|\#8656);/\\ensuremath\{\\Leftarrow\}/g;
+     $result =~ s/&(uArr|\#8657);/\\ensuremath\{\\Uparrow\}/g;
+     $result =~ s/&(rArr|\#8658);/\\ensuremath\{\\Rightarrow\}/g;
+     $result =~ s/&(dArr|\#8659);/\\ensuremath\{\\Downarrow\}/g;
+     $result =~ s/&(hArr|\#8660);/\\ensuremath\{\\Leftrightarrow\}/g;
+ #Mathematical Operators (extended HTML 4.01)
+     $result =~ s/&(forall|\#8704);/\\ensuremath\{\\forall\}/g;
+     $result =~ s/&(part|\#8706);/\\ensuremath\{\\partial\}/g;
+     $result =~ s/&(exist|\#8707);/\\ensuremath\{\\exists\}/g;
+     $result =~ s/&(empty|\#8709);/\\ensuremath\{\\emptyset\}/g;
+     $result =~ s/&(nabla|\#8711);/\\ensuremath\{\\nabla\}/g;
+     $result =~ s/&(isin|\#8712);/\\ensuremath\{\\in\}/g;
+     $result =~ s/&(notin|\#8713);/\\ensuremath\{\\notin\}/g;
+     $result =~ s/&(ni|\#8715);/\\ensuremath\{\\ni\}/g;
+     $result =~ s/&(prod|\#8719);/\\ensuremath\{\\prod\}/g;
+     $result =~ s/&(sum|\#8721);/\\ensuremath\{\\sum\}/g;
+     $result =~ s/&(minus|\#8722);/\\ensuremath\{-\}/g;
+     $result =~ s/&(lowast|\#8727);/\\ensuremath\{*\}/g;
+     $result =~ s/&(radic|\#8730);/\\ensuremath\{\\surd\}/g;
+     $result =~ s/&(prop|\#8733);/\\ensuremath\{\\propto\}/g;
+     $result =~ s/&(infin|\#8734);/\\ensuremath\{\\infty\}/g;
+     $result =~ s/&(ang|\#8736);/\\ensuremath\{\\angle\}/g;
+     $result =~ s/&(and|\#8743);/\\ensuremath\{\\wedge\}/g;
+     $result =~ s/&(or|\#8744);/\\ensuremath\{\\vee\}/g;
+     $result =~ s/&(cap|\#8745);/\\ensuremath\{\\cap\}/g;
+     $result =~ s/&(cup|\#8746);/\\ensuremath\{\\cup\}/g;
+     $result =~ s/&(int|\#8747);/\\ensuremath\{\\int\}/g;
+     $result =~ s/&(sim|\#8764);/\\ensuremath\{\\sim\}/g;
+     $result =~ s/&(cong|\#8773);/\\ensuremath\{\\cong\}/g;
+     $result =~ s/&(asymp|\#8776);/\\ensuremath\{\\approx\}/g;
+     $result =~ s/&(ne|\#8800);/\\ensuremath\{\\not=\}/g;
+     $result =~ s/&(equiv|\#8801);/\\ensuremath\{\\equiv\}/g;
+     $result =~ s/&(le|\#8804);/\\ensuremath\{\\leq\}/g;
+     $result =~ s/&(ge|\#8805);/\\ensuremath\{\\geq\}/g;
+     $result =~ s/&(sub|\#8834);/\\ensuremath\{\\subset\}/g;
+     $result =~ s/&(sup|\#8835);/\\ensuremath\{\\supset\}/g;
+     $result =~ s/&(nsub|\#8836);/\\ensuremath\{\\not\\subset\}/g;
+     $result =~ s/&(sube|\#8838);/\\ensuremath\{\\subseteq\}/g;
+     $result =~ s/&(supe|\#8839);/\\ensuremath\{\\supseteq\}/g;
+     $result =~ s/&(oplus|\#8853);/\\ensuremath\{\\oplus\}/g;
+     $result =~ s/&(otimes|\#8855);/\\ensuremath\{\\otimes\}/g;
+     $result =~ s/&(perp|\#8869);/\\ensuremath\{\\perp\}/g;
+     $result =~ s/&(sdot|\#8901);/\\ensuremath\{\\cdot\}/g;
+ #Geometric Shapes (extended HTML 4.01)
+     $result =~ s/&(loz|\#9674);/\\ensuremath\{\\Diamond\}/g;
+ #Miscellaneous Symbols (extended HTML 4.01)
+     $result =~ s/&(spades|\#9824);/\\ensuremath\{\\spadesuit\}/g;
+     $result =~ s/&(clubs|\#9827);/\\ensuremath\{\\clubsuit\}/g;
+     $result =~ s/&(hearts|\#9829);/\\ensuremath\{\\heartsuit\}/g;
+     $result =~ s/&(diams|\#9830);/\\ensuremath\{\\diamondsuit\}/g;
      return $result;
  }
-     sub page_format {
+                   #width, height, oddsidemargin, evensidemargin, topmargin
- 	my ($papersize,$layout,$numberofcolumns) = @_;
+ my %page_formats=
- 	my ($textwidth,$textheight,$oddoffset,$evenoffset) = (0,0,0,0);
+     ('letter' => {
- 	if ($papersize=~/Letter/) {
+ 	 'book' => {
- 	    if ($layout eq 'CAPA') {
+ 	     '1' => [ '7.1 in','9.8 in', '-0.57 in','-0.57 in','0.7 cm'],
- 		if ($numberofcolumns == 1) {
+ 	     '2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','0.7 cm']
- 		    $textwidth = '18 cm';
+ 	 },
- 		    $textheight = '25.9 cm';
+ 	 'album' => {
- 		    $oddoffset = '-0.57 in';
+ 	     '1' => [ '8.8 in', '6.8 in','-40 pt in',  '-60 pt','1 cm'],
- 		    $evenoffset = '-0.57 in';
+ 	     '2' => [ '4.4 in', '6.8 in','-0.5 in', '-1.5 in','3.5 in']
- 		} elsif ($numberofcolumns == 2) {
+ 	 },
- 		    $textwidth = '93 mm';
+      },
- 		    $textheight = '25.9 cm';
+      'legal' => {
- 		    $oddoffset = '-0.57 in';
+ 	 'book' => {
- 		    $evenoffset = '-0.57 in';
+ 	     '1' => ['7.1 in','13 in',,'-0.57 in','-0.57 in','-0.5 in'],
- 		}
+ 	     '2' => ['3.16 in','13 in','-0.57 in','-0.57 in','-0.5 in']
- 	    } elsif ($layout eq 'CBI') {
+ 	 },
- 		if ($numberofcolumns eq '1') {
+ 	 'album' => {
- 		    $textwidth = '8.8 in';
+ 	     '1' => ['12 in','7.1 in',,'-0.57 in','-0.57 in','-0.5 in'],
- 		    $textheight = '6.8 in';
+              '2' => ['6.0 in','7.1 in','-1 in','-1 in','5 in']
- 		    $oddoffset = '-40 pt';
+           },
- 		    $evenoffset = '-60 pt';
+      },
- 		} elsif ($numberofcolumns == 2) {
+      'tabloid' => {
- 		    $textwidth = '4.2 in';
+ 	 'book' => {
- 		    $textheight = '6.8 in';
+ 	     '1' => ['9.8 in','16 in','-0.57 in','-0.57 in','-0.5 in'],
- 		    $oddoffset = '-40 pt';
+ 	     '2' => ['4.9 in','16 in','-0.57 in','-0.57 in','-0.5 in']
- 		    $evenoffset = '-60 pt';
+ 	 },
- 		}
+ 	 'album' => {
- 	    }
+ 	     '1' => ['16 in','9.8 in','-0.57 in','-0.57 in','-0.5 in'],
- #    } elsif($papersize=~/Legal/) {
+ 	     '2' => ['16 in','4.9 in','-0.57 in','-0.57 in','-0.5 in']
- #    } elsif($papersize=~/Ledger/) {
+           },
- #    } elsif($papersize=~/Executive/) {
+      },
-     } elsif($papersize=~/A4/) {
+      'executive' => {
- 	    if ($layout eq 'CAPA') {
+ 	 'book' => {
- 		if ($numberofcolumns == 1) {
+ 	     '1' => ['6.8 in','9 in','-0.57 in','-0.57 in','1.2 in'],
- 		    $textwidth = '18 cm';
+ 	     '2' => ['3.1 in','9 in','-0.57 in','-0.57 in','1.2 in']
- 		    $textheight = '28 cm';
+ 	 },
- 		    $oddoffset = '-0.57 in';
+ 	 'album' => {
- 		    $evenoffset = '-0.57 in';
+ 	     '1' => [],
- 		} elsif ($numberofcolumns == 2) {
+ 	     '2' => []
- 		    $textwidth = '96 mm';
+           },
- 		    $textheight = '2 cm';
+      },
- 		    $oddoffset = '-0.57 in';
+      'a2' => {
- 		    $evenoffset = '-0.57 in';
+ 	 'book' => {
- 		}
+ 	     '1' => [],
- 	    } elsif ($layout eq 'CBI') {
+ 	     '2' => []
- 		if ($numberofcolumns eq '1') {
+ 	 },
- 		    $textwidth = '8.5 in';
+ 	 'album' => {
- 		    $textheight = '7.7 in';
+ 	     '1' => [],
- 		    $oddoffset = '-40 pt';
+ 	     '2' => []
- 		    $evenoffset = '-60 pt';
+           },
- 		} elsif ($numberofcolumns == 2) {
+      },
- 		    $textwidth = '3.9 in';
+      'a3' => {
- 		    $textheight = '7.7 in';
+ 	 'book' => {
- 		    $oddoffset = '-40 pt';
+ 	     '1' => [],
- 		    $evenoffset = '-60 pt';
+ 	     '2' => []
- 		}
+ 	 },
- 	    }
+ 	 'album' => {
- #    } elsif($papersize=~/A3/) {
+ 	     '1' => [],
- #    } elsif($papersize=~/A2/) {
+ 	     '2' => []
- #    } elsif($papersize=~/A5/) {
+           },
- #    } elsif($papersize=~/A6/) {
+      },
- 	}
+      'a4' => {
- 	return $textwidth,$textheight,$oddoffset,$evenoffset;
+ 	 'book' => {
- }
+ 	     '1' => ['176 mm','272 mm','-40 pt in','-60 pt','-0.5 in'],
+ 	     '2' => [ '91 mm','272 mm','-40 pt in','-60 pt','-0.5 in']
+ 	 },
+ 	 'album' => {
+ 	     '1' => ['8.5 in','7.7 in','-40 pt in','-60 pt','0 in'],
+ 	     '2' => ['3.9 in','7.7 in','-40 pt in','-60 pt','0 in']
+ 	 },
+      },
+      'a5' => {
+ 	 'book' => {
+ 	     '1' => [],
+ 	     '2' => []
+ 	 },
+ 	 'album' => {
+ 	     '1' => [],
+ 	     '2' => []
+           },
+      },
+      'a6' => {
+ 	 'book' => {
+ 	     '1' => [],
+ 	     '2' => []
+ 	 },
+ 	 'album' => {
+ 	     '1' => [],
+ 	     '2' => []
+           },
+      },
+      );
- sub page_format_new {
+ sub page_format {
  #
- #Correspondence between $papersize variable and real paper format:
+ #Supported paper format: "Letter [8 1/2x11 in]",      "Legal [8 1/2x14 in]",
- # 0 - "Letter [8 1/2x11 in]"
+ #                        "Ledger/Tabloid [11x17 in]", "Executive [7 1/2x10 in]",
- # 1 - "Legal [8 1/2x14 in]"
+ #                        "A2 [420x594 mm]",           "A3 [297x420 mm]",
- # 2 - "Ledger/Tabloid [11x17 in]"
+ #                        "A4 [210x297 mm]",           "A5 [148x210 mm]",
- # 3 - "Executive [7 1/2x10 in]"
+ #                        "A6 [105x148 mm]"
- # 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);
+     return @{$page_formats{$papersize}->{$layout}->{$numberofcolumns}};
-     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($uname)) { $uname=$env{'user.name'}; }
-     if (!defined($udom)) { $uname=$ENV{'user.domain'}; }
+     if (!defined($udom)) { $udom=$env{'user.domain'}; }
      my $plainname=&Apache::loncommon::plainname($uname,$udom);
-     if ($plainname=~/^\s*$/) { $plainname=$uname; }
+     if ($plainname=~/^\s*$/) { $plainname=$uname.'@'.$udom; }
-     return &Apache::lonxml::latex_special_symbols($plainname,undef,undef,
+     $plainname=&Apache::lonxml::latex_special_symbols($plainname,'header');
- 						  'header');
+     return $plainname;
  }
- sub page_format_transformation {
+ sub get_course {
-     my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment) = @_;
+     my $courseidinfo;
-     my ($textwidth,$textheight,$oddoffset,$evenoffset);
+     if (defined($env{'request.course.id'})) {
- 	$assignment=~s/_/ /g;
+ 	$courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($env{'course.'.$env{'request.course.id'}.'.description'}),'header');
-         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 $courseidinfo;
  }
+ sub page_format_transformation {
- sub page_format_transformation_new {
+     my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment,$tableofcontents,$indexlist,$selectionmade) = @_;
-     my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment) = @_;
+     my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin);
-     my ($textwidth,$textheight,$oddoffset,$evenoffset);
+     if ($selectionmade eq '4') {
- 	$assignment=~s/_/ /g;
+ 	$assignment='Problems from the Whole Course';
-         if ($numberofcolumns != 1) {
+     } else {
-           ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format_new($papersize,$layout,$numberofcolumns);
+ 	$assignment=&Apache::lonxml::latex_special_symbols($assignment,'header');
- 	} else {
+     }
- 	  ($textwidth,$textheight,$oddoffset,$evenoffset) = ($ENV{'form.width'},$ENV{'form.height'},$ENV{'form.leftmargin'},$ENV{'form.leftmargin'});
+     ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = &page_format($papersize,$layout,$numberofcolumns,$topmargin);
- 	}
      my $name = &get_name();
-     if ($name =~ /^\s*$/) {
+     my $courseidinfo = &get_course();
- 	$name=&Apache::lonxml::latex_special_symbols($ENV{'user.name'},undef,
+     if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
- 						     undef,'header');
+     my $topmargintoinsert = '';
+     if ($topmargin ne '0') {$topmargintoinsert='\setlength{\topmargin}{'.$topmargin.'}';}
+     my $fancypagestatement='';
+     if ($numberofcolumns eq '2') {
+ 	$fancypagestatement="\\fancyhead{}\\fancyhead[LO]{\\textbf{$name} $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}";
+     } else {
+ 	$fancypagestatement="\\rhead{}\\chead{}\\lhead{\\textbf{$name} $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}";
      }
-     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 /;
+ 	    $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\n\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\n\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\n\\pagestyle{fancy}$fancypagestatement\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}\n /;
      } 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}/;
+ 	    $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset $topmargintoinsert\n\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\n\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\\pagestyle{fancy}$fancypagestatement\\begin{document}\n\\voffset=-0\.8 cm\\setcounter{page}{1}\n/;
  	} 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 /;
+ 	    $text =~ s/\\pagestyle{fancy}\\rhead{}\\chead{}\s*\\begin{document}/\\textheight = $textheight\\oddsidemargin = $evenoffset\n\\evensidemargin = $evenoffset $topmargintoinsert\\textwidth= $textwidth\\newlength{\\minipagewidth}\n\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\begin{document}\\voffset=-0\.8cm\n\\setcounter{page}{1}  \\vskip 5 mm\n /;
  	}
+ 	if ($papersize eq 'a4') {
+ 	    $text =~ s/(\\begin{document})/$1\\special{papersize=210mm,297mm}/;
+ 	}
+     }
+     if ($tableofcontents eq 'yes') {$text=~s/(\\setcounter\{page\}\{1\})/$1 \\tableofcontents\\newpage /;}
+     if ($indexlist eq 'yes') {
+ 	$text=~s/(\\begin{document})/\\makeindex $1/;
+ 	$text=~s/(\\end{document})/\\strut\\\\\\strut\\printindex $1/;
      }
      return $text;
  }
  sub page_cleanup {
      my $result = shift;
- Line 1268  sub page_cleanup {
+ Line 726  sub page_cleanup {
  sub details_for_menu {
+     my ($helper)=@_;
-     my $name_of_resourse = $hash{'title_'.$hash{'ids_'.$ENV{'form.postdata'}}};
+     my $postdata=$env{'form.postdata'};
-     my $symbolic = &Apache::lonnet::symbread($ENV{'form.postdata'});
+     if (!$postdata) { $postdata=$helper->{VARS}{'postdata'}; }
-     my ($map,$id,$resource)=split(/___/,$symbolic);
+     my $name_of_resource = &Apache::lonnet::gettitle($postdata);
+     my $symbolic = &Apache::lonnet::symbread($postdata);
+     my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symbolic);
      $map=&Apache::lonnet::clutter($map);
-     my $name_of_sequence;
+     my $name_of_sequence = &Apache::lonnet::gettitle($map);
-     $name_of_sequence = $hash{'title_'.$hash{'ids_'.$map}};
      if ($name_of_sequence =~ /^\s*$/) {
  	$map =~ m|([^/]+)$|;
  	$name_of_sequence = $1;
      }
-     my $name_of_map = $hash{'title_'.$hash{'ids_'.&Apache::lonnet::clutter($ENV{'request.course.uri'})}};
+     my $name_of_map = &Apache::lonnet::gettitle($env{'request.course.uri'});
      if ($name_of_map =~ /^\s*$/) {
- 	$ENV{'request.course.uri'} =~ m|([^/]+)$|;
+ 	$env{'request.course.uri'} =~ m|([^/]+)$|;
  	$name_of_map = $1;
      }
-     return ($name_of_resourse,$name_of_sequence,$name_of_map);
+     return ($name_of_resource,$name_of_sequence,$name_of_map);
  }
  sub latex_corrections {
-     my ($number_of_columns,$result) = @_;
+     my ($number_of_columns,$result,$selectionmade) = @_;
-     $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g;
+ #    $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g;
      $result =~ s/\$number_of_columns/$number_of_columns/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/;
+     if ($selectionmade ne '1') {
+ 	$result =~ s/(\\end{document})/\\strut\\vspace\*{-4 mm}\\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/;
+     } else {
+ 	$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
- Line 1306  sub latex_corrections {
+ Line 768  sub latex_corrections {
  	$first_comment = index($result,'<!--',$first_comment);
      }
      $result =~ s/^\s+$//gm; #remove empty lines
-     $result =~ s/(\s)(\s+)/$1/g; #removes more than one empty space
+     #removes more than one empty space
+     $result =~ s|(\s\s+)|($1=~/[\n\r]/)?"\n":" "|ge;
      $result =~ s/\\\\\s*\\vskip/\\vskip/gm;
      $result =~ s/\\\\\s*\\noindent\s*(\\\\)+/\\\\\\noindent /g;
      $result =~ s/{\\par }\s*\\\\/\\\\/gm;
- 	$result =~ s/\\\\\s+\[/ \[/g;
+     $result =~ s/\\\\\s+\[/ \[/g;
-     $result =~ s/\b__+\b/\\makebox\[1 cm\]\[b\]{\\hrulefill}/g;
      #conversion of html characters to LaTeX equivalents
      if ($result =~ m/&(\w+|#\d+);/) {
  	$result = &character_chart($result);
- Line 1323  sub latex_corrections {
+ Line 785  sub latex_corrections {
  }
- sub output_data_new {
+ sub index_table {
-     my ($r,$helper) = @_;
+     my $currentURL = shift;
+     my $insex_string='';
+     $currentURL=~s/\.([^\/+])$/\.$1\.meta/;
+     $insex_string=&Apache::lonnet::metadata($currentURL,'keywords');
+     return $insex_string;
+ }
+ sub IndexCreation {
+     my ($texversion,$currentURL)=@_;
+     my @key_words=split(/,/,&index_table($currentURL));
+     my $chunk='';
+     my $st=index $texversion,'\addcontentsline{toc}{subsection}{';
+     if ($st>0) {
+ 	for (my $i=0;$i<3;$i++) {$st=(index $texversion,'}',$st+1);}
+ 	$chunk=substr($texversion,0,$st+1);
+ 	substr($texversion,0,$st+1)=' ';
+     }
+     foreach my $key_word (@key_words) {
+ 	if ($key_word=~/\S+/) {
+ 	    $texversion=~s/\b($key_word)\b/$1 \\index{$key_word} /i;
+ 	}
+     }
+     if ($st>0) {substr($texversion,0,1)=$chunk;}
+     return $texversion;
+ }
+ sub print_latex_header {
+     my $mode=shift;
+     my $output='\documentclass[letterpaper]{article}';
+     if (($mode eq 'batchmode') || (!$env{'request.role.adv'})) {
+ 	$output.='\batchmode';
+     }
+     $output.='\newcommand{\keephidden}[1]{}\renewcommand{\deg}{$^{\circ}$}'."\n".
+ 	     '\usepackage{longtable}\usepackage{textcomp}\usepackage{makeidx}'."\n".
+ 	     '\usepackage[dvips]{graphicx}\usepackage{epsfig}'."\n".
+ 	     '\usepackage{picins}\usepackage{calc}'."\n".
+ 	     '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}'."\n".
+ 	     '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}'."\n".
+ 	     '\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}'."\n".
+ 	     '\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}'."\n".
+ 	     '\setlength{\abovedisplayshortskip}{-0.04in}'."\n".
+ 	     '\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}'."\n".
+ 	     '\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large'."\n".
+ 	     '\textbf{Index}} \newline \setlength{\rightmargin}{0in}'."\n".
+ 	     '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}'."\n".
+ 	     '\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}'."\n".
+ 	     '\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}'."\n".
+ 	     '\setlength{\abovedisplayshortskip}{-0.04in}'."\n".
+ 	     '\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}\begin{document}'."\n";
+     return $output;
+ }
+ sub path_to_problem {
+     my ($urlp,$colwidth)=@_;
+     my $newurlp = '';
+     $colwidth=~s/\s*mm\s*$//;
+ #characters average about 2 mm in width
+     if (length($urlp)*2 > $colwidth) {
+ 	my @elements = split '/',$urlp;
+ 	my $curlength=0;
+ 	foreach my $element (@elements) {
+ 	    if ($curlength+(length($element)*2) > $colwidth) {
+ 		$newurlp .=  '|\vskip -1 mm \noindent \verb|';
+ 		$curlength=0;
+ 	    } else {
+ 		$curlength+=length($element)*2;
+ 	    }
+ 	    $newurlp.='/'.$element;
+ 	}
+     } else {
+ 	$newurlp=$urlp;
+     }
+     return '{\small\noindent\verb|'.$newurlp.'|\vskip 0 mm}';
+ }
+ sub recalcto_mm {
+     my $textwidth=shift;
+     my $LaTeXwidth;
+     if ($textwidth=~/(-?\d+\.?\d*)\s*cm/) {
+ 	$LaTeXwidth = $1*10;
+     } elsif ($textwidth=~/(-?\d+\.?\d*)\s*mm/) {
+ 	$LaTeXwidth = $1;
+     } elsif ($textwidth=~/(-?\d+\.?\d*)\s*in/) {
+ 	$LaTeXwidth = $1*25.4;
+     }
+     $LaTeXwidth.=' mm';
+     return $LaTeXwidth;
+ }
+ sub get_textwidth {
+     my ($helper,$LaTeXwidth)=@_;
+     my $textwidth=$LaTeXwidth;
+     if ($helper->{'VARS'}->{'pagesize.width'}=~/\d+/ &&
+ 	$helper->{'VARS'}->{'pagesize.widthunit'}=~/\w+/) {
+ 	$textwidth=&recalcto_mm($helper->{'VARS'}->{'pagesize.width'}.' '.
+ 				$helper->{'VARS'}->{'pagesize.widthunit'});
+     }
+     return $textwidth;
+ }
+ sub unsupported {
+     my ($currentURL,$mode)=@_;
+     if ($mode ne '') {$mode='\\'.$mode}
+     my $result.= &print_latex_header($mode);
+     if ($currentURL=~/\/ext\//) {
+ 	$result.=' \strut \\\\ THIS IS EXTERNAL RESOURCE WITH URL \strut \\\\ '.$currentURL.' ';
+     } else {
+ 	$result.=$currentURL;
+     }
+     $result.= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill} \end{document}';
+     return $result;
+ }
+ #
+ #   Retrieve the hash of page breaks.
+ #
+ #  Inputs:
+ #    helper   - reference to helper object.
+ #  Outputs
+ #    A reference to a page break hash.
+ #
+ #
+ sub get_page_breaks  {
+     my ($helper) = @_;
+     my %page_breaks;
+     foreach my $break (split /\|\|\|/, $helper->{'VARS'}->{'FINISHPAGE'}) {
+ 	$page_breaks{$break} = 1;
+     }
+     return %page_breaks;
+ }
+ sub output_data {
+     my ($r,$helper,$rparmhash) = @_;
+     my %parmhash = %$rparmhash;
+     my $html=&Apache::lonxml::xmlbegin();
+     my $bodytag=&Apache::loncommon::bodytag('Preparing Printout');
      $r->print(<<ENDPART);
- <html>
+ $html
  <head>
+ <script type="text/javascript" language="Javascript">
+     var editbrowser;
+     function openbrowser(formname,elementname,only,omit) {
+         var url = '/res/?';
+         if (editbrowser == null) {
+             url += 'launch=1&';
+         }
+         url += 'catalogmode=interactive&';
+         url += 'mode=parmset&';
+         url += 'form=' + formname + '&';
+         if (only != null) {
+             url += 'only=' + only + '&';
+         }
+         if (omit != null) {
+             url += 'omit=' + omit + '&';
+         }
+         url += 'element=' + elementname + '';
+         var title = 'Browser';
+         var options = 'scrollbars=1,resizable=1,menubar=0';
+         options += ',width=700,height=600';
+         editbrowser = open(url,title,options,'1');
+         editbrowser.focus();
+     }
+ </script>
  <title>LON-CAPA output for printing</title>
  </head>
- <body bgcolor="FFFFFF">
+ $bodytag
- <hr>
+ Please stand by while processing your print request, this may take some time ...
  ENDPART
+     # fetch the pagebreaks and store them in the course environment
+     # The page breaks will be pulled into the hash %page_breaks which is
+     # indexed by symb and contains 1's for each break.
+     $env{'form.pagebreaks'}  = $helper->{'VARS'}->{'FINISHPAGE'};
+     $env{'form.lastprinttype'} = $helper->{'VARS'}->{'PRINT_TYPE'};
+     &Apache::loncommon::store_course_settings('print',
+ 					      {'pagebreaks'    => 'scalar',
+ 					       'lastprinttype' => 'scalar'});
+     my %page_breaks  = &get_page_breaks($helper);
      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
- Line 1344  ENDPART
+ Line 985  ENDPART
      } else {
  	$laystyle='book';
      }
-     my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format_new($papersize,$laystyle,$numberofcolumns);
+     my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$laystyle,$numberofcolumns);
-     my $assignment =  $ENV{'form.assignment'};
+     my $assignment =  $env{'form.assignment'};
-     my $LaTeXwidth;
+     my $LaTeXwidth=&recalcto_mm($textwidth);
-     if ($textwidth=~/(\d+)\s*cm/) {
+     my @print_array=();
- 	$LaTeXwidth = $1*10;
+     my @student_names=();
-     } elsif ($textwidth=~/(\d+)\s*mm/) {
- 	$LaTeXwidth = $1;
+     #  Common settings for the %form has:
-     } elsif ($textwidth=~/(\d+)\s*in/) {
+     # In some cases these settings get overriddent by specific cases, but the
- 	$LaTeXwidth = $1*25.4;
+     # settings are common enough to make it worthwhile factoring them out
+     # here.
+     #
+     my %form;
+     $form{'grade_target'} = 'tex';
+     $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
+     # If form.showallfoils is set, then request all foils be shown:
+     # privilege will be enforced both by not allowing the
+     # check box selecting this option to be presnt unless it's ok,
+     # and by lonresponse's priv. check.
+     # The if is here because lonresponse.pm only cares that
+     # showallfoils is defined, not what the value is.
+     if ($helper->{'VARS'}->{'showallfoils'} eq "1") {
+ 	$form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};
      }
-     $LaTeXwidth.=' mm';
      if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
        #-- single document - problem, page, html, xml, ...
- 	my $currentURL;
+ 	my ($currentURL,$cleanURL);
  	if ($helper->{'VARS'}->{'construction'} ne '1') {
-             #prins published resource
+             #prints published resource
  	    $currentURL=$helper->{'VARS'}->{'postdata'};
+ 	    $cleanURL=&Apache::lonenc::check_decrypt($currentURL);
  	} else {
-             #prins resource from the construction space
+             #prints resource from the construction space
- 	    $currentURL=$helper->{'VARS'}->{'filename'};
+ 	    $currentURL='/'.$helper->{'VARS'}->{'filename'};
- 	    $currentURL=~s/\/home\//\/~/;
+ 	    if ($currentURL=~/([^?]+)/) {$currentURL=$1;}
- 	    $currentURL=~s/public_html\///;
+ 	    $cleanURL=$currentURL;
  	}
  	$selectionmade = 1;
- 	if ($currentURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+ 	if ($cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
- 	    my %moreenv;
- 	    $moreenv{'request.filename'}=$currentURL;
- 	    my %form;
- 	    $form{'grade_target'}='tex';
- 	    $form{'textwidth'}=$LaTeXwidth;
  	    my $rndseed=time;
- 	    $form{'rndseed'}=$rndseed;
+ 	    my $texversion='';
- 	    &Apache::lonnet::appenv(%moreenv);
+ 	    if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
- 	    my $texversion=&Apache::lonnet::ssi($currentURL,%form);
+ 		my %moreenv;
- 	    &Apache::lonnet::delenv('form.counter');
+ 		$moreenv{'request.filename'}=$cleanURL;
- 	    &Apache::lonnet::delenv('request.filename');
+ 		if ($helper->{'VARS'}->{'style_file'}=~/\w/) {
- 	    if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+ 		    $moreenv{'construct.style'}=$helper->{'VARS'}->{'style_file'};
- 		my %form;
+ 		    my $dom = $env{'user.domain'};
+ 		    my $user = $env{'user.name'};
+ 		    my $put_result = &Apache::lonnet::put('environment',{'construct.style'=>$helper->{'VARS'}->{'style_file'}},$dom,$user);
+ 		}
+                 if ($helper->{'VARS'}->{'probstatus'} eq 'exam') {$form{'problemtype'}='exam';}
+ 		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
+ 		$form{'suppress_tries'}=$parmhash{'suppress_tries'};
+ 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+ 		$form{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
+ 		if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$form{'problem_split'}='yes';}
+ 		if ($helper->{'VARS'}->{'curseed'}) {
+ 		    $rndseed=$helper->{'VARS'}->{'curseed'};
+ 		}
+ 		$form{'rndseed'}=$rndseed;
+ 		&Apache::lonnet::appenv(%moreenv);
+ 		&Apache::lonnet::delenv('form.counter');
+ 		&Apache::lonxml::init_counter();
+ 		$resources_printed .= $currentURL.':';
+ 		$texversion.=&Apache::lonnet::ssi($currentURL,%form);
+ 		&Apache::lonnet::delenv('form.counter');
+ 		&Apache::lonnet::delenv('request.filename');
+ 	    }
+ 	    if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
+ 	       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
+ 		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
  		$form{'grade_target'}='answer';
  		$form{'answer_output_mode'}='tex';
  		$form{'rndseed'}=$rndseed;
+ 		$resources_printed .= $currentURL.':';
  		my $answer=&Apache::lonnet::ssi($currentURL,%form);
- #		$r->print('<pre>'.$answer.'</pre>'); return OK;
+ 		if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
- 		$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+ 		    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+ 		} else {
+ 		    $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+ 		    if ($helper->{'VARS'}->{'construction'} ne '1') {
+ 			$texversion.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'}).'}\vskip 0 mm ';
+ 			$texversion.=&path_to_problem($cleanURL,$LaTeXwidth);
+ 		    } else {
+ 			$texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
+ 			my $URLpath=$cleanURL;
+ 			$URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
+ 			$texversion.=&path_to_problem ($URLpath,$LaTeXwidth);
+ 		    }
+ 		    $texversion.='\vskip 1 mm '.$answer.'\end{document}';
+ 		}
+ 	    }
+ 	    if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
+ 		$texversion=&IndexCreation($texversion,$currentURL);
+ 	    }
+ 	    if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes') {
+ 		$texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$currentURL| \\strut\\\\\\strut /;
  	    }
  	    $result .= $texversion;
  	    if ($currentURL=~m/\.page\s*$/) {
  		($result,$number_of_columns) = &page_cleanup($result);
  	    }
+         } elsif ($currentURL=~/\.sequence$/ && $helper->{'VARS'}->{'construction'} eq '1') {
+             #printing content of sequence from the construction space
+ 	    my $flag_latex_header_remove = 'NO';
+ 	    my $rndseed=time;
+ 	    if ($helper->{'VARS'}->{'curseed'}) {
+ 		$rndseed=$helper->{'VARS'}->{'curseed'};
+ 	    }
+ 	    $currentURL=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;
+ 	    my $errtext=&Apache::lonratedt::mapread($currentURL);
+ 	    for (my $member=0;$member<=$#Apache::lonratedt::order;$member++) {
+ 		$Apache::lonratedt::resources[$Apache::lonratedt::order[$member]]=~/^([^:]*):([^:]*):/;
+ 		my $urlp=$2;
+ 		if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
+ 		    my $texversion='';
+ 		    if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
+ 			$form{'problem_split'}=$parmhash{'problem_stream_switch'};
+ 			$form{'suppress_tries'}=$parmhash{'suppress_tries'};
+ 			$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+ 			$form{'rndseed'}=$rndseed;
+ 			$resources_printed .=$urlp.':';
+ 			$texversion=&Apache::lonnet::ssi($urlp,%form);
+ 		    }
+ 		    if((($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
+ 		       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) &&
+ 		       ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/)) {
+ 			#  Don't permanently modify %$form...
+ 			my %answerform = %form;
+ 			$answerform{'grade_target'}='answer';
+ 			$answerform{'answer_output_mode'}='tex';
+ 			$answerform{'rndseed'}=$rndseed;
+ 			$answerform{'problem_split'}=$parmhash{'problem_stream_switch'};
+                         if ($urlp=~/\/res\//) {$env{'request.state'}='published';}
+ 			$resources_printed .= $urlp.':';
+ 			my $answer=&Apache::lonnet::ssi($urlp,%answerform);
+ 			if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+ 			    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+ 			} else {
+ 			    $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+ 			    $texversion.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'}).'}\vskip 0 mm ';
+ 			    $texversion.=&path_to_problem ($currentURL,$LaTeXwidth);
+ 			    $texversion.='\vskip 1 mm '.$answer.'\end{document}';
+ 			}
+ 		    }
+ 		    if ($flag_latex_header_remove ne 'NO') {
+ 			$texversion = &latex_header_footer_remove($texversion);
+ 		    } else {
+ 			$texversion =~ s/\\end{document}//;
+ 		    }
+ 		    if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
+ 			$texversion=&IndexCreation($texversion,$urlp);
+ 		    }
+ 		    if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URpL'} eq 'yes') {
+ 			$texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$urlp| \\strut\\\\\\strut /;
+ 		    }
+ 		    $result.=$texversion;
+ 		    $flag_latex_header_remove = 'YES';
+ 		} elsif ($urlp=~/\.(sequence|page)$/) {
+ 		    $result.='\strut\newline\noindent Sequence/page '.$urlp.'\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent ';
+ 		}
+ 	    }
+ 	    if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\begin{document})/$1 \\fbox\{RANDOM SEED IS $rndseed\} /;}
+ 	    $result .= '\end{document}';
+ 	} elsif ($cleanURL=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
+ 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+ 		if ($currentURL=~/\/syllabus$/) {$currentURL=~s/\/res//;}
+ 		$resources_printed .= $currentURL.':';
+ 		my $texversion=&Apache::lonnet::ssi($currentURL,%form);
+ 		$result .= $texversion;
  	} else {
- #	  $result='\documentclass[letterpaper]{article}\usepackage{calc}\begin{document}Printout of this type of document is currently not supported: ';
+ 	    $result.=&unsupported($currentURL,$helper->{'VARS'}->{'LATEX_TYPE'});
- #	  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
+     } 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')) {
+              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')       or
+ 	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources')      or # BUGBUG
+ 	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences')) {
          #-- produce an output string
+ 	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;
+ 	} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources') {  #BUGBUG
+ 	    $selectionmade = 4;
+ 	} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences') {
+ 	    $selectionmade = 7;
+ 	}
+ 	$form{'problem_split'}=$parmhash{'problem_stream_switch'};
+ 	$form{'suppress_tries'}=$parmhash{'suppress_tries'};
+ 	$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+ 	$form{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
+ 	if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$form{'problem_split'}='yes';}
  	my $flag_latex_header_remove = 'NO';
  	my $flag_page_in_sequence = 'NO';
  	my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
+ 	my $prevassignment='';
+ 	&Apache::lonnet::delenv('form.counter');
+ 	&Apache::lonxml::init_counter();
  	for (my $i=0;$i<=$#master_seq;$i++) {
- 	    $master_seq[$i]=~/___\d+___(.*)$/;
- 	    my $urlp='/res/'.$1;
+ 	    # Note due to document structure, not allowed to put \newpage
- 	    if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') {
+ 	    # prior to the first resource
- 		$selectionmade = 2;
- 	    } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') {
+ 	    if (defined $page_breaks{$master_seq[$i]}) {
- 		$selectionmade = 3;
+ 		if($i != 0) {
- 	    } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') {
+ 		    $result.="\\newpage\n";
- 		$selectionmade = 4;
+ 		}
  	    }
- 	    my %form;
+ 	    my (undef,undef,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
- 	    $form{'grade_target'}='tex';
+ 	    $urlp=&Apache::lonnet::clutter($urlp);
- 	    $form{'textwidth'}=$LaTeXwidth;
  	    $form{'symb'}=$master_seq[$i];
- 	    #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]");
+ 	    my ($sequence)=&Apache::lonnet::decode_symb($master_seq[$i]);
- 	    my $texversion=&Apache::lonnet::ssi($urlp,%form);
+ 	    my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($sequence),'header'); #tittle of the assignment which contains this problem
- 	    if ($urlp=~/\.page$/) {
+ 	    if ($selectionmade==7) {$helper->{VARS}->{'assignment'}=$assignment;}
- 		($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
+ 	    if ($i==0) {$prevassignment=$assignment;}
- 		if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;}
+ 	    my $texversion='';
- 		$texversion =~ s/\\end{document}\d*/\\end{document}/;
+ 	    if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
- 		$flag_page_in_sequence = 'YES';
+ 		$resources_printed .= $urlp.':';
- 	    }
+ 		$texversion.=&Apache::lonnet::ssi($urlp,%form);
- 	    if ($flag_latex_header_remove ne 'NO') {
+ 		if ($urlp=~/\.page$/) {
- 		$texversion = &latex_header_footer_remove($texversion);
+ 		    ($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';
+ 		}
+ 		my $lonidsdir=$r->dir_config('lonIDsDir');
+ 		my $envfile=$env{'user.environment'};
+ 		$envfile=~/\/([^\/]+)\.id$/;
+ 		$envfile=$1;
+ 		&Apache::lonnet::transfer_profile_to_env($lonidsdir,$envfile);
+ 		my $current_counter=$env{'form.counter'};
+ 		if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
+ 		   ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
+ 		    #  Don't permanently pervert the %form hash
+ 		    my %answerform = %form;
+ 		    $answerform{'grade_target'}='answer';
+ 		    $answerform{'answer_output_mode'}='tex';
+ 		    $resources_printed .= $urlp.':';
+ 		    my $answer=&Apache::lonnet::ssi($urlp,%answerform);
+ 		    &Apache::lonnet::appenv(('form.counter' => $current_counter));
+ 		    if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+ 			$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+ 		    } else {
+ 			if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
+ 			    $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+ 			    $texversion.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($urlp).'}\vskip 0 mm ';
+ 			    $texversion.=&path_to_problem ($urlp,$LaTeXwidth);
+ 			    $texversion.='\vskip 1 mm '.$answer;
+ 			} else {
+ 			    $texversion='';
+ 			}
+ 		    }
+ 		}
+ 		if ($flag_latex_header_remove ne 'NO') {
+ 		    $texversion = &latex_header_footer_remove($texversion);
+ 		} else {
+ 		    $texversion =~ s/\\end{document}//;
+ 		}
+ 		if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
+ 		    $texversion=&IndexCreation($texversion,$urlp);
+ 		}
+ 		if (($selectionmade == 4) and ($assignment ne $prevassignment)) {
+ 		    my $name = &get_name();
+ 		    my $courseidinfo = &get_course();
+ 		    if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
+ 		    $prevassignment=$assignment;
+ 		    $result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$name.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}} \vskip 5 mm ';
+ 		}
+ 		$result .= $texversion;
+ 		$flag_latex_header_remove = 'YES';
+ 	    } elsif ($urlp=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
+ 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+ 		if ($urlp=~/\/syllabus$/) {$urlp=~s/\/res//;}
+ 		$resources_printed .= $urlp.':';
+ 		my $texversion=&Apache::lonnet::ssi($urlp,%form);
+ 		if ($flag_latex_header_remove ne 'NO') {
+ 		    $texversion = &latex_header_footer_remove($texversion);
+ 		} else {
+ 		    $texversion =~ s/\\end{document}/\\vskip 0\.5mm\\noindent\\makebox\[\\textwidth\/\$number_of_columns\]\[b\]\{\\hrulefill\}/;
+ 		}
+ 		$result .= $texversion;
+ 		$flag_latex_header_remove = 'YES';
  	    } else {
- 		$texversion =~ s/\\end{document}//;
+ 		$texversion=&unsupported($urlp,$helper->{'VARS'}->{'LATEX_TYPE'});
- 	    }
+ 		if ($flag_latex_header_remove ne 'NO') {
- 	    $result .= $texversion;
+ 		    $texversion = &latex_header_footer_remove($texversion);
- 	    $flag_latex_header_remove = 'YES';
+ 		} else {
+ 		    $texversion =~ s/\\end{document}//;
+ 		}
+ 		$result .= $texversion;
+ 		$flag_latex_header_remove = 'YES';
+ 	    }
+ 	    if (&Apache::loncommon::connection_aborted($r)) { last; }
  	}
  	&Apache::lonnet::delenv('form.counter');
- 	if ($flag_page_in_sequence eq 'YES') {$result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;}
+ 	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') {
+      } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') ||
+ 	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students')){
       #-- prints assignments for whole class or for selected students
- 	 $selectionmade=5;
+ 	 my $type;
+ 	 if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') {
+ 	     $selectionmade=5;
+ 	     $type='problems';
+ 	 } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students') {
+ 	     $selectionmade=8;
+ 	     $type='resources';
+ 	 }
  	 my @students=split /\|\|\|/, $helper->{'VARS'}->{'STUDENTS'};
+ 	 #   The normal sort order is by section then by students within the
+ 	 #   section. If the helper var student_sort is 1, then the user has elected
+ 	 #   to override this and output the students by name.
+ 	 #    Each element of the students array is of the form:
+ 	 #       username:domain:section:last, first:status
+ 	 #
+ 	 #
+ 	 if ($helper->{'VARS'}->{'student_sort'}    eq 1) {
+ 	     @students = sort compare_names  @students;
+ 	 }
+          if ($helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq '0' ||
+ 	     $helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq 'all' ) {
+ 	     $helper->{'VARS'}->{'NUMBER_TO_PRINT'}=$#students+1;
+ 	 }
  	 my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
  	 #loop over students
  	 my $flag_latex_header_remove = 'NO';
  	 my %moreenv;
- 	 $moreenv{'form.textwidth'}=$LaTeXwidth;
+          $moreenv{'instructor_comments'}='hide';
- 	 &Apache::lonnet::appenv(%moreenv);
+ 	 $moreenv{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
- 	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1);
+ 	 $moreenv{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
+ 	 $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};
+ 	 $moreenv{'suppress_tries'}   = $parmhash{'suppress_tries'};
+ 	 if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$moreenv{'problem_split'}='yes';}
+ 	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1,'inline','75');
+ 	 my $student_counter=-1;
  	 foreach my $person (@students) {
- 	    my $current_output = '';
- #	    my ($usersection,$username,$userdomain) = split /:/,$person;
+              my $duefile="/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
- 	    my ($username,$userdomain) = split /:/,$person;
+ 	     if (-e $duefile) {
- 	    my $fullname = &get_name($username,$userdomain);
+ 		 my $temp_file = Apache::File->new('>>'.$duefile);
-             #goes through all resources, checks if they are available for current student, and produces output
+ 		 print $temp_file "1969\n";
- 	    foreach my $curresline (@master_seq)  {
+ 	     }
- 		if ($curresline=~ m/\.(problem|exam|quiz|assess|survey|form|library)$/) {
+ 	     $student_counter++;
- 		    my ($map,$id,$res_url) = split(/___/,$curresline);
+ 	     my $i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'});
- 		    if (&Apache::lonnet::allowed('bre',$res_url)) {
+ 	     my ($output,$fullname, $printed)=&print_resources($r,$helper,
- 			my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,
+ 						     $person,$type,
-                                                                         $ENV{'request.course.id'},'tex');
+ 						     \%moreenv,\@master_seq,
- 			if ($flag_latex_header_remove eq 'YES') {
+ 						     $flag_latex_header_remove,
- 			    $rendered = &latex_header_footer_remove($rendered);
+ 						     $LaTeXwidth);
- 			} else {
+ 	     $resources_printed .= ":";
- 			    $rendered =~ s/\\end{document}//;
+ 	     $print_array[$i].=$output;
- 			}
+ 	     $student_names[$i].=$person.':'.$fullname.'_END_';
- 			$current_output .= $rendered;
+ 	     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,&mt('last student').' '.$fullname);
- 		    }
+ 	     $flag_latex_header_remove = 'YES';
- 		    $flag_latex_header_remove = 'YES';
+ 	     if (&Apache::loncommon::connection_aborted($r)) { last; }
- 		}
+ 	 }
- 	    }
+ 	 &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
- 	    my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+ 	 $result .= $print_array[0].'  \end{document}';
- 	    if ($current_output=~/\\documentclass/) {
+      } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon')     ||
- 		$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 /;
+ 	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_anon')  ) {
- 	    } else {
+ 	 my $cdom =$env{'course.'.$env{'request.course.id'}.'.domain'};
- 		my $blanspages = '';
+ 	 my $cnum =$env{'course.'.$env{'request.course.id'}.'.num'};
- 		for (my $j=0;$j<$helper->{'VARS'}->{'EMPTY_PAGES'};$j++) {$blanspages.='\clearpage\strut\clearpage';}
+ 	 my $num_todo=$helper->{'VARS'}->{'NUMBER_TO_PRINT_TOTAL'};
- 		$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;
+ 	 my $code_name=$helper->{'VARS'}->{'ANON_CODE_STORAGE_NAME'};
- 	    }
+ 	 my $old_name=$helper->{'VARS'}->{'REUSE_OLD_CODES'};
- 	    $result .= $current_output;
+ 	 my $single_code = $helper->{'VARS'}->{'SINGLE_CODE'};
- 	    &Apache::lonnet::delenv('form.counter');
+ 	 my $code_option=$helper->{'VARS'}->{'CODE_OPTION'};
- 	    &Apache::lonxml::init_counter();
+ 	 open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
- 	    &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
+ 	 my ($code_type,$code_length)=('letter',6);
- 						    'last student '.$fullname);
+ 	 foreach my $line (<FH>) {
- 	}
+ 	     my ($name,$type,$length) = (split(/:/,$line))[0,2,4];
- 	&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+ 	     if ($name eq $code_option) {
- 	$result .= '\end{document}';
+ 		 $code_length=$length;
- 	&Apache::lonnet::delenv('form.textwidth');
+ 		 if ($type eq 'number') { $code_type = 'number'; }
-     } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_from_directory') {
+ 	     }
+ 	 }
+ 	 my %moreenv = ('textwidth' => &get_textwidth($helper,$LaTeXwidth));
+ 	 $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};
+ 	 my $seed=time+($$<<16)+($$);
+ 	 my @allcodes;
+ 	 if ($old_name) {
+ 	     my %result=&Apache::lonnet::get('CODEs',
+ 					     [$old_name,"type\0$old_name"],
+ 					     $cdom,$cnum);
+ 	     $code_type=$result{"type\0$old_name"};
+ 	     @allcodes=split(',',$result{$old_name});
+ 	     $num_todo=scalar(@allcodes);
+ 	 } elsif ($single_code) {
+ 	     $num_todo    = 1;	# Unconditionally one code to do.
+ 	     # If an alpha code have to convert to numbers so it can be
+ 	     # converted back to letters again :-)
+ 	     #
+ 	     if ($code_type ne 'number') {
+ 		 $single_code = &letters_to_num($single_code);
+ 	     }
+ 	     @allcodes = ($single_code);
+ 	 } else {
+ 	     my %allcodes;
+ 	     srand($seed);
+ 	     for (my $i=0;$i<$num_todo;$i++) {
+ 		 $moreenv{'CODE'}=&get_CODE(\%allcodes,$i,$seed,$code_length,
+ 					    $code_type);
+ 	     }
+ 	     if ($code_name) {
+ 		 &Apache::lonnet::put('CODEs',
+ 				      {
+ 					$code_name =>join(',',keys(%allcodes)),
+ 					"type\0$code_name" => $code_type
+ 				      },
+ 				      $cdom,$cnum);
+ 	     }
+ 	     @allcodes=keys(%allcodes);
+ 	 }
+ 	 my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
+ 	 my ($type) = split(/_/,$helper->{'VARS'}->{'PRINT_TYPE'});
+ 	 my $number_per_page=$helper->{'VARS'}->{'NUMBER_TO_PRINT'};
+ 	 if ($number_per_page eq '0' || $number_per_page eq 'all') {
+ 	     $number_per_page=$num_todo;
+ 	 }
+ 	 my $flag_latex_header_remove = 'NO';
+ 	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$num_todo,'inline','75');
+ 	 my $count=0;
+ 	 foreach my $code (sort(@allcodes)) {
+ 	     my $file_num=int($count/$number_per_page);
+ 	     if ($code_type eq 'number') {
+ 		 $moreenv{'CODE'}=$code;
+ 	     } else {
+ 		 $moreenv{'CODE'}=&num_to_letters($code);
+ 	     }
+ 	     my ($output,$fullname, $printed)=
+ 		 &print_resources($r,$helper,'anonymous',$type,\%moreenv,
+ 				  \@master_seq,$flag_latex_header_remove,
+ 				  $LaTeXwidth);
+ 	     $resources_printed .= ":";
+ 	     $print_array[$file_num].=$output;
+ 	     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
+ 				       &mt('last assignment').' '.$fullname);
+ 	     $flag_latex_header_remove = 'YES';
+ 	     $count++;
+ 	     if (&Apache::loncommon::connection_aborted($r)) { last; }
+ 	 }
+ 	 &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+ 	 $result .= $print_array[0].'  \end{document}';
+      } 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';
+ 	my $rndseed=time;
+ 	if ($helper->{'VARS'}->{'curseed'}) {
+ 	    $rndseed=$helper->{'VARS'}->{'curseed'};
+ 	}
  	for (my $i=0;$i<=$#list_of_files;$i++) {
  	    my $urlp = $list_of_files[$i];
+ 	    $urlp=~s|//|/|;
  	    if ($urlp=~/\//) {
- 		my %form;
+ 		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
- 		$form{'grade_target'}='tex';
+ 		$form{'rndseed'}=$rndseed;
- 		$form{'textwidth'}=$LaTeXwidth;
  		if ($urlp =~ m|/home/([^/]+)/public_html|) {
  		    $urlp =~ s|/home/([^/]*)/public_html|/~$1|;
  		} else {
- 		    $urlp =~ s|^/home/httpd/html||;
+ 		    $urlp =~ s|^$Apache::lonnet::perlvar{'lonDocRoot'}||;
  		}
+ 		$resources_printed .= $urlp.':';
  		my $texversion=&Apache::lonnet::ssi($urlp,%form);
-                 #this chunck is responsible for printing the path to problem
+ 		if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
- 		my $newurlp = '';
+ 		   ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
- 		my $HowMany = length($urlp)*2;
+ 		    #  Don't permanently pervert %form:
- 		if ($HowMany > $LaTeXwidth) {
+ 		    my %answerform = %form;
- 		    my @temporrary = split '/',$urlp;
+ 		    $answerform{'grade_target'}='answer';
- 		    my $HowManyNew = 0;
+ 		    $answerform{'answer_output_mode'}='tex';
- 		    for (my $ii=0;$ii<=$#temporrary;$ii++) {
+ 		    $answerform{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
- 			if ($temporrary[$ii] ne '') {
+ 		    $answerform{'rndseed'}=$rndseed;
- 			    $HowManyNew += length($temporrary[$ii])*2;
+ 		    $resources_printed .= $urlp.':';
- 			    if ($HowManyNew < $LaTeXwidth ) {
+ 		    my $answer=&Apache::lonnet::ssi($urlp,%answerform);
- 				$newurlp .=  '/'.$temporrary[$ii];
+ 		    if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
- 			    } else {
+ 			$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
- 				$HowManyNew = 0;
+ 		    } else {
- 				$newurlp .=  '|\vskip -1 mm \noindent \verb|';
+ 			$texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
- 				$ii--;
+ 			if ($helper->{'VARS'}->{'construction'} ne '1') {
- 			    }
+ 			    $texversion.='\vskip 0 mm \noindent ';
+ 			    $texversion.=&path_to_problem ($urlp,$LaTeXwidth);
+ 			} else {
+ 			    $texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
+ 			    my $URLpath=$urlp;
+ 			    $URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
+ 			    $texversion.=&path_to_problem ($URLpath,$LaTeXwidth);
  			}
+ 			$texversion.='\vskip 1 mm '.$answer.'\end{document}';
  		    }
  		}
- 		$texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 {\\small\\noindent\\verb|$newurlp\|\\vskip 0 mm}/;
+                 #this chunck is responsible for printing the path to problem
+ 		my $newurlp=$urlp;
+ 		if ($newurlp=~/~/) {$newurlp=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;}
+ 		$newurlp=&path_to_problem($newurlp,$LaTeXwidth);
+ 		$texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 $newurlp/;
  		if ($flag_latex_header_remove ne 'NO') {
  		    $texversion = &latex_header_footer_remove($texversion);
  		} else {
  		    $texversion =~ s/\\end{document}//;
  		}
+ 		if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
+ 		    $texversion=&IndexCreation($texversion,$urlp);
+ 		}
+ 		if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes') {
+ 		    $texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$urlp| \\strut\\\\\\strut /;
+ 		}
  		$result .= $texversion;
  	    }
  	    $flag_latex_header_remove = 'YES';
  	}
+ 	if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\typeout)/ RANDOM SEED IS $rndseed $1/;}
  	$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'});
+     $result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'},$helper->{'VARS'}->{'TABLE_CONTENTS'},$helper->{'VARS'}->{'TABLE_INDEX'},$selectionmade);
- #    if ($layout eq 'CBI') {
+     $result = &latex_corrections($number_of_columns,$result,$selectionmade);
- #        $laystyle = 'album';
+     for (my $i=1;$i<=$#print_array;$i++) {$print_array[$i] = &latex_corrections($number_of_columns,$print_array[$i],$selectionmade);}
- #    }
+     #changes page's parameters for the one column output
-     $result = &latex_corrections($number_of_columns,$result);
+     if ($numberofcolumns == 1) {
- #    #changes page's parameters for the one column output
+ 	$result =~ s/\\textwidth\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /;
- #    if ($ENV{'form.numberofcolumns'} == 1) {
+ 	$result =~ s/\\textheight\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;
- #	$result =~ s/\\textwidth= 9cm/\\textwidth= $ENV{'form.width'}/;
+ 	$result =~ s/\\evensidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
- #	$result =~ s/\\textheight 25\.9cm/\\textheight $ENV{'form.height'}/;
+ 	$result =~ s/\\oddsidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
- #	$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";
+     my $identifier = &Apache::loncommon::get_cgi_id();
-     unless ($temp_file = Apache::File->new('>'.$filename)) {
+     my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout_$identifier.tex";
- 	$r->log_error("Couldn't open $filename for output $!");
+     if (!($#print_array>0)) {
- 	return SERVER_ERROR;
+ 	unless ($temp_file = Apache::File->new('>'.$filename)) {
-     }
+ 	    $r->log_error("Couldn't open $filename for output $!");
-     print $temp_file $result;
+ 	    return SERVER_ERROR;
+ 	}
+ 	print $temp_file $result;
+ 	my $begin=index($result,'\begin{document}',0);
+ 	my $inc=substr($result,0,$begin+16);
+     } else {
+ 	my $begin=index($result,'\begin{document}',0);
+ 	my $inc=substr($result,0,$begin+16);
+         for (my $i=0;$i<=$#print_array;$i++) {
+ 	    if ($i==0) {
+ 		$print_array[$i]=$result;
+ 	    } else {
+ 		my $anobegin=index($print_array[$i],'\setcounter{page}',0);
+ 		substr($print_array[$i],0,$anobegin)='';
+ 		$print_array[$i]=$inc.$print_array[$i].'\end{document}';
+ 	    }
+ 	    my $temp_file;
+ 	    my $newfilename=$filename;
+ 	    my $num=$i+1;
+ 	    $newfilename =~s/\.tex$//;
+ 	    $newfilename=sprintf("%s_%03d.tex",$newfilename, $num);
+ 	    unless ($temp_file = Apache::File->new('>'.$newfilename)) {
+ 		$r->log_error("Couldn't open $newfilename for output $!");
+ 		return SERVER_ERROR;
+ 	    }
+ 	    print $temp_file $print_array[$i];
+ 	}
+     }
+     my $student_names='';
+     if ($#print_array>0) {
+ 	for (my $i=0;$i<=$#print_array;$i++) {
+ 	    $student_names.=$student_names[$i].'_ENDPERSON_';
+ 	}
+     } else {
+ 	if ($#student_names>-1) {
+ 	    $student_names=$student_names[0].'_ENDPERSON_';
+ 	} else {
+ 	    my $fullname = &get_name($env{'user.name'},$env{'user.domain'});
+ 	    $student_names=join(':',$env{'user.name'},$env{'user.domain'},
+ 				$env{'request.course.sec'},$fullname).
+ 				    '_ENDPERSON_'.'_END_';
+ 	}
+     }
+     my $URLback=''; #link to original document
+     if ($helper->{'VARS'}->{'construction'} ne '1') {
+ 	#prints published resource
+ 	$URLback=&Apache::lonnet::escape('/adm/flip?postdata=return:');
+     } else {
+ 	#prints resource from the construction space
+ 	$URLback='/'.$helper->{'VARS'}->{'filename'};
+ 	if ($URLback=~/([^?]+)/) {
+ 	    $URLback=$1;
+ 	    $URLback=~s|^/~|/priv/|;
+ 	}
+     }
+     # logic for now is too complex to trace if this has been defined
+     #  yet.
+     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+     &Apache::lonnet::appenv('cgi.'.$identifier.'.file'   => $filename,
+                             'cgi.'.$identifier.'.layout'  => $laystyle,
+                             'cgi.'.$identifier.'.numcol'  => $numberofcolumns,
+ 			    'cgi.'.$identifier.'.paper'  => $papersize,
+                             'cgi.'.$identifier.'.selection' => $selectionmade,
+ 			    'cgi.'.$identifier.'.tableofcontents' => $helper->{'VARS'}->{'TABLE_CONTENTS'},
+ 			    'cgi.'.$identifier.'.tableofindex' => $helper->{'VARS'}->{'TABLE_INDEX'},
+ 			    'cgi.'.$identifier.'.role' => $env{'request.role.adv'},
+                             'cgi.'.$identifier.'.numberoffiles' => $#print_array,
+                             'cgi.'.$identifier.'.studentnames' => $student_names,
+                             'cgi.'.$identifier.'.backref' => $URLback,);
+     &Apache::lonnet::appenv("cgi.$identifier.user"    => $env{'user.name'},
+ 			    "cgi.$identifier.domain"  => $env{'user.domain'},
+ 			    "cgi.$identifier.courseid" => $cnum,
+ 			    "cgi.$identifier.coursedom" => $cdom,
+ 			    "cgi.$identifier.resources" => $resources_printed);
- #<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">
+ <br />
+ <meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$identifier" />
+ <a href="/cgi-bin/printout.pl?$identifier">Continue</a>
  </body>
  </html>
  FINALEND
  }
+ sub get_CODE {
+     my ($all_codes,$num,$seed,$size,$type)=@_;
+     my $max='1'.'0'x$size;
+     my $newcode;
+     while(1) {
+ 	$newcode=sprintf("%06d",int(rand($max)));
+ 	if (!exists($$all_codes{$newcode})) {
+ 	    $$all_codes{$newcode}=1;
+ 	    if ($type eq 'number' ) {
+ 		return $newcode;
+ 	    } else {
+ 		return &num_to_letters($newcode);
+ 	    }
+ 	}
+     }
+ }
- sub handler {
+ sub print_resources {
+     my ($r,$helper,$person,$type,$moreenv,$master_seq,$remove_latex_header,
+ 	$LaTeXwidth)=@_;
+     my $current_output = '';
+     my $printed = '';
+     my ($username,$userdomain,$usersection) = split /:/,$person;
+     my $fullname = &get_name($username,$userdomain);
+     my $namepostfix;
+     if ($person =~ 'anon') {
+ 	$namepostfix="\\\\Name: ";
+ 	$fullname = "CODE - ".$moreenv->{'CODE'};
+     }
+     my $i           = 0;
+     #goes through all resources, checks if they are available for
+     #current student, and produces output
+     &Apache::lonnet::delenv('form.counter');
+     &Apache::lonxml::init_counter();
-     my $r = shift;
+     my %page_breaks  = &get_page_breaks($helper);
-     my $helper;
-     # A hook for me to work without disturbing Alex.
+     foreach my $curresline (@{$master_seq})  {
-     if (!$ENV{'form.jeremy'}) {
+ 	if (defined $page_breaks{$curresline}) {
-         my $result = printHelper($r);
+ 	    if($i != 0) {
-         if (!ref($result)) {
+ 		$current_output.= "\\newpage\n";
-             return $result;
+ 	    }
-         }
-         $helper = $result;
- 	my $key;
- 	foreach $key (keys %{$helper->{'VARS'}}) {
- 	    $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<-<br />');
  	}
- #	return OK;
+ 	$i++;
+ 	if ( !($type eq 'problems' &&
+ 	       ($curresline!~ m/\.(problem|exam|quiz|assess|survey|form|library)$/)) ) {
- 	&output_data_new($r,$helper);
+ 	    my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
+ 	    if (&Apache::lonnet::allowed('bre',$res_url)) {
+ 		if ($res_url=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+ 		    $printed .= $curresline.':';
+ 		    my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
+ 		    my $lonidsdir=$r->dir_config('lonIDsDir');
+ 		    my $envfile=$env{'user.environment'};
+ 		    $envfile=~/\/([^\/]+)\.id$/;
+ 		    $envfile=$1;
+ 		    &Apache::lonnet::transfer_profile_to_env($lonidsdir,$envfile);
+ 		    my $current_counter=$env{'form.counter'};
+ 		    if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
+ 		       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
+ 			#   Use a copy of the hash so we don't pervert it on future loop passes.
+ 			my %answerenv = %{$moreenv};
+ 			$answerenv{'answer_output_mode'}='tex';
+ 			$answerenv{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+ 			my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$env{'request.course.id'},%answerenv);
+ 			&Apache::lonnet::appenv(('form.counter' => $current_counter));
+ 			if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+ 			    $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;
+ 			} else {
+ 			    $rendered=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+ 			    $rendered.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($curresline).'}\vskip 0 mm ';
+ 			    $rendered.=&path_to_problem ($curresline,$LaTeXwidth);
+ 			    $rendered.='\vskip 1 mm '.$ansrendered;
+ 			}
+ 		    }
+ 		    if ($remove_latex_header eq 'YES') {
+ 			$rendered = &latex_header_footer_remove($rendered);
+ 		    } else {
+ 			$rendered =~ s/\\end{document}//;
+ 		    }
+ 		    $current_output .= $rendered;
+ 		} elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
+ 		    $printed .= $curresline.':';
+ 		    my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
+ 		    my $lonidsdir=$r->dir_config('lonIDsDir');
+ 		    my $envfile=$env{'user.environment'};
+ 		    $envfile=~/\/([^\/]+)\.id$/;
+ 		    $envfile=$1;
+ 		    &Apache::lonnet::transfer_profile_to_env($lonidsdir,$envfile);
+ 		    my $current_counter=$env{'form.counter'};
+ 		    if ($remove_latex_header eq 'YES') {
+ 			$rendered = &latex_header_footer_remove($rendered);
+ 		    } else {
+ 			$rendered =~ s/\\end{document}//;
+ 		    }
+ 		    $current_output .= $rendered.'\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\strut \vskip 0 mm \strut ';
+ 		} else {
+ 		    my $rendered = &unsupported($res_url,$helper->{'VARS'}->{'LATEX_TYPE'});
+ 		    if ($remove_latex_header ne 'NO') {
+ 			$rendered = &latex_header_footer_remove($rendered);
+ 		    } else {
+ 			$rendered =~ s/\\end{document}//;
+ 		    }
+ 		    $current_output .= $rendered;
+ 		}
+ 	    }
+ 	    $remove_latex_header = 'YES';
+ 	}
+ 	if (&Apache::loncommon::connection_aborted($r)) { last; }
+     }
+     my $courseidinfo = &get_course();
+     if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
+     if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}
+     my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
+     if ($current_output=~/\\documentclass/) {
+ 	$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent\\lhead{\\textit{\\textbf{$fullname}}$courseidinfo \\hfill \\thepage \\\\ \\textit{$currentassignment}$namepostfix}}\\vskip 5 mm /;
+     } else {
+ 	my $blankpages = '';
+ 	for (my $j=0;$j<$helper->{'VARS'}->{'EMPTY_PAGES'};$j++) {$blankpages.='\clearpage\strut\clearpage';}
+ 	$current_output = '\strut\vspace*{-6 mm}\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\vspace*{-2 mm}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage '.$blankpages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$currentassignment.'}'.$namepostfix.'}} \vskip 5 mm '.$current_output;
+     }
+     return ($current_output,$fullname, $printed);
+ }
+ sub handler {
+     my $r = shift;
+     my $helper;
-     return OK;
-     }
  #    my $loaderror=&Apache::lonnet::overloaderror($r);
  #    if ($loaderror) { return $loaderror; }
  #    $loaderror=
  #       &Apache::lonnet::overloaderror($r,
- #         $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
+ #         $env{'course.'.$env{'request.course.id'}.'.home'});
  #    if ($loaderror) { return $loaderror; }
-     $r->content_type('text/html');
+     my $result = printHelper($r);
-     $r->send_http_header;
+     if (!ref($result)) {
-     $r->print(&Apache::loncommon::bodytag("Printing"));
+ 	return $result;
+     }
+     $helper = $result;
+ #	my $key;
+ #	foreach $key (keys %{$helper->{'VARS'}}) {
+ #	    $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<-<br />');
+ #	}
+ #	foreach $key (keys %env) {
+ #	    $r->print(' '.$key.'->'.$env{$key}.'<-<br />');
+ #	}
+ #	return OK;
-     if ($ENV{'request.course.id'}) {
+     my %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'});
- 	my $fn=$ENV{'request.course.fn'};
- 	tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640);
+ #	my $key;
-     }
+ #	foreach $key (keys %parmhash) {
+ #	    $r->print(' '.$key.'->'.$parmhash{$key}.'<-<br />');
- #-- start form
+ #	}
-     &headerform($r);
+ #
- #-- menu for output
-     unless  ($ENV{'form.phase'}) {
- 	&menu_for_output($r);
+     #  If a figure conversion queue file exists for this user.domain
-     }
+     # we delete it since it can only be bad (if it were good, printout.pl
- #-- additional menu for class printing
+     # would have deleted it the last time around.
-      if ($ENV{'form.phase'} eq 'two') {
- 	 if($ENV{'form.choice'} eq 'Standard LaTeX output for whole primary sequence') {
+     my $conversion_queuefile = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat";
- 	     &sequence_content_menu(0,$r);
+     if(-e $conversion_queuefile) {
- 	 } elsif($ENV{'form.choice'} eq 'Standard LaTeX output for the primary sequence') {
+ 	unlink $conversion_queuefile;
- 	     &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);
- 	 } else {
- 	     $ENV{'form.phase'} = 'three';
- 	 }
-      }
- #-- additional menu for page layout (one column case)
-     if ($ENV{'form.phase'} eq 'three') {
- 	if($ENV{'form.numberofcolumns'} == 1) {
- 	    &additional_print_menu($r);
- 	} else {
- 	    $ENV{'form.phase'} = 'four';
- 	}
      }
- #-- core part
+     &output_data($r,$helper,\%parmhash);
-     if ($ENV{'form.phase'} eq 'four') {
- 	&output_data($r);
-     }
-     untie %hash;
      return OK;
  }
  use Apache::lonhelper;
+ sub addMessage {
+     my $text = shift;
+     my $paramHash = Apache::lonhelper::getParamHash();
+     $paramHash->{MESSAGE_TEXT} = $text;
+     Apache::lonhelper::message->new();
+ }
+ use Data::Dumper;
  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'}) {
+         if ($env{'browser.mathml'}) {
-             $r->content_type('text/xml');
+             &Apache::loncommon::content_type($r,'text/xml');
          } else {
-             $r->content_type('text/html');
+             &Apache::loncommon::content_type($r,'text/html');
          }
          $r->send_http_header;
          return OK;
      }
      # Send header, nocache
-     if ($ENV{'browser.mathml'}) {
+     if ($env{'browser.mathml'}) {
-         $r->content_type('text/xml');
+         &Apache::loncommon::content_type($r,'text/xml');
      } else {
-         $r->content_type('text/html');
+         &Apache::loncommon::content_type($r,'text/html');
      }
      &Apache::loncommon::no_cache($r);
      $r->send_http_header;
- Line 1693  sub printHelper {
+ Line 1831  sub printHelper {
      Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});
-     my $helper = Apache::lonhelper::helper->new("Printing Wizard");
+     my $helper = Apache::lonhelper::helper->new("Printing Helper");
      $helper->declareVar('symb');
      $helper->declareVar('postdata');
+     $helper->declareVar('curseed');
+     $helper->declareVar('probstatus');
      $helper->declareVar('filename');
      $helper->declareVar('construction');
+     $helper->declareVar('assignment');
+     $helper->declareVar('style_file');
+     $helper->declareVar('student_sort');
+     $helper->declareVar('FINISHPAGE');
+     $helper->declareVar('PRINT_TYPE');
+     $helper->declareVar("showallfoils");
+     #  The page breaks can get loaded initially from the course environment:
+     if((!defined($env{"form.CURRENT_STATE"}))  ||
+        ($env{'form.CURRENT_STATE'} == "START")) {
+ 	$helper->{VARS}->{FINISHPAGE} = ""; # In case they did a back e.g.
+     }
+     &Apache::loncommon::restore_course_settings('print',
+ 						{'pagebreaks'  => 'scalar',
+ 					         'lastprinttype' => 'scalar'});
+     if("$helper->{VARS}->{PRINT_TYPE}" eq "$env{'form.lastprinttype'}") {
+ 	$helper->{VARS}->{FINISHPAGE} = $env{'form.pagebreaks'};
+     }
      # This will persistently load in the data we want from the
      # very first screen.
      # Detect whether we're coming from construction space
-     if ($ENV{'form.postdata'} =~ /http:\/\// ) {
+     if ($env{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {
-         $ENV{'form.postdata'} =~ /http:\/\/[a-zA-Z.]+\/~([a-zA-Z0-9]+)\/(.*)/;
+         $helper->{VARS}->{'filename'} = "~$1/$2";
-         $helper->{VARS}->{'filename'} = "/home/$1/public_html/$2";
          $helper->{VARS}->{'construction'} = 1;
      } else {
-         if ($ENV{'form.postdata'}) {
+         if ($env{'form.postdata'}) {
-             $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($ENV{'form.postdata'});
+             $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($env{'form.postdata'});
          }
-         if ($ENV{'form.symb'}) {
+         if ($env{'form.symb'}) {
-             $helper->{VARS}->{'symb'} = $ENV{'form.symb'};
+             $helper->{VARS}->{'symb'} = $env{'form.symb'};
          }
-         if ($ENV{'form.url'}) {
+         if ($env{'form.url'}) {
              $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
          }
      }
-     if ($ENV{'form.symb'}) {
+     if ($env{'form.symb'}) {
-         $helper->{VARS}->{'symb'} = $ENV{'form.symb'};
+         $helper->{VARS}->{'symb'} = $env{'form.symb'};
      }
-     if ($ENV{'form.url'}) {
+     if ($env{'form.url'}) {
          $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
      }
+     $helper->{VARS}->{'symb'}=
-     my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu;
+ 	&Apache::lonenc::check_encrypt($helper->{VARS}->{'symb'});
-     $helper->{VARS}->{'assignment'} = $sequenceTitle;
+     my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu($helper);
+     if ($sequenceTitle ne '') {$helper->{VARS}->{'assignment'}=$sequenceTitle;}
      # Extract map
- Line 1742  sub printHelper {
+ Line 1907  sub printHelper {
          $subdir = substr($helper->{VARS}->{'filename'},
 , rindex($helper->{VARS}->{'filename'}, '/') + 1);
      } else {
-         ($map, $id, $url) = split(/___/, $symb);
+         ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
-         $helper->{VARS}->{'postdata'} = Apache::lonnet::clutter($url);
+         $helper->{VARS}->{'postdata'} =
+ 	    &Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));
          if (!$resourceTitle) { # if the resource doesn't have a title, use the filename
-             my $url = $helper->{VARS}->{'postdata'};
+             my $postdata = $helper->{VARS}->{'postdata'};
-             $resourceTitle = substr($url, rindex($url, '/') + 1);
+             $resourceTitle = substr($postdata, rindex($postdata, '/') + 1);
          }
          $subdir = &Apache::lonnet::filelocation("", $url);
      }
+     if (!$helper->{VARS}->{'curseed'} && $env{'form.curseed'}) {
+ 	$helper->{VARS}->{'curseed'}=$env{'form.curseed'};
+     }
+     if (!$helper->{VARS}->{'probstatus'} && $env{'form.problemtype'}) {
+ 	$helper->{VARS}->{'probstatus'}=$env{'form.problemtype'};
+     }
+     my $userCanSeeHidden = Apache::lonnavmaps::advancedUser();
+     my $userPriviledged = ($env{'request.role'}=~m/^cc\./ or
+ 			   $env{'request.role'}=~m/^in\./ or
+ 			   $env{'request.role'}=~m/^ta\./);
      Apache::lonhelper::registerHelperTags();
      # "Delete everything after the last slash."
      $subdir =~ s|/[^/]+$||;
      if (not $helper->{VARS}->{'construction'}) {
- 	$subdir='/home/httpd/html/res/'.$subdir;
+ 	$subdir=$Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$subdir;
      }
+     # "Remove all duplicate slashes."
+     $subdir =~ s|/+|/|g;
      # What can be printed is a very dynamic decision based on
      # lots of factors. So we need to dynamically build this list.
- Line 1776  sub printHelper {
+ Line 1954  sub printHelper {
      my $paramHash;
      if ($resourceTitle) {
-         push @{$printChoices}, ["<b>$resourceTitle</b> (prints what you just saw on the screen)", 'current_document', 'PAGESIZE'];
+         push @{$printChoices}, ["<b><i>$resourceTitle</i></b> (".&mt('what you just saw on the screen').")", 'current_document', 'PAGESIZE'];
      }
-     $r->print($helper->{VARS}->{'postdata'});
+     # Useful filter strings
+     my $isProblem = '($res->is_problem()||$res->contains_problem) ';
+     $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
+     my $isProblemOrMap = '$res->is_problem() || $res->contains_problem() || $res->is_sequence()';
+     my $isNotMap = '!$res->is_sequence()';
+     $isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
+     my $isMap = '$res->is_map()';
+     my $symbFilter = '$res->shown_symb()';
+     my $urlValue = '$res->link()';
+     $helper->declareVar('SEQUENCE');
+     # Useful for debugging: Dump the help vars
+ #    $r->print(Dumper($helper->{VARS}));
+ #    $r->print($map);
      # If we're in a sequence...
-     if ($helper->{'VARS'}->{'construction'} ne '1') {
+     if (($helper->{'VARS'}->{'construction'} ne '1') &&
+ 	$helper->{VARS}->{'postdata'} &&
+ 	$helper->{VARS}->{'assignment'}) {
          # Allow problems from sequence
-         push @{$printChoices}, ["Problem(s) from <b>$sequenceTitle</b>", 'map_problems', 'CHOOSE_PROBLEMS'];
+         push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('in')." <b><i>$sequenceTitle</i></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'];
+         push @{$printChoices}, ["<b>".&mt('Resources')."</b> ".&mt('in')." <b><i>$sequenceTitle</i></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'>
+     <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
+               closeallpages="1">
        <nextstate>PAGESIZE</nextstate>
-       <filterfunc>return $isProblem</filterfunc>
+       <filterfunc>return $isProblem;</filterfunc>
        <mapurl>$map</mapurl>
-       <valuefunc>return $symb</valuefunc>
+       <valuefunc>return $symbFilter;</valuefunc>
+       <option text='Newpage' variable='FINISHPAGE' />
        </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'>
+     <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
+               closeallpages="1">
        <nextstate>PAGESIZE</nextstate>
        <filterfunc>return $isNotMap;</filterfunc>
        <mapurl>$map</mapurl>
-       <valuefunc>return $symb</valuefunc>
+       <valuefunc>return $symbFilter;</valuefunc>
+       <option text='Newpage' variable='FINISHPAGE' />
        </resource>
      </state>
  HELPERFRAGMENT
-         &Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
+ 	&Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
      }
-     # If the user is priviledged, allow them to print all
+     # If the user is privileged, allow them to print all
-     # problems in the course, optionally for selected students
+     # problems and resources  in the entier 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\//)) {
+     if ($userPriviledged &&
-         push @{$printChoices}, ['<b>Problems</b> in this course', 'all_problems', 'ALL_PROBLEMS'];
+         ($helper->{VARS}->{'postdata'}=~/\/res\// || $helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) {
-         push @{$printChoices}, ["Problems from <b>$sequenceTitle</b> for selected students", 'problems_for_students', 'CHOOSE_STUDENTS'];
+         push @{$printChoices}, ['<b>Problems</b> from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];
-         my $isProblem = '$res->is_problem();';
+ 	push @{$printChoices}, ['<b>Resources</b> from <b>entire course</b>', 'all_resources', 'ALL_RESOURCES'];
-         my $isProblemOrMap = '$res->is_problem() || $res->is_map()';
+          &Apache::lonxml::xmlparse($r, 'helper', <<ALL_PROBLEMS);
-         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">
+     <resource variable="RESOURCES" toponly='0' multichoice="1"
+ 	suppressEmptySequences='0' addstatus="1" closeallpages="1">
+       <nextstate>PAGESIZE</nextstate>
+       <filterfunc>return $isProblemOrMap;</filterfunc>
+       <choicefunc>return $isNotMap;</choicefunc>
+       <valuefunc>return $symbFilter;</valuefunc>
+       <option text='Newpage' variable='FINISHPAGE' />
+     </resource>
+   </state>
+   <state name="ALL_RESOURCES" title="Select Resource(s) to print">
+     <message>(Mark them then click "next" button) <br /> </message>
+     <resource variable="RESOURCES" toponly='0' multichoice='1'
+               suppressEmptySequences='0' addstatus='1' closeallpages='1'>
        <nextstate>PAGESIZE</nextstate>
-       <filterfunc>return $isProblemOrMap</filterfunc>
+       <filterfunc>return $isNotMap; </filterfunc>
-       <choicefunc>return $isProblem</choicefunc>
+       <valuefunc>return $symbFilter;</valuefunc>
-       <valuefunc>return $symb</valuefunc>
+       <option text='NewPage' variable='FINISHPAGE' />
+     </resource>
+   </state>
+ ALL_PROBLEMS
+ 	if ($helper->{VARS}->{'assignment'}) {
+ 	    push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('from')." <b><i>$sequenceTitle</i></b> ".&mt('for')." <b>".&mt('selected students')."</b>", 'problems_for_students', 'CHOOSE_STUDENTS'];
+ 	    push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('from')." <b><i>$sequenceTitle</i></b> ".&mt('for')." <b>".&mt('anonymous students')."</b>", 'problems_for_anon', 'CHOOSE_ANON1'];
+ 	}
+ 	my $resource_selector=<<RESOURCE_SELECTOR;
+    <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
+     <resource variable="RESOURCES" multichoice="1" addstatus="1"
+               closeallpages="1">
+       <filterfunc>return $isProblem;</filterfunc>
+       <mapurl>$map</mapurl>
+       <valuefunc>return $symbFilter;</valuefunc>
+       <option text='New Page' variable='FINISHPAGE' />
        </resource>
-     </state>
+     <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
+     <choices variable="EMPTY_PAGES">
+       <choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>
+       <choice computer='1'>Add one empty page/column after each student\'s assignment</choice>
+       <choice computer='2'>Add two empty pages/column after each student\'s assignment</choice>
+       <choice computer='3'>Add three empty pages/column after each student\'s assignment</choice>
+     </choices>
+     <message><hr width='33%' /><b>Number of assignments printed at the same time: </b></message>
+     <string variable="NUMBER_TO_PRINT" maxlength="5" size="5"><defaultvalue>"all"</defaultvalue></string>
+ RESOURCE_SELECTOR
-   <state name="CHOOSE_STUDENTS" title="Choose Students whose assignments you want to print">
+         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
-     <message>(do not forget to select assignment itself - make another selection below) <br /></message>
+   <state name="CHOOSE_STUDENTS" title="Select Students and Resources">
-     <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />
+       <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" coursepersonnel="1"/>
+       <message><b>Select sort order</b> </message>
+     <choices variable='student_sort'>
+       <choice computer='0'>Sort by section then student</choice>
+       <choice computer='1'>Sort by students across sections.</choice>
+     </choices>
+     $resource_selector
+   </state>
+ CHOOSE_STUDENTS
+ 	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ 	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+         my @names=&Apache::lonnet::getkeys('CODEs',$cdom,$cnum);
+ 	my $namechoice='<choice></choice>';
+ 	foreach my $name (sort {uc($a) cmp uc($b)} @names) {
+ 	    if ($name =~ /^error: 2 /) { next; }
+ 	    if ($name =~ /^type\0/) { next; }
+ 	    $namechoice.='<choice computer="'.$name.'">'.$name.'</choice>';
+ 	}
+ 	open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
+ 	my $codechoice='';
+ 	foreach my $line (<FH>) {
+ 	    my ($name,$description,$code_type,$code_length)=
+ 		(split(/:/,$line))[0,1,2,4];
+ 	    if ($code_length > 0 &&
+ 		$code_type =~/^(letter|number|-1)/) {
+ 		$codechoice.='<choice computer="'.$name.'">'.$description.'</choice>';
+ 	    }
+ 	}
+ 	if ($codechoice eq '') {
+ 	    $codechoice='<choice computer="default">Default</choice>';
+ 	}
+         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON1);
+   <state name="CHOOSE_ANON1" title="Select Students and Resources">
+     <nextstate>PAGESIZE</nextstate>
+     <message><hr width='33%' /></message>
+     <message><table><tr><td><b>Number of anonymous assignments to print?</b></td><td></message>
+     <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5">
+        <validator>
+ 	if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
+ 	    !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&
+             !\$helper->{'VARS'}{'SINGLE_CODE'}) {
+ 	    return "You need to specify the number of assignments to print";
+ 	}
+ 	return undef;
+        </validator>
+     </string>
+     <message></td></tr><tr><td></message>
+     <message><b>Value of CODE to print?</b></td><td></message>
+     <string variable="SINGLE_CODE" size="10" defaultvalue="zzzz">
+         <validator>
+ 	   if(!\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}           &&
+ 	      !\$helper->{'VARS'}{'REUSE_OLD_CODES'}) {
+ 	      return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},
+ 						      \$helper->{'VARS'}{'CODE_OPTION'});
+ 	   } else {
+ 	       return undef;	# Other forces control us.
+ 	   }
+         </validator>
+     </string>
+     <message></td></tr><tr><td></message>
+     <message><b>Names to store the CODEs under for later:</b></message>
+     <message></td><td></message>
+     <string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
+     <message></td></tr><tr><td></message>
+     <message><b>Bubble sheet type:</b></message>
+     <message></td><td></message>
+     <dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
+     $codechoice
+     </dropdown>
+     <message></td></tr></table></message>
+     <message><hr width='33%' /></message>
+     <message><b>Reprint a set of saved CODEs:</b></message>
+     <dropdown variable="REUSE_OLD_CODES">
+         $namechoice
+     </dropdown>
+     <message><hr width='33%' /></message>
+     $resource_selector
+   </state>
+ CHOOSE_ANON1
+ 	if ($helper->{VARS}->{'assignment'}) {
+ 	    push @{$printChoices}, ["<b>".&mt('Resources')."</b> ".&mt('from')." <b><i>$sequenceTitle</i></b> ".&mt('for')." <b>".&mt('selected students')."</b>", 'resources_for_students', 'CHOOSE_STUDENTS1'];
+ 	    push @{$printChoices}, ["<b>".&mt('Resources')."</b> ".&mt('from')." <b><i>$sequenceTitle</i></b> ".&mt('for')." <b>".&mt('anonymous students')."</b>", 'resources_for_anon', 'CHOOSE_ANON2'];
+ 	}
+ 	$resource_selector=<<RESOURCE_SELECTOR;
      <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
-     <resource variable="RESOURCES" multichoice="1">
+     <resource variable="RESOURCES" multichoice="1" addstatus="1"
-       <filterfunc>return $isProblem</filterfunc>
+               closeallpages="1">
+       <filterfunc>return $isNotMap;</filterfunc>
        <mapurl>$map</mapurl>
-       <valuefunc>return $symb</valuefunc>
+       <valuefunc>return $symbFilter;</valuefunc>
+       <option text='Newpage' variable='FINISHPAGE' />
        </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='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>
-       <choice computer='1'>Start student assignment from new page (add pagefeed after each student)</choice>
+       <choice computer='1'>Add one empty page/column after each student\'s assignment</choice>
-       <choice computer='2'>Add one emty page after each student assignment</choice>
+       <choice computer='2'>Add two empty pages/column after each student\'s assignment</choice>
-       <choice computer='3'>Add two emty page after each student assignment</choice>
+       <choice computer='3'>Add three empty pages/column after each student\'s assignment</choice>
-       </choices>
+     </choices>
+     <message><hr width='33%' /><b>Number of assignments printed at the same time: </b></message>
+     <string variable="NUMBER_TO_PRINT" maxlength="5" size="5"><defaultvalue>"all"</defaultvalue></string>
+ RESOURCE_SELECTOR
+ 	&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS1);
+   <state name="CHOOSE_STUDENTS1" title="Select Students and Resources">
+     <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" coursepersonnel="1" />
+     <choices variable='student_sort'>
+       <choice computer='0'>Sort by section then student</choice>
+       <choice computer='1'>Sort by students across sections.</choice>
+     </choices>
+     $resource_selector
      </state>
- CHOOSE_STUDENTS
+ CHOOSE_STUDENTS1
+ 	&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON2);
+   <state name="CHOOSE_ANON2" title="Select Students and Resources">
+     <nextstate>PAGESIZE</nextstate>
+     <message><table><tr><td><b>Number of anonymous assignments to print?</b></td><td></message>
+     <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5">
+        <validator>
+ 	if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
+ 	    !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&
+ 	    !\$helper->{'VARS'}{'SINGLE_CODE'}) {
+ 	    return "You need to specify the number of assignments to print";
+ 	}
+ 	return undef;
+        </validator>
+     </string>
+     <message></td></tr><tr><td></message>
+     <message><b>Value of CODE to print?</b></td><td></message>
+     <string variable="SINGLE_CODE" size="10" defaultvalue="zzzz">
+         <validator>
+ 	   if(!\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}           &&
+ 	      !\$helper->{'VARS'}{'REUSE_OLD_CODES'}) {
+ 	      return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},
+ 						      \$helper->{'VARS'}{'CODE_OPTION'});
+ 	   } else {
+ 	       return undef;	# Other forces control us.
+ 	   }
+         </validator>
+     </string>
+     <message></td></tr><tr><td></message>
+     <message><b>Names to store the CODEs under for later:</b></message>
+     <message></td><td></message>
+     <string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
+     <message></td></tr><tr><td></message>
+     <message><b>Bubble sheet type:</b></message>
+     <message></td><td></message>
+     <dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
+     $codechoice
+     </dropdown>
+     <message></td></tr></table></message>
+     <message><hr width='33%' /></message>
+     <message><b>Reprint a set of saved CODEs:</b></message>
+     <dropdown variable="REUSE_OLD_CODES">
+         $namechoice
+     </dropdown>
+     <message><hr width='33%' /></message>
+     $resource_selector
+   </state>
+ CHOOSE_ANON2
      }
      # 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'}) {
+     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'}) and $env{'request.role.adv'} and $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/') {
-         push @{$printChoices}, ["Problems from current subdirectory <b>$subdir</b>", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
+         push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('from current subdirectory')." <b><i>$subdir</i></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">
- Line 1870  CHOOSE_STUDENTS
+ Line 2251  CHOOSE_STUDENTS
        <filechoice>return '$subdir';</filechoice>
  CHOOSE_FROM_SUBDIR
+         # this is broken up because I really want interpolation above,
+         # and I really DON'T want it below
          $xmlfrag .= <<'CHOOSE_FROM_SUBDIR';
-       <filefilter>return $filename =~
+       <filefilter>return Apache::lonhelper::files::not_old_version($filename) &&
-            m/^[^\.]+\.(problem|exam|quiz|assess|survey|form|library)$/;
+ 	  $filename =~ m/\.(problem|exam|quiz|assess|survey|form|library)$/;
        </filefilter>
        </files>
      </state>
- Line 1880  CHOOSE_FROM_SUBDIR
+ Line 2263  CHOOSE_FROM_SUBDIR
          &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
      }
+     # Allow the user to select any sequence in the course, feed it to
+     # another resource selector for that sequence
+     if (!$helper->{VARS}->{'construction'}) {
+ 	push @$printChoices, ["<b>Resources</b> from <b>selected sequence</b> in course",
+ 			      'select_sequences', 'CHOOSE_SEQUENCE'];
+ 	my $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'};
+ 	#Escape apostrophes and backslashes for Perl
+ 	$escapedSequenceName =~ s/\\/\\\\/g;
+ 	$escapedSequenceName =~ s/'/\\'/g;
+ 	&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_FROM_ANY_SEQUENCE);
+   <state name="CHOOSE_SEQUENCE" title="Select Sequence To Print From">
+     <message>Select the sequence to print resources from:</message>
+     <resource variable="SEQUENCE">
+       <nextstate>CHOOSE_FROM_ANY_SEQUENCE</nextstate>
+       <filterfunc>return \$res->is_sequence;</filterfunc>
+       <valuefunc>return $urlValue;</valuefunc>
+       <option text='Newpage' variable='FINISHPAGE' />
+       </resource>
+     </state>
+   <state name="CHOOSE_FROM_ANY_SEQUENCE" title="Select Resources To Print">
+     <message>(mark desired resources then click "next" button) <br /></message>
+     <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
+               closeallpages="1">
+       <nextstate>PAGESIZE</nextstate>
+       <filterfunc>return $isProblem</filterfunc>
+       <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
+       <valuefunc>return $symbFilter;</valuefunc>
+       <option text='Newpage' variable='FINISHPAGE' />
+       </resource>
+     </state>
+ CHOOSE_FROM_ANY_SEQUENCE
+ }
      # Generate the first state, to select which resources get printed.
-     Apache::lonhelper::state->new("START", "What do you want to print? Make a choice.");
+     Apache::lonhelper::state->new("START", "Select Printing Options:");
      $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();
-     if (($ENV{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) or
+     my $startedTable = 0; # have we started an HTML table yet? (need
+                           # to close it later)
+     if (($env{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$env{'request.course.id'})) or
  	($helper->{VARS}->{'construction'} eq '1')) {
-         $paramHash = Apache::lonhelper::getParamHash();
+ 	addMessage("<hr width='33%' /><table><tr><td align='right'>Print: </td><td>");
-         $paramHash->{MESSAGE_TEXT} = "<br /><big><b><i>Next option is available only for advanced users:</i></b></big><br />";
-         Apache::lonhelper::message->new();
          $paramHash = Apache::lonhelper::getParamHash();
  	$paramHash->{'variable'} = 'ANSWER_TYPE';
  	$helper->declareVar('ANSWER_TYPE');
          $paramHash->{CHOICES} = [
-                                    ['Print without answer', 'yes'],
+                                    ['Without Answers', 'yes'],
-                                    ['Print with answers', 'no'] ];
+                                    ['With Answers', 'no'],
-         Apache::lonhelper::choices->new();
+                                    ['Only Answers', 'only']
+                                 ];
+         Apache::lonhelper::dropdown->new();
+ 	addMessage("</td></tr>");
+ 	$startedTable = 1;
+     }
+     if ($env{'request.role.adv'}) {
+ 	if (!$startedTable) {
+ 	    addMessage("<hr width='33%' /><table><tr><td align='right'>LaTeX mode: </td><td>");
+ 	    $startedTable = 1;
+ 	} else {
+ 	    addMessage("<tr><td align='right'>LaTeX mode: </td><td>");
+ 	}
+         $paramHash = Apache::lonhelper::getParamHash();
+ 	$paramHash->{'variable'} = 'LATEX_TYPE';
+ 	$helper->declareVar('LATEX_TYPE');
+ 	if ($helper->{VARS}->{'construction'} eq '1') {
+ 	    $paramHash->{CHOICES} = [
+ 				     ['standard LaTeX mode', 'standard'],
+ 				     ['LaTeX batchmode', 'batchmode'], ];
+ 	} else {
+ 	    $paramHash->{CHOICES} = [
+ 				     ['LaTeX batchmode', 'batchmode'],
+ 				     ['standard LaTeX mode', 'standard'] ];
+ 	}
+         Apache::lonhelper::dropdown->new();
+ 	addMessage("</td></tr><tr><td align='right'>Print Table of Contents: </td><td>");
+         $paramHash = Apache::lonhelper::getParamHash();
+ 	$paramHash->{'variable'} = 'TABLE_CONTENTS';
+ 	$helper->declareVar('TABLE_CONTENTS');
+         $paramHash->{CHOICES} = [
+                                    ['No', 'no'],
+                                    ['Yes', 'yes'] ];
+         Apache::lonhelper::dropdown->new();
+ 	addMessage("</td></tr>");
+ 	if (not $helper->{VARS}->{'construction'}) {
+ 	    addMessage("<tr><td align='right'>Print Index: </td><td>");
+ 	    $paramHash = Apache::lonhelper::getParamHash();
+ 	    $paramHash->{'variable'} = 'TABLE_INDEX';
+ 	    $helper->declareVar('TABLE_INDEX');
+ 	    $paramHash->{CHOICES} = [
+ 				     ['No', 'no'],
+ 				     ['Yes', 'yes'] ];
+ 	    Apache::lonhelper::dropdown->new();
+ 	    addMessage("</td></tr>");
+ 	    addMessage("<tr><td align='right'>Print Discussions: </td><td>");
+ 	    $paramHash = Apache::lonhelper::getParamHash();
+ 	    $paramHash->{'variable'} = 'PRINT_DISCUSSIONS';
+ 	    $helper->declareVar('PRINT_DISCUSSIONS');
+ 	    $paramHash->{CHOICES} = [
+ 				     ['No', 'no'],
+ 				     ['Yes', 'yes'] ];
+ 	    Apache::lonhelper::dropdown->new();
+ 	    addMessage("</td></tr>");
+             #  If advanced roles, then allow to show all foils.
+             if ($env{'request.role.adv'}) {
+ 		addMessage("<tr><td align = 'right'>  </td><td>");
+ 		$paramHash = Apache::lonhelper::getParamHash();
+ 		$paramHash->{'multichoice'} = "true";
+ 		$paramHash->{'allowempty'}  = "true";
+ 		$paramHash->{'variable'}   = "showallfoils";
+ 		$paramHash->{'CHOICES'} = [ ["Show all foils", "1"] ];
+ 		Apache::lonhelper::choices->new();
+ 		addMessage("</td></tr>");
+             }
+ 	}
+ 	if ($helper->{'VARS'}->{'construction'}) {
+ 	    my $stylevalue=$env{'construct.style'};
+ 	    my $xmlfrag .= <<"RNDSEED";
+ 	    <message><tr><td align='right'>Use random seed:  </td><td></message>
+ 	    <string variable="curseed" size="15" maxlength="15">
+ 		<defaultvalue>
+ 	            return $helper->{VARS}->{'curseed'};
+ 	        </defaultvalue>
+ 	    </string>
+ 	     <message></td></tr><tr><td align="right">Use style file:</td><td></message>
+              <message><input type="text" size="40" name="style_file_value" value="$stylevalue"  />&nbsp; <a href="javascript:openbrowser('helpform','style_file','sty')">Select style file</a> </td><tr><td></message>
+ 	     <choices allowempty="1" multichoice="true" variable="showallfoils">
+                 <choice computer="1">Show all foils?</choice>
+              </choices>
+ 	     <message></td></tr></message>
+ RNDSEED
+             &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
+ 	    $helper->{'VARS'}->{'style_file'}=$env{'form.style_file_value'};
+ 	}
+     }
+     if ($startedTable) {
+ 	addMessage("</table>");
      }
      Apache::lonprintout::page_format_state->new("FORMAT");
- Line 1923  CHOOSE_FROM_SUBDIR
+ Line 2439  CHOOSE_FROM_SUBDIR
      $r->print($helper->display());
-     Apache::lonhelper::unregisterHelperTags();
+     &Apache::lonhelper::unregisterHelperTags();
-     untie %hash;
      return OK;
  }
- Line 1963  use Apache::lonhelper;
+ Line 2477  use Apache::lonhelper;
  no strict;
  @ISA = ("Apache::lonhelper::element");
  use strict;
+ use Apache::lonlocal;
+ use Apache::lonnet;
  my $maxColumns = 2;
- my @paperSize = ("Letter [8 1/2x11 in]", "Legal [8 1/2x14 in]",
+ # it'd be nice if these all worked
-                  "Ledger/Tabloid [11x17 in]", "Executive [7 1/2x10 in]",
+ #my @paperSize = ("letter [8 1/2x11 in]", "legal [8 1/2x14 in]",
-                  "A2 [420x594 mm]", "A3 [297x420 mm]", "A4 [210x297 mm]",
+ #                 "tabloid (ledger) [11x17 in]", "executive [7 1/2x10 in]",
-                  "A5 [148x210 mm]", "A6 [105x148 mm]" );
+ #                 "a2 [420x594 mm]", "a3 [297x420 mm]", "a4 [210x297 mm]",
+ #                 "a5 [148x210 mm]", "a6 [105x148 mm]" );
+ my @paperSize = ("letter [8 1/2x11 in]", "legal [8 1/2x14 in]",
+ 		 "a4 [210x297 mm]");
  # Tentative format: Orientation (L = Landscape, P = portrait) | Colnum |
  #                   Paper type
- Line 1990  sub render {
+ Line 2509  sub render {
      my $helper = Apache::lonhelper::getHelper();
      my $result = '';
      my $var = $self->{'variable'};
+     my $PageLayout=&mt('Page layout');
+     my $NumberOfColumns=&mt('Number of columns');
+     my $PaperType=&mt('Paper type');
      $result .= <<STATEHTML;
- <p><big><i><b>What page format do you prefer?</b></i></big></p>
+ <hr width="33%" />
  <table cellpadding="3">
    <tr>
-     <td align="center"><b>Page layout</b></td>
+     <td align="center"><b>$PageLayout</b></td>
-     <td align="center"><b>Number of columns</b></td>
+     <td align="center"><b>$NumberOfColumns</b></td>
-     <td align="center"><b>Paper type</b></td>
+     <td align="center"><b>$PaperType</b></td>
    </tr>
    <tr>
      <td>
-       <input type="radio" name="${var}.layout" value="L" /> Landscape<br />
+       <label><input type="radio" name="${var}.layout" value="L" /> Landscape </label><br />
-       <input type="radio" name="${var}.layout" value="P" checked='1'  /> Portrait
+       <label><input type="radio" name="${var}.layout" value="P" checked='1'  /> Portrait </label>
      </td>
      <td align="center">
        <select name="${var}.cols">
- Line 2021  STATEHTML
+ Line 2542  STATEHTML
      $result .= "</select></td><td>\n";
      $result .= "<select name='${var}.paper'>\n";
+     my %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'});
+     my $DefaultPaperSize=$parmhash{'default_paper_size'};
+     if ($DefaultPaperSize eq '') {$DefaultPaperSize='letter';}
      $i = 0;
      foreach (@paperSize) {
-         if ($i == 0) {
+ 	$_=~/(\w+)/;
-             $result .= "<option selected value='$i'>" . $paperSize[$i] . "</option>\n";
+ 	my $papersize=$1;
+         if ($paperSize[$i]=~/$DefaultPaperSize/) {
+             $result .= "<option selected value='$papersize'>" . $paperSize[$i] . "</option>\n";
          } else {
-             $result .= "<option value='$i'>" . $paperSize[$i] . "</option>\n";
+             $result .= "<option value='$papersize'>" . $paperSize[$i] . "</option>\n";
          }
          $i++;
      }
      $result .= "</select></td></tr></table>";
      return $result;
  }
- Line 2041  sub postprocess {
+ Line 2566  sub postprocess {
      my $var = $self->{'variable'};
      my $helper = Apache::lonhelper->getHelper();
      $helper->{VARS}->{$var} =
-         $ENV{"form.$var.layout"} . '|' . $ENV{"form.$var.cols"} . '|' .
+         $env{"form.$var.layout"} . '|' . $env{"form.$var.cols"} . '|' .
-         $ENV{"form.$var.paper"};
+         $env{"form.$var.paper"};
      return 1;
  }
- Line 2072  is no tag interface. You actually pass p
+ Line 2597  is no tag interface. You actually pass p
  =cut
  use Apache::lonhelper;
+ use Apache::lonnet;
  no strict;
  @ISA = ("Apache::lonhelper::element");
  use strict;
- Line 2137  sub render {
+ Line 2662  sub render {
      <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'>
+       <select name='$var.lmarginunit'>
          <option>cm</option><option>in</option>
        </select>
      </td>
- Line 2145  sub render {
+ Line 2670  sub render {
  </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>
+ making the width much smaller than the width of the page.</p>
  ELEMENTHTML
- Line 2170  sub postprocess {
+ Line 2695  sub postprocess {
      my $var = $self->{'variable'};
      my $helper = Apache::lonhelper->getHelper();
-     my $width = $helper->{VARS}->{$var .'.width'} = $ENV{"form.${var}.width"};
+     my $width = $helper->{VARS}->{$var .'.width'} = $env{"form.${var}.width"};
-     my $height = $helper->{VARS}->{$var .'.height'} = $ENV{"form.${var}.height"};
+     my $height = $helper->{VARS}->{$var .'.height'} = $env{"form.${var}.height"};
-     my $lmargin = $helper->{VARS}->{$var .'.lmargin'} = $ENV{"form.${var}.lmargin"};
+     my $lmargin = $helper->{VARS}->{$var .'.lmargin'} = $env{"form.${var}.lmargin"};
-     $helper->{VARS}->{$var .'.widthunit'} = $ENV{"form.${var}.widthunit"};
+     $helper->{VARS}->{$var .'.widthunit'} = $env{"form.${var}.widthunit"};
-     $helper->{VARS}->{$var .'.heightunit'} = $ENV{"form.${var}.heightunit"};
+     $helper->{VARS}->{$var .'.heightunit'} = $env{"form.${var}.heightunit"};
-     $helper->{VARS}->{$var .'.lmarginunit'} = $ENV{"form.${var}.lmarginunit"};
+     $helper->{VARS}->{$var .'.lmarginunit'} = $env{"form.${var}.lmarginunit"};
      my $error = '';

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

Removed from v.1.170
changed lines
	Added in v.1.387