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

Diff for /loncom/interface/lonprintout.pm between versions 1.490 and 1.494

version 1.490, 2006/10/24 10:37:58 version 1.494, 2007/01/08 19:07:58
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 491  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 706  sub character_chart { Line 705  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 766  my %page_formats= Line 765  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 1166  sub print_construction_sequence { Line 1165  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 1980  sub print_resources { Line 1979  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.490  
changed lines
  Added in v.1.494

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