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

Diff for /loncom/interface/lonprintout.pm between versions 1.216 and 1.223

version 1.216, 2003/08/18 18:18:48 version 1.223, 2003/08/25 17:25:05
Line 483  sub get_course { Line 483  sub get_course {
 sub page_format_transformation {  sub page_format_transformation {
     my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment,$tableofcontents,$indexlist) = @_;       my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment,$tableofcontents,$indexlist) = @_; 
     my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin);      my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin);
     $assignment=~s/_/ /g;      $assignment=&Apache::lonxml::latex_special_symbols($assignment,'header');
     if ($numberofcolumns != 1) {      if ($numberofcolumns != 1) {
  ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = &page_format($papersize,$layout,$numberofcolumns,$topmargin);   ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = &page_format($papersize,$layout,$numberofcolumns,$topmargin);
     } else {      } else {
Line 687  ENDPART Line 687  ENDPART
     if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {      if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
  $texversion=&IndexCreation($texversion,$currentURL);   $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;      $result .= $texversion;
     if ($currentURL=~m/\.page\s*$/) {      if ($currentURL=~m/\.page\s*$/) {
  ($result,$number_of_columns) = &page_cleanup($result);   ($result,$number_of_columns) = &page_cleanup($result);
Line 729  ENDPART Line 733  ENDPART
     }      }
     $form{'symb'}=$master_seq[$i];      $form{'symb'}=$master_seq[$i];
     $master_seq[$i]=~/(.*)___\d*___/;      $master_seq[$i]=~/(.*)___\d*___/;
     my $assignment=&Apache::lonnet::gettitle($1); #tittle of the assignment which contains this problem      my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($1),'header'); #tittle of the assignment which contains this problem
     #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]");      #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]");
     my $texversion=&Apache::lonnet::ssi($urlp,%form);      my $texversion=&Apache::lonnet::ssi($urlp,%form);
     if ($urlp=~/\.page$/) {      if ($urlp=~/\.page$/) {
Line 755  ENDPART Line 759  ENDPART
     }      }
     if (($selectionmade == 4) and ($assignment ne $prevassignment) and ($i>=1)) {      if (($selectionmade == 4) and ($assignment ne $prevassignment) and ($i>=1)) {
  my ($name,$courseidinfo) = &get_name;   my ($name,$courseidinfo) = &get_name;
  my $courseidinfo = &get_course();   $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 ';
Line 812  ENDPART Line 816  ENDPART
     }      }
     my $courseidinfo = &get_course();      my $courseidinfo = &get_course();
     if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }      if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
       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{$helper->{VARS}->{'assignment'}}}\\vskip 3 mm /;   $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}}$courseidinfo \\hfill \\thepage \\\\ \\textit{$currentassignment}}\\vskip 3 mm /;
     } else {      } else {
  my $blanspages = '';   my $blanspages = '';
  for (my $j=0;$j<$helper->{'VARS'}->{'EMPTY_PAGES'};$j++) {$blanspages.='\clearpage\strut\clearpage';}   for (my $j=0;$j<$helper->{'VARS'}->{'EMPTY_PAGES'};$j++) {$blanspages.='\clearpage\strut\clearpage';}
  $current_output = '\strut\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage '.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$helper->{VARS}->{'assignment'}.'}}} \vskip -5 mm '.$current_output;   $current_output = '\strut\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage '.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$currentassignment.'}}} \vskip -5 mm '.$current_output;
     }      }
     $result .= $current_output;      $result .= $current_output;
     &Apache::lonnet::delenv('form.counter');          &Apache::lonnet::delenv('form.counter');    
Line 886  ENDPART Line 890  ENDPART
  if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {   if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
     $texversion=&IndexCreation($texversion,$urlp);      $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;   $result .= $texversion;
     }      }
     $flag_latex_header_remove = 'YES';        $flag_latex_header_remove = 'YES';  
