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

Diff for /loncom/interface/lonprintout.pm between versions 1.489 and 1.495

version 1.489, 2006/10/23 10:40:09 version 1.495, 2007/01/15 11:53:50
Line 38  use Apache::grades; Line 38  use Apache::grades;
 use Apache::edit;  use Apache::edit;
 use Apache::File();  use Apache::File();
 use Apache::lonnavmaps;  use Apache::lonnavmaps;
 use Apache::lonratedt;  use LONCAPA::map();
 use POSIX qw(strftime);  use POSIX qw(strftime);
 use Apache::lonlocal;  use Apache::lonlocal;
 use Carp;  use Carp;
 use lib '/home/httpd/lib/perl/';  
 use LONCAPA;  use LONCAPA;
   
 my %perm;  my %perm;
Line 61  my $resources_printed; Line 60  my $resources_printed;
 #  #
 sub printf_style_subst {  sub printf_style_subst {
     my ($item, $format_string, $repl) = @_;      my ($item, $format_string, $repl) = @_;
       my $result = "";
     while ($format_string =~m/%\d*\Q$item\E/) {      while ($format_string =~ /(%)(\d*)\Q$item\E/g ) {
  my $fmt = $1;   my $fmt = $1;
  my $size = $2;   my $size = $2;
  my $subst = $repl;   my $subst = $repl;
  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
       #  substring is a \.  In that case may have  just
       #  chopped off a TeX escape... in that case, we append
       #   " " for the trailing character, and let the field 
       #  spill over a bit (sigh).
       #  We don't just chop off the last character in order to deal
       #  with one last pathology, and that would be if substr had
       #  trimmed us to e.g. \\\  
   
   
       if ($subst =~ /\\$/) {
    $subst .= " ";
       }
  }   }
  my $newpos =  pos($format_string) + length($subst) - length($fmt);   my $item_pos = pos($format_string);
  $format_string =~ s/\Q$fmt\E/$subst/;   $result .= substr($format_string, 0, $item_pos - length($size) -2) . $subst;
  pos($format_string)=$newpos;          $format_string = substr($format_string, pos($format_string));
     }      }
     return $format_string;  
       # Put the residual format string into the result:
   
       $result .= $format_string;
   
       return $result;
 }  }
   
   
Line 133  sub format_page_header { Line 151  sub format_page_header {
  # to \% else LaTeX will think they are comments and terminate   # to \% else LaTeX will think they are comments and terminate
  # the line.. which is bad!!!   # the line.. which is bad!!!
   
  $format =~ s/%/\\%/g;  
     }      }
           
   
