[BACK]Return to lonprintout.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonprintout.pm between versions 1.326 and 1.335

version 1.326, 2004/08/18 18:56:46 version 1.335, 2004/11/13 09:18:52
Line 41  use Apache::lonnavmaps; Line 41  use Apache::lonnavmaps;
 use Apache::lonratedt;  use Apache::lonratedt;
 use POSIX qw(strftime);  use POSIX qw(strftime);
 use Apache::lonlocal;  use Apache::lonlocal;
 use GDBM_File;  
   
   
 my %hash;  
 my $LaTeXwidth = 0;  my $LaTeXwidth = 0;
   
   
Line 229  sub character_chart { Line 226  sub character_chart {
     $result =~ s/&(\#219|Ucirc);/\\^{U}/g;      $result =~ s/&(\#219|Ucirc);/\\^{U}/g;
     $result =~ s/&(\#220|Uuml);/\\\"{U}/g;      $result =~ s/&(\#220|Uuml);/\\\"{U}/g;
     $result =~ s/&(\#221|Yacute);/\\\'{Y}/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/&(\#224|agrave);/\\\`{a}/g;
     $result =~ s/&(\#225|aacute);/\\\'{a}/g;      $result =~ s/&(\#225|aacute);/\\\'{a}/g;
     $result =~ s/&(\#226|acirc);/\\^{a}/g;      $result =~ s/&(\#226|acirc);/\\^{a}/g;
Line 373  sub character_chart { Line 370  sub character_chart {
 }  }
   
   
                     #width, height, oddsidemargin, evensidemargin, topmargin
   my %page_formats=
       ('letter' => {
    'book' => {
        '1' => [ '7.1 in','10.2 in', '-0.57 in','-0.57 in','0 in'],
        '2' => ['3.66 in','10.2 in', '-0.57 in','-0.57 in','0 in']
    },
    'album' => {
        '1' => [ '8.8 in', '6.8 in','-40 pt in',  '-60 pt','0 in'],
        '2' => [ '4.4 in', '6.8 in','-0.5 in', '-1.5 in','3.5 in']
    },
        },
        'legal' => {
    'book' => {
        '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']
    },
    'album' => {
        '1' => [],
        '2' => []
             },
        },
        'tabloid' => {
    'book' => {
        '1' => ['9.8 in','16 in','-0.57 in','-0.57 in','-0.5 in'],
        '2' => ['4.9 in','16 in','-0.57 in','-0.57 in','-0.5 in']
    },
    'album' => {
        '1' => [],
        '2' => []
             },
        },
        'executive' => {
    'book' => {
        '1' => ['6.8 in','9 in','-0.57 in','-0.57 in','1.2 in'],
        '2' => ['3.1 in','9 in','-0.57 in','-0.57 in','1.2 in']
    },
    'album' => {
        '1' => [],
        '2' => []
             },
        },
        'a2' => {
    'book' => {
        '1' => [],
        '2' => []
    },
    'album' => {
        '1' => [],
        '2' => []
             },
        },
        'a3' => {
    'book' => {
        '1' => [],
        '2' => []
    },
    'album' => {
        '1' => [],
        '2' => []
             },
        },
        'a4' => {
    '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 {  sub page_format {
 #  #
 #Supported paper format: "Letter [8 1/2x11 in]",      "Legal [8 1/2x14 in]",  #Supported paper format: "Letter [8 1/2x11 in]",      "Legal [8 1/2x14 in]",
Line 382  sub page_format { Line 473  sub page_format {
 #                        "A6 [105x148 mm]"  #                        "A6 [105x148 mm]"
 #   # 
     my ($papersize,$layout,$numberofcolumns) = @_;       my ($papersize,$layout,$numberofcolumns) = @_; 
     my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = (0,0,0,0,0);      return @{$page_formats{$papersize}->{$layout}->{$numberofcolumns}};
     my $page_formats={'book'=>{  
  '1'=>{'letter'=>{'width'=>'7.1 in','height'=>'10.2 in','topmargin'=>'0 in',  
               'oddsidemargin'=>'-0.57 in','evensidemargin'=>'-0.57 in',  
       },  
       'legal'=>{'width'=>'7.1 in','height'=>'13 in','topmargin'=>'-0.5 in',  
               'oddsidemargin'=>'-0.57 in','evensidemargin'=>'-0.57 in',  
       },  
       'tabloid'=>{'width'=>'9.8 in','height'=>'16 in','topmargin'=>'-0.5 in',  
               'oddsidemargin'=>'-0.57 in','evensidemargin'=>'-0.57 in',  
       },  
       'exacutive'=>{'width'=>'6.8 in','height'=>'9 in','topmargin'=>'1.2 in',  
               'oddsidemargin'=>'-0.57 in','evensidemargin'=>'-0.57 in',    
       },  
       'a2'=>{  
     
       },  
       'a3'=>{  
     
       },  
       'a4'=>{'width'=>'176 mm','height'=>'272 mm','topmargin'=>'-0.5 in',  
               'oddsidemargin'=>'-40 pt in','evensidemargin'=>'-60 pt',  
     
       },  
       'a5'=>{  
     
       },  
       'a6'=>{  
     
       },  
   },  
         '2'=>{'letter'=>{'width'=>'3.66 in','height'=>'10.2 in','topmargin'=>'0 in',  
               'oddsidemargin'=>'-0.57 in','evensidemargin'=>'-0.57 in',  
       },  
       'legal'=>{'width'=>'3.16 in','height'=>'13 in','topmargin'=>'-0.5 in',  
               'oddsidemargin'=>'-0.57 in','evensidemargin'=>'-0.57 in',    
       },  
       'tabloid'=>{'width'=>'4.9 in','height'=>'16 in','topmargin'=>'-0.5 in',  
               'oddsidemargin'=>'-0.57 in','evensidemargin'=>'-0.57 in',  
   
       },  
       'exacutive'=>{'width'=>'3.1 in','height'=>'9 in','topmargin'=>'1.2 in',  
               'oddsidemargin'=>'-0.57 in','evensidemargin'=>'-0.57 in',    
       },  
       'a2'=>{  
     
       },  
       'a3'=>{  
     
       },  
       'a4'=>{'width'=>'91 mm','height'=>'272 mm','topmargin'=>'-0.5 in',  
               'oddsidemargin'=>'-40 pt in','evensidemargin'=>'-60 pt',  
     
       },  
       'a5'=>{  
     
       },  
       'a6'=>{  
     
       },  
   
  },  
     },'album'=>{  
  '1'=>{'letter'=>{'width'=>'8.8 in','height'=>'6.8 in','topmargin'=>'0 in',  
               'oddsidemargin'=>'-40 pt in','evensidemargin'=>'-60 pt',  
       },  
       'legal'=>{  
     
       },  
       'tabloid'=>{  
   
       },  
       'exacutive'=>{  
     
       },  
       'a2'=>{  
     
       },  
       'a3'=>{  
     
       },  
       'a4'=>{'width'=>'8.5 in','height'=>'7.7 in','topmargin'=>'0 in',  
               'oddsidemargin'=>'-40 pt in','evensidemargin'=>'-60 pt',  
     
       },  
       'a5'=>{  
     
       },  
       'a6'=>{  
     
       },  
   },  
         '2'=>{'letter'=>{'width'=>'4.4 in','height'=>'6.8 in','topmargin'=>'3.5 in',  
               'oddsidemargin'=>'-0.5 in','evensidemargin'=>'-1.5 in',  
       },  
       'legal'=>{  
     
       },  
       'tabloid'=>{  
   
       },  
       'exacutive'=>{  
     
       },  
       'a2'=>{  
     
       },  
       'a3'=>{  
     
       },  
       'a4'=>{'width'=>'3.9 in','height'=>'7.7 in','topmargin'=>'0 in',  
               'oddsidemargin'=>'-40 pt in','evensidemargin'=>'-60 pt',  
     
       },  
       'a5'=>{  
     
       },  
       'a6'=>{  
     
       },  
   
      },  
    },  
     };      
     return $page_formats->{$layout}->{$numberofcolumns}->{$papersize}->{'width'},  
            $page_formats->{$layout}->{$numberofcolumns}->{$papersize}->{'height'},  
            $page_formats->{$layout}->{$numberofcolumns}->{$papersize}->{'oddmargin'},  
            $page_formats->{$layout}->{$numberofcolumns}->{$papersize}->{'evensidemargin'},  
            $page_formats->{$layout}->{$numberofcolumns}->{$papersize}->{'topmargin'};  
 }  }
   
   
Line 553  sub page_format_transformation { Line 516  sub page_format_transformation {
  $fancypagestatement="\\rhead{}\\chead{}\\lhead{\\textbf{$name} $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}";   $fancypagestatement="\\rhead{}\\chead{}\\lhead{\\textbf{$name} $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}";
     }      }
     if ($layout eq 'album') {      if ($layout eq 'album') {
     $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\pagestyle{fancy}$fancypagestatement\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1} /;      $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\\pagestyle{fancy}$fancypagestatement\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1} /;
     } elsif ($layout eq 'book') {      } elsif ($layout eq 'book') {
  if ($choice ne 'All class print') {    if ($choice ne 'All class print') { 
     $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset $topmargintoinsert\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\pagestyle{fancy}$fancypagestatement\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}/;      $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset $topmargintoinsert\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\\pagestyle{fancy}$fancypagestatement\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}/;
  } else {   } else {
     $text =~ s/\\pagestyle{fancy}\\rhead{}\\chead{}\s*\\begin{document}/\\textheight = $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset $topmargintoinsert\\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\\evensidemargin = $evenoffset $topmargintoinsert\\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 /;
  }   }
Line 588  sub page_cleanup { Line 551  sub page_cleanup {
   
   
 sub details_for_menu {  sub details_for_menu {
       my ($helper)=@_;
     my $name_of_resourse = &Apache::lonnet::gettitle($ENV{'form.postdata'});      my $postdata=$ENV{'form.postdata'};
     my $symbolic = &Apache::lonnet::symbread($ENV{'form.postdata'});      if (!$postdata) { $postdata=$helper->{VARS}{'postdata'}; }
       my $name_of_resource = &Apache::lonnet::gettitle($postdata);
       my $symbolic = &Apache::lonnet::symbread($postdata);
     my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symbolic);      my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symbolic);
     $map=&Apache::lonnet::clutter($map);      $map=&Apache::lonnet::clutter($map);
     my $name_of_sequence = &Apache::lonnet::gettitle($map);      my $name_of_sequence = &Apache::lonnet::gettitle($map);
Line 603  sub details_for_menu { Line 568  sub details_for_menu {
  $ENV{'request.course.uri'} =~ m|([^/]+)$|;   $ENV{'request.course.uri'} =~ m|([^/]+)$|;
  $name_of_map = $1;   $name_of_map = $1;
     }      }
     return ($name_of_resourse,$name_of_sequence,$name_of_map);      return ($name_of_resource,$name_of_sequence,$name_of_map);
   
 }  }
   
   
Line 699  sub print_latex_header { Line 663  sub print_latex_header {
 }  }
   
 sub path_to_problem {  sub path_to_problem {
     my ($urlp,$LaTeXwidth)=@_;      my ($urlp,$colwidth)=@_;
     my $newurlp = '';      my $newurlp = '';
     $LaTeXwidth=~s/\s*mm\s*$//;      $colwidth=~s/\s*mm\s*$//;
     my $HowMany = length($urlp)*2;  #characters average about 2 mm in width
     if ($HowMany > $LaTeXwidth) {      if (length($urlp)*2 > $LaTeXwidth) {
  my @temporrary = split '/',$urlp;   my @elements = split '/',$urlp;
  my $HowManyNew = 0;   my $curlength=0;
  for (my $ii=0;$ii<=$#temporrary;$ii++) {   foreach my $element (@elements) {
     if ($temporrary[$ii] ne '') {      if ($curlength+(length($element)*2) > $colwidth) {
  $HowManyNew += length($temporrary[$ii])*2;   $newurlp .=  '|\vskip -1 mm \noindent \verb|';
  if ($HowManyNew < $LaTeXwidth ) {   $curlength=0;
     $newurlp .=  '/'.$temporrary[$ii];      } else {
  } else {   $curlength+=length($element)*2;
     $HowManyNew = 0;  
     $newurlp .=  '|\vskip -1 mm \noindent \verb|';  
     $ii--;  
  }  
     }      }
       $newurlp.='/'.$element;
  }   }
     } else {      } else {
  $newurlp=$urlp;   $newurlp=$urlp;
Line 1052  ENDPART Line 1013  ENDPART
     my $courseidinfo = &get_course();      my $courseidinfo = &get_course();
     if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }      if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
     $prevassignment=$assignment;      $prevassignment=$assignment;
     $result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$name.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}} \vskip -5 mm ';      $result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$name.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}} \vskip 5 mm ';
  }   }
  $result .= $texversion;   $result .= $texversion;
  $flag_latex_header_remove = 'YES';      $flag_latex_header_remove = 'YES';   
Line 1080  ENDPART Line 1041  ENDPART
  $result .= $texversion;   $result .= $texversion;
  $flag_latex_header_remove = 'YES';      $flag_latex_header_remove = 'YES';   
     }          }    
       if (&Apache::loncommon::connection_aborted($r)) { last; }
  }   }
  &Apache::lonnet::delenv('form.counter');   &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}/;}