Line 963  sub handler { Line 971  sub handler {
   
 use Apache::lonhelper;  use Apache::lonhelper;
   
   sub addMessage {
       my $text = shift;
       my $paramHash = Apache::lonhelper::getParamHash();
       $paramHash->{MESSAGE_TEXT} = $text;
       Apache::lonhelper::message->new();
   }
   
 sub printHelper {  sub printHelper {
     my $r = shift;      my $r = shift;
   
Line 1147  HELPERFRAGMENT Line 1162  HELPERFRAGMENT
       </resource>        </resource>
     </state>      </state>
   
   <state name="CHOOSE_STUDENTS" title="Choose Students whose assignments you want to print">    <state name="CHOOSE_STUDENTS" title="Select Students and Resources">
     <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />      <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />
     <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>      <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">
Line 1190  CHOOSE_FROM_SUBDIR Line 1205  CHOOSE_FROM_SUBDIR
     }      }
   
     # Generate the first state, to select which resources get printed.      # 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 = Apache::lonhelper::getParamHash();
     $paramHash->{MESSAGE_TEXT} = "";      $paramHash->{MESSAGE_TEXT} = "";
     Apache::lonhelper::message->new();      Apache::lonhelper::message->new();
Line 1200  CHOOSE_FROM_SUBDIR Line 1215  CHOOSE_FROM_SUBDIR
     $paramHash->{CHOICES} = $printChoices;      $paramHash->{CHOICES} = $printChoices;
     Apache::lonhelper::choices->new();      Apache::lonhelper::choices->new();
   
       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       if (($ENV{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) or 
  ($helper->{VARS}->{'construction'} eq '1')) {   ($helper->{VARS}->{'construction'} eq '1')) {
         $paramHash = Apache::lonhelper::getParamHash();   addMessage("<hr width='33%' /><table><tr><td align='right'>Print With Answers:</td><td>");
         $paramHash->{MESSAGE_TEXT} = "<br /><big><b><i>Next four options are available only for advanced users:  </i></b></big><br />";  
         Apache::lonhelper::message->new();  
         $paramHash = Apache::lonhelper::getParamHash();          $paramHash = Apache::lonhelper::getParamHash();
  $paramHash->{'variable'} = 'ANSWER_TYPE';      $paramHash->{'variable'} = 'ANSWER_TYPE';   
  $helper->declareVar('ANSWER_TYPE');            $helper->declareVar('ANSWER_TYPE');         
         $paramHash->{CHOICES} = [          $paramHash->{CHOICES} = [
                                    ['Print without answer', 'yes'],                                     ['Yes', 'yes'],
                                    ['Print with answers', 'no'] ];                                     ['No', 'no'] ];
         Apache::lonhelper::dropdown->new();          Apache::lonhelper::dropdown->new();
    addMessage("</td></tr>");
    $startedTable = 1;
     }      }
   
     if ($ENV{'request.role.adv'}) {      if ($ENV{'request.role.adv'}) {
         $paramHash = Apache::lonhelper::getParamHash();   if (!$startedTable) {
         $paramHash->{MESSAGE_TEXT} = "<br />";      addMessage("<hr width='33%' /><table><tr><td align='right'>LaTeX mode: </td><td>");
         Apache::lonhelper::message->new();      $startedTable = 1;
    } else {
       addMessage("<tr><td align='right'>LaTeX mode: </td><td>");
    }
         $paramHash = Apache::lonhelper::getParamHash();          $paramHash = Apache::lonhelper::getParamHash();
  $paramHash->{'variable'} = 'LATEX_TYPE';      $paramHash->{'variable'} = 'LATEX_TYPE';   
  $helper->declareVar('LATEX_TYPE');     $helper->declareVar('LATEX_TYPE');  
  if ($helper->{VARS}->{'construction'} eq '1') {          if ($helper->{VARS}->{'construction'} eq '1') {       
     $paramHash->{CHOICES} = [      $paramHash->{CHOICES} = [
      ['Print in standard LaTeX mode', 'standard'],        ['standard LaTeX mode', 'standard'], 
      ['Print in LaTeX batchmode', 'batchmode'], ];       ['LaTeX batchmode', 'batchmode'], ];
  } else {   } else {
     $paramHash->{CHOICES} = [      $paramHash->{CHOICES} = [
      ['Print in LaTeX batchmode', 'batchmode'],       ['LaTeX batchmode', 'batchmode'],
      ['Print in standard LaTeX mode', 'standard'] ];       ['standard LaTeX mode', 'standard'] ];
  }   }
         Apache::lonhelper::dropdown->new();          Apache::lonhelper::dropdown->new();
     }    
    addMessage("</td></tr><tr><td align='right'>Print Table of Contents: </td><td>");
     if ($ENV{'request.role.adv'}) {  
         $paramHash = Apache::lonhelper::getParamHash();  
         $paramHash->{MESSAGE_TEXT} = "<br />";  
         Apache::lonhelper::message->new();  
         $paramHash = Apache::lonhelper::getParamHash();          $paramHash = Apache::lonhelper::getParamHash();
  $paramHash->{'variable'} = 'TABLE_CONTENTS';      $paramHash->{'variable'} = 'TABLE_CONTENTS';   
  $helper->declareVar('TABLE_CONTENTS');            $helper->declareVar('TABLE_CONTENTS');         
         $paramHash->{CHOICES} = [          $paramHash->{CHOICES} = [
                                    ['Print without Table of Contents', 'no'],                                     ['No', 'no'],
                                    ['Print with Table of Contents', 'yes'] ];                                     ['Yes', 'yes'] ];
         Apache::lonhelper::dropdown->new();          Apache::lonhelper::dropdown->new();
    addMessage("</td></tr>");
                   
         $paramHash = Apache::lonhelper::getParamHash();   if (not $helper->{VARS}->{'construction'}) {
         $paramHash->{MESSAGE_TEXT} = "<br />";      addMessage("<tr><td align='right'>Print Index: </td><td>");
         Apache::lonhelper::message->new();      $paramHash = Apache::lonhelper::getParamHash();
         $paramHash = Apache::lonhelper::getParamHash();      $paramHash->{'variable'} = 'TABLE_INDEX';   
  $paramHash->{'variable'} = 'TABLE_INDEX';         $helper->declareVar('TABLE_INDEX');         
  $helper->declareVar('TABLE_INDEX');               $paramHash->{CHOICES} = [
         $paramHash->{CHOICES} = [       ['No', 'no'],
                                    ['Print without Index', 'no'],       ['Yes', 'yes'] ];
                                    ['Print with Index', 'yes'] ];      Apache::lonhelper::dropdown->new();
         Apache::lonhelper::dropdown->new();      addMessage("</td></tr>");
    }
   
    if ($helper->{VARS}->{'construction'}) {
       addMessage("<tr><td align='right'>Print With URL: </td><td>");
       $paramHash = Apache::lonhelper::getParamHash();
       $paramHash->{'variable'} = 'CONSTR_RESOURSE_URL';   
       $helper->declareVar('CONSTR_RESOURSE_URL');         
       $paramHash->{CHOICES} = [
        ['No', 'no'],
        ['Yes', 'yes'] ];
       Apache::lonhelper::dropdown->new();
       addMessage("</td></tr>");
    }
       }
   
       if ($startedTable) {
    addMessage("</table>");
     }      }
   
     Apache::lonprintout::page_format_state->new("FORMAT");      Apache::lonprintout::page_format_state->new("FORMAT");
Line 1345  sub render { Line 1380  sub render {
   
     $result .= <<STATEHTML;      $result .= <<STATEHTML;
   
 <p><big><i><b>What page format do you prefer?</b></i></big></p>  <hr width="33%" />
 <table cellpadding="3">  <table cellpadding="3">
   <tr>    <tr>
     <td align="center"><b>Page layout</b></td>      <td align="center"><b>Page layout</b></td>
Removed from v.1.216  
changed lines
  Added in v.1.223

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