Line 157  sub num_to_letters { Line 175  sub num_to_letters {
 sub letters_to_num {  sub letters_to_num {
     my ($letters) = @_;      my ($letters) = @_;
     my @letters = split('', uc($letters));      my @letters = split('', uc($letters));
     my %substitution;     my %substitution;
     my $digit = 0;      my $digit = 0;
     foreach my $letter ('A'..'J') {      foreach my $letter ('A'..'J') {
  $substitution{$letter} = $digit;   $substitution{$letter} = $digit;
Line 472  sub character_chart { Line 490  sub character_chart {
     $result =~ s/&\#147;/\`\`/g;      $result =~ s/&\#147;/\`\`/g;
     $result =~ s/&\#148;/\'\'/g;      $result =~ s/&\#148;/\'\'/g;
     $result =~ s/&\#149;/\\ensuremath\{\\bullet\}/g;      $result =~ s/&\#149;/\\ensuremath\{\\bullet\}/g;
     $result =~ s/&\#150;/--/g;      $result =~ s/&(\#150|\#8211);/--/g;
     $result =~ s/&\#151;/---/g;      $result =~ s/&\#151;/---/g;
     $result =~ s/&\#152;/\\ensuremath\{\\sim\}/g;      $result =~ s/&\#152;/\\ensuremath\{\\sim\}/g;
     $result =~ s/&\#153;/\\texttrademark /g;      $result =~ s/&\#153;/\\texttrademark /g;
Line 679  sub character_chart { Line 697  sub character_chart {
     $result =~ s/&(clubs|\#9827);/\\ensuremath\{\\clubsuit\}/g;      $result =~ s/&(clubs|\#9827);/\\ensuremath\{\\clubsuit\}/g;
     $result =~ s/&(hearts|\#9829);/\\ensuremath\{\\heartsuit\}/g;      $result =~ s/&(hearts|\#9829);/\\ensuremath\{\\heartsuit\}/g;
     $result =~ s/&(diams|\#9830);/\\ensuremath\{\\diamondsuit\}/g;      $result =~ s/&(diams|\#9830);/\\ensuremath\{\\diamondsuit\}/g;
   #   Chemically useful 'things' contributed by Hon Kie (bug 4652).
       $result =~ s/&\#8636;/\\ensuremath\{\\leftharpoonup\}/g;
       $result =~ s/&\#8637;/\\ensuremath\{\\leftharpoondown\}/g;
       $result =~ s/&\#8640;/\\ensuremath\{\\rightharpoonup\}/g;
       $result =~ s/&\#8641;/\\ensuremath\{\\rightharpoondown\}/g;
       $result =~ s/&\#8652;/\\ensuremath\{\\rightleftharpoons\}/g;
       $result =~ s/&\#8605;/\\ensuremath\{\\leadsto\}/g;
       $result =~ s/&\#8617;/\\ensuremath\{\\hookleftarrow\}/g;
       $result =~ s/&\#8618;/\\ensuremath\{\\hookrightarrow\}/g;
       $result =~ s/&\#8614;/\\ensuremath\{\\mapsto\}/g;
       $result =~ s/&\#8599;/\\ensuremath\{\\nearrow\}/g;
       $result =~ s/&\#8600;/\\ensuremath\{\\searrow\}/g;
       $result =~ s/&\#8601;/\\ensuremath\{\\swarrow\}/g;
       $result =~ s/&\#8598;/\\ensuremath\{\\nwarrow\}/g;
     return $result;      return $result;
 }  }
   
Line 687  sub character_chart { Line 719  sub character_chart {
 my %page_formats=  my %page_formats=
     ('letter' => {      ('letter' => {
  'book' => {   'book' => {
      '1' => [ '7.1 in','9.8 in', '-0.57 in','-0.57 in','0.7 cm'],       '1' => [ '7.1 in','9.8 in', '-0.57 in','-0.57 in','0.275 in'],
      '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.275 in']
  },   },
  'album' => {   'album' => {
      '1' => [ '8.8 in', '6.8 in','-0.55 in',  '-0.55 in','1 cm'],       '1' => [ '8.8 in', '6.8 in','-0.55 in',  '-0.55 in','1.0 in'],
      '2' => [ '4.8 in', '6.8 in','-0.5 in', '-1.0 in','3.5 in']       '2' => [ '4.8 in', '6.8 in','-0.5 in', '-1.0 in','3.5 in']
  },   },
      },       },
Line 747  my %page_formats= Line 779  my %page_formats=
      },       },
      'a4' => {       'a4' => {
  'book' => {   'book' => {
      '1' => ['17.6 cm','27.2 cm','-0.55  in','-0.83 in','-0.5 in'],       '1' => ['17.6 cm','27.2 cm','-1.397 cm','-2.11 cm','-1.27 cm'],
      '2' => [ '9.1 cm','27.2 cm','-0.55  in','-0.83 in','-0.5 in']       '2' => [ '9.1 cm','27.2 cm','-1.397 c,','-2.11 cm','-1.27 cm']
  },   },
  'album' => {   'album' => {
      '1' => ['8.5 in','7.7 in','-0.55 in','-0.83 in','0 in'],       '1' => ['21.59 cm','19.558 cm','-1.27 cm','-2.11 cm','0 cm'],
      '2' => ['3.9 in','7.7 in','-0.55 in','-0.83 in','0 in']       '2' => ['9.91 cm','19.558 cm','-1.397 cm','-2.11 cm','0 cm']
  },   },
      },       },
      'a5' => {       'a5' => {
Line 1147  sub print_construction_sequence { Line 1179  sub print_construction_sequence {
     if ($helper->{'VARS'}->{'curseed'}) {      if ($helper->{'VARS'}->{'curseed'}) {
  $rndseed=$helper->{'VARS'}->{'curseed'};   $rndseed=$helper->{'VARS'}->{'curseed'};
     }      }
     my $errtext=&Apache::lonratedt::mapread($currentURL);      my $errtext=&LONCAPA::map::mapread($currentURL);
     #       # 
     #  These make this all support recursing for subsequences.      #  These make this all support recursing for subsequences.
     #      #
     my @order    = @Apache::lonratedt::order;      my @order    = @LONCAPA::map::order;
     my @resources = @Apache::lonratedt::resources;       my @resources = @LONCAPA::map::resources; 
     for (my $member=0;$member<=$#order;$member++) {      for (my $member=0;$member<=$#order;$member++) {
  $resources[$order[$member]]=~/^([^:]*):([^:]*):/;   $resources[$order[$member]]=~/^([^:]*):([^:]*):/;
  my $urlp=$2;   my $urlp=$2;
Line 1961  sub print_resources { Line 1993  sub print_resources {
     my $printed = '';      my $printed = '';
     my ($username,$userdomain,$usersection) = split /:/,$person;      my ($username,$userdomain,$usersection) = split /:/,$person;
     my $fullname = &get_name($username,$userdomain);      my $fullname = &get_name($username,$userdomain);
     my $namepostfix;      my $namepostfix = "\\\\"; # Both anon and not anon should get the same vspace.
     if ($person =~ 'anon') {      if ($person =~ 'anon') {
  $namepostfix="\\\\Name: ";   $namepostfix .="Name: ";
  $fullname = "CODE - ".$moreenv->{'CODE'};   $fullname = "CODE - ".$moreenv->{'CODE'};
     }      }
     #  Fullname may have special latex characters that need \ prefixing:      #  Fullname may have special latex characters that need \ prefixing:
Removed from v.1.489  
changed lines
  Added in v.1.495

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