Line 1104  ENDPART Line 1066  ENDPART
  #loop over students   #loop over students
  my $flag_latex_header_remove = 'NO';    my $flag_latex_header_remove = 'NO'; 
  my %moreenv;   my %moreenv;
            $moreenv{'instructor_comments'}='hide';
  $moreenv{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);   $moreenv{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
  $moreenv{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};   $moreenv{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
  if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$moreenv{'problem_split'}='yes';}   if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$moreenv{'problem_split'}='yes';}
Line 1122  ENDPART Line 1085  ENDPART
      $student_names[$i].=$person.':'.$fullname.'_END_';       $student_names[$i].=$person.':'.$fullname.'_END_';
      &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,&mt('last student').' '.$fullname);       &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);   &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
  $result .= $print_array[0].'  \end{document}';   $result .= $print_array[0].'  \end{document}';
Line 1171  ENDPART Line 1135  ENDPART
        &mt('last assignment').' '.$fullname);         &mt('last assignment').' '.$fullname);
      $flag_latex_header_remove = 'YES';       $flag_latex_header_remove = 'YES';
      $count++;       $count++;
        if (&Apache::loncommon::connection_aborted($r)) { last; }
  }   }
  &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);   &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
  $result .= $print_array[0].'  \end{document}';   $result .= $print_array[0].'  \end{document}';
