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

Diff for /loncom/interface/lonprintout.pm between versions 1.703 and 1.705

version 1.703, 2024/11/11 00:43:39 version 1.705, 2024/12/10 04:52:30
Line 812  sub map_print_dates { Line 812  sub map_print_dates {
 # Parameters:  # Parameters:
 #   $username - Name of user for whom we are checking.  #   $username - Name of user for whom we are checking.
 #   $domain   - Domain of user we are checking.  #   $domain   - Domain of user we are checking.
   #   $section  - Section for user for whom we are checking.
 #   $map - map name.  #   $map - map name.
 # Returns:  # Returns:
 #     0 - map is not incomplete.  #     0 - map is not incomplete.
 #     1 - map is incomplete.  #     1 - map is incomplete.
 #  #
 sub incomplete {  sub incomplete {
     my ($username, $domain, $map) = @_;      my ($username, $domain, $section, $map) = @_;
   
   
     my $navmap = Apache::lonnavmaps::navmap->new($username, $domain);      my $navmap = Apache::lonnavmaps::navmap->new($username, $domain, $section);
   
   
     if (defined($navmap)) {      if (defined($navmap)) {
Line 878  sub master_seq_to_person_seq { Line 879  sub master_seq_to_person_seq {
     }      }
   
     my $navmap           = Apache::lonnavmaps::navmap->new($username, $userdomain,      my $navmap           = Apache::lonnavmaps::navmap->new($username, $userdomain,
                                                            $code, $unhidden);                                                             $usersection, $code, $unhidden);
     my ($start,$finish);      my ($start,$finish);
   
     if ($map) {      if ($map) {
Line 1861  sub old_character_chart { Line 1862  sub old_character_chart {
 my %page_formats=  my %page_formats=
     ('letter' => {      ('letter' => {
  'book' => {   'book' => {
      '1' => [ '7.1 in','9.7 in', '-0.57 in','-0.57 in','0.1 in'],       '1' => [ '7.1 in','9.7 in', '-0.57 in','-0.57 in','-0.5 in'],
      '2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','0.1 in']       '2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','-0.5 in']
  },   },
  'album' => {   'album' => {
      '1' => [ '8.8 in', '6.8 in','-0.55 in',  '-0.55 in','-0.5 in'],       '1' => [ '8.8 in', '6.8 in','-0.55 in',  '-0.55 in','-0.5 in'],
Line 2027  sub page_format_transformation { Line 2028  sub page_format_transformation {
     $text =~ s/\\begin\{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\n\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\n\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\n\\pagestyle{fancy}$fancypagestatement\\usepackage{booktabs}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}\n /;      $text =~ s/\\begin\{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\n\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\n\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\n\\pagestyle{fancy}$fancypagestatement\\usepackage{booktabs}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}\n /;
         if ($papersize eq 'a4') {          if ($papersize eq 'a4') {
             $paperwidth = '29.7cm';              $paperwidth = '29.7cm';
             $paperheight = '21cm';              $paperheight = '21.0cm';
         } elsif ($numberofcolumns eq '1') {          } elsif ($numberofcolumns eq '1') {
             if ($papersize eq 'letter') {              if ($papersize eq 'letter') {
                 $paperwidth = '11in';                  $paperwidth = '11.0in';
                 $paperheight = '8.5in';                  $paperheight = '8.5in';
             } elsif ($papersize eq 'legal') {              } elsif ($papersize eq 'legal') {
                 $paperwidth = '14in';                  $paperwidth = '14.0in';
                 $paperheight = '8.5in';                  $paperheight = '8.5in';
             }              }
         }          }
Line 2044  sub page_format_transformation { Line 2045  sub page_format_transformation {
     $text =~ s/\\pagestyle\{fancy}\\rhead\{}\\chead\{}\s*\\begin\{document}/\\textheight = $textheight\\oddsidemargin = $evenoffset\n\\evensidemargin = $evenoffset $topmargintoinsert\\textwidth= $textwidth\\newlength{\\minipagewidth}\n\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\usepackage{booktabs}\\begin{document}\\voffset=-0\.8cm\n\\setcounter{page}{1}  \\vskip 5 mm\n /;      $text =~ s/\\pagestyle\{fancy}\\rhead\{}\\chead\{}\s*\\begin\{document}/\\textheight = $textheight\\oddsidemargin = $evenoffset\n\\evensidemargin = $evenoffset $topmargintoinsert\\textwidth= $textwidth\\newlength{\\minipagewidth}\n\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\usepackage{booktabs}\\begin{document}\\voffset=-0\.8cm\n\\setcounter{page}{1}  \\vskip 5 mm\n /;
  }   }
         if ($papersize eq 'a4') {          if ($papersize eq 'a4') {
             $paperwidth = '21cm';              $paperwidth = '21.0cm';
             $paperheight = '29.7cm';              $paperheight = '29.7cm';
         } elsif ($papersize eq 'letter') {          } elsif ($papersize eq 'letter') {
             $paperwidth = '8.5in';              $paperwidth = '8.5in';
             $paperheight = '11.5in';              $paperheight = '11.0in';
          } elsif ($papersize eq 'legal') {           } elsif ($papersize eq 'legal') {
             $paperwidth = '8.5in';              $paperwidth = '8.5in';
             $paperheight = '14.0in';              $paperheight = '14.0in';
Line 3867  sub print_resources { Line 3868  sub print_resources {
   
  if ( !($type eq 'problems' &&   if ( !($type eq 'problems' &&
        ($curresline!~ m/$LONCAPA::assess_page_re/)) ) {         ($curresline!~ m/$LONCAPA::assess_page_re/)) ) {
     if ($print_incomplete && !&incomplete($username, $userdomain, $res_url)) {      if ($print_incomplete && !&incomplete($username, $userdomain, $usersection, $res_url)) {
  next;   next;
     }      }
     $actually_printed++; # we're going to print one.      $actually_printed++; # we're going to print one.
Line 4236  sub printHelper { Line 4237  sub printHelper {
   
     }      }
  }   }
   
     }      }
   
     # Detect whether we're coming from construction space      # Detect whether we're coming from construction space
Removed from v.1.703  
changed lines
  Added in v.1.705

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