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

Diff for /loncom/interface/lonprintout.pm between versions 1.483 and 1.487

version 1.483, 2006/08/28 11:11:49 version 1.487, 2006/10/17 09:56:16
Line 23 Line 23
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #  #
 # /home/httpd/html/adm/gpl.txt  # /home/httpd/html/adm/gpl.txt
 #  
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 #  #
Line 50  my %perm; Line 49  my %perm;
 my %parmhash;  my %parmhash;
 my $resources_printed;  my $resources_printed;
   
   #
   #   printf_style_subst  item format_string repl
   #  
   # Does printf style substitution for a format string that
   # can have %[n]item in it.. wherever, %[n]item occurs,
   # rep is substituted in format_string.  Note that
   # [n] is an optional integer length.  If provided,
   # repl is truncated to at most [n] characters prior to 
   # substitution.
   #
   sub printf_style_subst {
       my ($item, $format_string, $repl) = @_;
   
       while ($format_string =~ /%\d*\Q$item\E/) {
    my $start = $-[0];
    my $end   = $+[0];
    my $len   = $end - $start;
   
    # see if we need to truncate:
   
    my $subst = $repl;
    my $fmt   = substr($format_string, $start, $len);
    my $size  = $fmt;
    $size     =~ s/%(\d*)\Q$item\E/$1/;
    if ($size ne "") {
       $subst = substr($subst, 0, $size);
    }
    $format_string =~ s/%(\d*)\Q$item\E/$subst/;
   
       }
   
       return $format_string;
   }
   
   
 # Format a header according to a format.    # Format a header according to a format.  
 #   # 
Line 60  my $resources_printed; Line 93  my $resources_printed;
 #     %n    - Student name.  #     %n    - Student name.
 #  #
 sub format_page_header {  sub format_page_header {
     my ($format, $assignment, $course, $student) = @_;      my ($width, $format, $assignment, $course, $student) = @_;
           
       $width = &recalcto_mm($width); # Get width in mm.
     #  Default format?      #  Default format?
   
     if ($format eq '') {      if ($format eq '') {
    # For the default format, we may need to truncate
    # elements..  To do this we need to get the page width.
    # we assume that each character is about 2mm in width.
    # (correct for the header text size??).  We ignore
    # any formatting (e.g. boldfacing in this).
    # 
    # - Allow the student/course to be one line.
    #   but only truncate the course.
    # - Allow the assignment to be 2 lines (wrapped).
    #
    my $chars_per_line = $width/2; # Character/textline.
   
   
    my $firstline = "$student $course";
    if (length($firstline) > $chars_per_line) {
       my $lastchar = $chars_per_line - length($student) - 1;
       if ($lastchar > 0) {
    $course = substr($course, 0, $lastchar);
       } else { # Nothing left of course:
    $course = '';
       }
    }
    if (length($assignment) > $chars_per_line) {
       $assignment = substr($assignment, 0, $chars_per_line);
    }
   
  $format =  "\\textbf{$student} $course \\hfill \\thepage \\\\ \\textit{$assignment}";   $format =  "\\textbf{$student} $course \\hfill \\thepage \\\\ \\textit{$assignment}";
   
     } else {      } else {
  $format =~ s/%a/$assignment/g;   # An open question is how to handle long user formatted page headers...
  $format =~ s/%c/$course/g;   # A possible future is to support e.g. %na so that the user can control
  $format =~ s/%n/$student/g;   # the truncation of the elements that can appear in the header.
    #
    $format =  &printf_style_subst("a", $format, $assignment);
    $format =  &printf_style_subst("c", $format, $course);
    $format =  &printf_style_subst("n", $format, $student);
     }      }
           
   
Line 628  my %page_formats= Line 692  my %page_formats=
      '2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','0.7 cm']       '2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','0.7 cm']
  },   },
  'album' => {   'album' => {
      '1' => [ '8.8 in', '6.8 in','-0.55 in',  '-0.83 in','1 cm'],       '1' => [ '8.8 in', '6.8 in','-0.55 in',  '-0.55 in','1 cm'],
      '2' => [ '4.4 in', '6.8 in','-0.5 in', '-1.5 in','3.5 in']       '2' => [ '4.8 in', '6.8 in','-0.5 in', '-1.0 in','3.5 in']
  },   },
      },       },
      'legal' => {       'legal' => {
Line 761  sub page_format_transformation { Line 825  sub page_format_transformation {
     my $courseidinfo = &get_course();      my $courseidinfo = &get_course();
     if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }      if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
     my $header_text  = $parmhash{'print_header_format'};      my $header_text  = $parmhash{'print_header_format'};
     $header_text     = &format_page_header($header_text, $assignment,      $header_text     = &format_page_header($textwidth, $header_text, $assignment,
    $courseidinfo, $name);     $courseidinfo, $name);
     my $topmargintoinsert = '';      my $topmargintoinsert = '';
     if ($topmargin ne '0') {$topmargintoinsert='\setlength{\topmargin}{'.$topmargin.'}';}      if ($topmargin ne '0') {$topmargintoinsert='\setlength{\topmargin}{'.$topmargin.'}';}
Line 1467  ENDPART Line 1531  ENDPART
     if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }      if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
     $prevassignment=$assignment;      $prevassignment=$assignment;
     my $header_text = $parmhash{'print_header_format'};      my $header_text = $parmhash{'print_header_format'};
     $header_text    = &format_page_header($header_text,      $header_text    = &format_page_header($textwidth, $header_text,
   $assignment,     $assignment, 
   $courseidinfo,     $courseidinfo, 
   $name);    $name);
Line 2005  sub print_resources { Line 2069  sub print_resources {
     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');
     my $header_line =      my $header_line =
  &format_page_header($parmhash{'print_header_format'},   &format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
     $currentassignment, $courseidinfo, $fullname);      $currentassignment, $courseidinfo, $fullname);
     my $header_start = ($columns_in_format == 1) ? '\lhead'      my $header_start = ($columns_in_format == 1) ? '\lhead'
                                          : '\fancyhead[LO]';                                           : '\fancyhead[LO]';
Line 2383  RESOURCE_SELECTOR Line 2447  RESOURCE_SELECTOR
   
         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);          &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
   <state name="CHOOSE_STUDENTS" title="Select Students and Resources">    <state name="CHOOSE_STUDENTS" title="Select Students and Resources">
       <message><b>Select sort order</b> </message>        <message><b>Select sorting order of printout</b> </message>
     <choices variable='student_sort'>      <choices variable='student_sort'>
       <choice computer='0'>Sort by section then student</choice>        <choice computer='0'>Sort by section then student</choice>
       <choice computer='1'>Sort by students across sections.</choice>        <choice computer='1'>Sort by students across sections.</choice>
Removed from v.1.483  
changed lines
  Added in v.1.487

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