Line 1320  ENDPART Line 1285  ENDPART
  }   }
     }      }
   
     &Apache::lonnet::logthis("SSSSSSS: $filename,$laystyle,$papersize,$numberofcolumns,$selectionmade,$helper->{'VARS'}->{'TABLE_CONTENTS'},$helper->{'VARS'}->{'TABLE_INDEX'},$ENV{'request.role.adv'},$#print_array,$student_names,$URLback");  
   
   
     &Apache::lonnet::appenv('cgi.'.$identifier.'.file'   => $filename,      &Apache::lonnet::appenv('cgi.'.$identifier.'.file'   => $filename,
                             'cgi.'.$identifier.'.layout'  => $laystyle,                              'cgi.'.$identifier.'.layout'  => $laystyle,
                             'cgi.'.$identifier.'.numcol'  => $numberofcolumns,                              'cgi.'.$identifier.'.numcol'  => $numberofcolumns,
Line 1395  sub print_resources { Line 1357  sub print_resources {
     my $current_counter=$ENV{'form.counter'};      my $current_counter=$ENV{'form.counter'};
     if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||      if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
        ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {         ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
  my %form;   $moreenv->{'answer_output_mode'}='tex';
  $form{'answer_output_mode'}='tex';   $moreenv->{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
  $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};   my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$ENV{'request.course.id'},%{$moreenv});
  my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$ENV{'request.course.id'},%form);  
  &Apache::lonnet::appenv(('form.counter' => $current_counter));   &Apache::lonnet::appenv(('form.counter' => $current_counter));
  if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {   if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
     $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;      $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;
Line 1441  sub print_resources { Line 1402  sub print_resources {
     }      }
     $remove_latex_header = 'YES';      $remove_latex_header = 'YES';
  }   }
    if (&Apache::loncommon::connection_aborted($r)) { last; }
     }      }
     my $courseidinfo = &get_course();      my $courseidinfo = &get_course();
     if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }      if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
     if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}      if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}
     my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');      my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
     if ($current_output=~/\\documentclass/) {      if ($current_output=~/\\documentclass/) {
  $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}}$courseidinfo \\hfill \\thepage \\\\ \\textit{$currentassignment}$namepostfix}\\vskip 3 mm /;   $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 {      } else {
  my $blankpages = '';   my $blankpages = '';
  for (my $j=0;$j<$helper->{'VARS'}->{'EMPTY_PAGES'};$j++) {$blankpages.='\clearpage\strut\clearpage';}   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;   $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);      return ($current_output,$fullname);
   
