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

Diff for /loncom/interface/lonprintout.pm between versions 1.687 and 1.688

version 1.687, 2023/02/08 15:15:24 version 1.688, 2023/04/15 17:53:07
Line 453  sub generate_common_choosers { Line 453  sub generate_common_choosers {
         &get_randomly_ordered_warning($helper, $map);          &get_randomly_ordered_warning($helper, $map);
   
     # code for a few states used for printout launched from both       # code for a few states used for printout launched from both 
     # /adm/navmpas and from a resource by a privileged user:      # /adm/navmaps and from a resource by a privileged user:
     #   - To allow resources to be selected for printing.      #   - To allow resources to be selected for printing.
     #   - To determine pagination between assignments.      #   - To determine pagination between assignments.
     #   - To determine how many assignments should be bundled into a single PDF.      #   - To determine how many assignments should be bundled into a single PDF.
Line 769  sub course_print_dates { Line 769  sub course_print_dates {
     my @close_dates;      my @close_dates;
     my $navmap = $res->{NAV_MAP}; # Slightly OO dirty.      my $navmap = $res->{NAV_MAP}; # Slightly OO dirty.
   
     # Don't bother looping over undefined or empty parts arraY;      # Don't bother looping over undefined or empty parts array;
   
     if (@parts) {      if (@parts) {
  foreach my $part (@parts) {   foreach my $part (@parts) {
Line 795  sub map_print_dates { Line 795  sub map_print_dates {
     my $navmap = $res->{NAV_MAP}; # slightly OO dirty.      my $navmap = $res->{NAV_MAP}; # slightly OO dirty.
   
   
     # Don't bother looping over undefined or empty parts arraY;      # Don't bother looping over undefined or empty parts array;
   
     if (@parts) {      if (@parts) {
  foreach my $part (@parts) {   foreach my $part (@parts) {
Line 896  sub master_seq_to_person_seq { Line 896  sub master_seq_to_person_seq {
     my $iterator         = $navmap->getIterator($start,$finish,{},1);      my $iterator         = $navmap->getIterator($start,$finish,{},1);
   
     #  Iterate on the resource..select the items that are randomly selected      #  Iterate on the resource..select the items that are randomly selected
     #  and that are in the seq_has.  Presumably the iterator will take care      #  and that are in the seq_hash.  Presumably the iterator will take care
     # of the random ordering part of the deal.      # of the random ordering part of the deal.
     #      #
     my $curres;      my $curres;
Line 973  sub set_font_size { Line 973  sub set_font_size {
     my ($text) = @_;      my ($text) = @_;
   
     # There appear to be cases where the font directive is empty.. in which      # There appear to be cases where the font directive is empty.. in which
     # case the first substituion would  insert a spurious \ oh happy day.      # case the first substitution would insert a spurious \ oh happy day.
     # as this has been the cause of much mystery and hair pulling _sigh_      # as this has been the cause of much mystery and hair pulling _sigh_
   
     if ($font_size ne '') {      if ($font_size ne '') {
Line 992  sub set_font_size { Line 992  sub set_font_size {
 #  - The PDF, if necessary, is replicated.  #  - The PDF, if necessary, is replicated.
 #  - The PDF is added to the list of files to convert to postscript (along with the images).  #  - The PDF is added to the list of files to convert to postscript (along with the images).
 #  - The LaTeX is added to include the final converted postscript in the file as an included  #  - The LaTeX is added to include the final converted postscript in the file as an included
 #    job.  The assumption is that the includedpsheader.ps header will be included.  #    job.  The assumption is that the includepsheader.ps header will be included.
 #  #
 # Parameters:  # Parameters:
 #   pdf_uri   - URI of the PDF file to include.  #   pdf_uri   - URI of the PDF file to include.
Line 1016  sub include_pdf { Line 1016  sub include_pdf {
  $file = &Apache::lonnet::filelocation('',$pdf_uri);   $file = &Apache::lonnet::filelocation('',$pdf_uri);
     }      }
   
     #  The file isn ow replicated locally.. or it did not exist in the first place      #  The file is now replicated locally ... or it did not exist in the first place
     # (unlikely).  If it did exist, add the pdf to the set of files/images that      # (unlikely).  If it did exist, add the pdf to the set of files/images that
     # need tob e converted for this print job:      # need to be converted for this print job:
   
     my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};      my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
     $file =~ s{(.*)/res/}{$londocroot/res/};      $file =~ s{(.*)/res/}{$londocroot/res/};
Line 1155  sub printf_style_subst { Line 1155  sub printf_style_subst {
  if ($size ne "") {   if ($size ne "") {
     $subst = substr($subst, 0, $size);      $subst = substr($subst, 0, $size);
           
     #  Here's a nice edge case.. supose the end of the      #  Here's a nice edge case.. suppose the end of the
     #  substring is a \.  In that case may have  just      #  substring is a \.  In that case may have just
     #  chopped off a TeX escape... in that case, we append      #  chopped off a TeX escape... in that case, we append
     #   " " for the trailing character, and let the field       #   " " for the trailing character, and let the field 
     #  spill over a bit (sigh).      #  spill over a bit (sigh).
Line 1440  sub compare_names { Line 1440  sub compare_names {
     }      }
   
     # Break the tie on the first name, but there are leading (possibly trailing      # Break the tie on the first name, but there are leading (possibly trailing
     # whitespaces to get rid of first       # whitespaces to get rid of first)
     #      #
     $f1 =~ s/^\s+//; # Remove leading...      $f1 =~ s/^\s+//; # Remove leading...
     $f1 =~ s/\s+$//; # Trailing spaces from first 1...      $f1 =~ s/\s+$//; # Trailing spaces from first 1...
Line 2532  sub load_skips { Line 2532  sub load_skips {
   
     my ($helper)  = @_;      my ($helper)  = @_;
   
     #  If this is the first time, unrap the resources and extra spaces:      #  If this is the first time, unwrap the resources and extra spaces:
   
     if (!$skips_loaded) {      if (!$skips_loaded) {
  @extraspace = (split(/\|\|\|/, $helper->{'VARS'}->{'EXTRASPACE'}));   @extraspace = (split(/\|\|\|/, $helper->{'VARS'}->{'EXTRASPACE'}));
Line 2839  ENDPART Line 2839  ENDPART
     my @student_names=();      my @student_names=();
   
             
     #  Common settings for the %form has:      #  Common settings for the %form hash:
     # In some cases these settings get overriddent by specific cases, but the      # In some cases these settings get overridden by specific cases, but the
     # settings are common enough to make it worthwhile factoring them out      # settings are common enough to make it worthwhile factoring them out
     # here.      # here.
     #      #
Line 3797  sub print_resources { Line 3797  sub print_resources {
     #   nice to put the special in as a postscript comment      #   nice to put the special in as a postscript comment
     #   e.g. \special{ps:\ENDOFSTUDENTSTAMP}  unfortunately,      #   e.g. \special{ps:\ENDOFSTUDENTSTAMP}  unfortunately,
     #   The special gets passed the \ and dvips puts it in the output file      #   The special gets passed the \ and dvips puts it in the output file
     #   so we will just rely on prntout.pl to strip  ENDOFSTUDENTSTAMP from the      #   so we will just rely on printout.pl to strip  ENDOFSTUDENTSTAMP from the
     #   postscript.  Each ENDOFSTUDENTSTAMP will go on a line by itself.      #   postscript.  Each ENDOFSTUDENTSTAMP will go on a line by itself.
     #      #
   
Removed from v.1.687  
changed lines
  Added in v.1.688

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