Line 1510  use Data::Dumper; Line 1472  use Data::Dumper;
 sub printHelper {  sub printHelper {
     my $r = shift;      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 ($r->header_only) {
         if ($ENV{'browser.mathml'}) {          if ($ENV{'browser.mathml'}) {
             &Apache::loncommon::content_type($r,'text/xml');              &Apache::loncommon::content_type($r,'text/xml');
Line 1576  sub printHelper { Line 1533  sub printHelper {
   
     }      }
           
     my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu;      my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu($helper);
     if ($sequenceTitle ne '') {$helper->{VARS}->{'assignment'}=$sequenceTitle;}      if ($sequenceTitle ne '') {$helper->{VARS}->{'assignment'}=$sequenceTitle;}
   
           
Line 1999  RNDSEED Line 1956  RNDSEED
   
     $r->print($helper->display());      $r->print($helper->display());
   
     Apache::lonhelper::unregisterHelperTags();      &Apache::lonhelper::unregisterHelperTags();
   
     untie %hash;  
   
     return OK;      return OK;
 }  }
Line 2043  use Apache::lonlocal; Line 1998  use Apache::lonlocal;
   
 my $maxColumns = 2;  my $maxColumns = 2;
 my @paperSize = ("letter [8 1/2x11 in]", "legal [8 1/2x14 in]",   my @paperSize = ("letter [8 1/2x11 in]", "legal [8 1/2x14 in]", 
                  "tabloid (ladger) [11x17 in]", "executive [7 1/2x10 in]",                   "tabloid (ledger) [11x17 in]", "executive [7 1/2x10 in]",
                  "a2 [420x594 mm]", "a3 [297x420 mm]", "a4 [210x297 mm]",                    "a2 [420x594 mm]", "a3 [297x420 mm]", "a4 [210x297 mm]", 
                  "a5 [148x210 mm]", "a6 [105x148 mm]" );                   "a5 [148x210 mm]", "a6 [105x148 mm]" );
   
Removed from v.1.326  
changed lines
  Added in v.1.335

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