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

Diff for /loncom/interface/lonprintout.pm between versions 1.201 and 1.203

version 1.201, 2003/07/01 20:15:06 version 1.203, 2003/07/14 14:30:35
Line 396  sub page_format { Line 396  sub page_format {
 # 8 - "A6 [105x148 mm]"  # 8 - "A6 [105x148 mm]"
 #   # 
     my ($papersize,$layout,$numberofcolumns) = @_;       my ($papersize,$layout,$numberofcolumns) = @_; 
     my ($textwidth,$textheight,$oddoffset,$evenoffset) = (0,0,0,0);      my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = (0,0,0,0,0);
     if ($papersize eq '0') {      if ($papersize eq '0') {
  if ($layout eq 'book') {   if ($layout eq 'book') {
     if ($numberofcolumns == 1) {      if ($numberofcolumns == 1) {
Line 417  sub page_format { Line 417  sub page_format {
  $oddoffset = '-40 pt';   $oddoffset = '-40 pt';
  $evenoffset = '-60 pt';   $evenoffset = '-60 pt';
     } elsif ($numberofcolumns == 2) {      } elsif ($numberofcolumns == 2) {
  $textwidth = '4.2 in';   $textwidth = '4.4 in';
  $textheight = '6.8 in';   $textheight = '6.8 in';
  $oddoffset = '-40 pt';   $oddoffset = '-0.5 in';
  $evenoffset = '-60 pt';   $evenoffset = '-1.5 in';
    $topmargin = '3.5 in';
     }      }
  }   }
 #    } elsif($papersize eq '1') {  #    } elsif($papersize eq '1') {
Line 457  sub page_format { Line 458  sub page_format {
 #    } elsif($papersize eq '7') {  #    } elsif($papersize eq '7') {
 #    } elsif($papersize eq '8') {  #    } elsif($papersize eq '8') {
     }      }
     return $textwidth,$textheight,$oddoffset,$evenoffset;      return $textwidth,$textheight,$oddoffset,$evenoffset,$topmargin;
 }  }
   
   
Line 474  sub get_name { Line 475  sub get_name {
   
 sub page_format_transformation {  sub page_format_transformation {
     my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment) = @_;       my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment) = @_; 
     my ($textwidth,$textheight,$oddoffset,$evenoffset);      my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin);
  $assignment=~s/_/ /g;   $assignment=~s/_/ /g;
         if ($numberofcolumns != 1) {          if ($numberofcolumns != 1) {
           ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$layout,$numberofcolumns);            ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = &page_format($papersize,$layout,$numberofcolumns,$topmargin);
  } else {   } else {
   ($textwidth,$textheight,$oddoffset,$evenoffset) = ($ENV{'form.width'},$ENV{'form.height'},$ENV{'form.leftmargin'},$ENV{'form.leftmargin'});    ($textwidth,$textheight,$oddoffset,$evenoffset) = ($ENV{'form.width'},$ENV{'form.height'},$ENV{'form.leftmargin'},$ENV{'form.leftmargin'});
  }   }
Line 488  sub page_format_transformation { Line 489  sub page_format_transformation {
     }      }
     my $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'','','header');      my $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'','','header');
     if ($layout eq 'album') {      if ($layout eq 'album') {
     $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}\\setlength{\\topmargin}{200pt}\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\parindent}{20pt}\\setlength{\\marginparwidth}{90pt}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm} \\begin{document}\\setcounter{page}{1}\\noindent\\parbox{\\minipagewidth}{\\noindent\\fbox{\\textbf{$name}} \\hfill  $courseidinfo} \\vskip 5 mm /;   my $topmargintoinsert = '';
    if ($topmargin ne '0') {$topmargintoinsert='\setlength{\topmargin}{'.$topmargin.'}';}
       $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{\\textbf{$name} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}} \\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1} /;
     } elsif ($layout eq 'book') {      } elsif ($layout eq 'book') {
  if ($choice ne 'All class print') {    if ($choice ne 'All class print') { 
     $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{\\textbf{$name} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}/;      $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{\\textbf{$name} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}/;
Line 624  ENDPART Line 627  ENDPART
     my %form;      my %form;
     $form{'grade_target'}='tex';      $form{'grade_target'}='tex';
     $form{'textwidth'}=$LaTeXwidth;      $form{'textwidth'}=$LaTeXwidth;
     $form{'problem_split'}=$parmhash{'problem_stream_switch'};       $form{'problem_split'}=$parmhash{'problem_stream_switch'};
       $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
     my $rndseed=time;      my $rndseed=time;
     $form{'rndseed'}=$rndseed;      $form{'rndseed'}=$rndseed;
     &Apache::lonnet::appenv(%moreenv);      &Apache::lonnet::appenv(%moreenv);
Line 662  ENDPART Line 666  ENDPART
  $form{'grade_target'}='tex';   $form{'grade_target'}='tex';
  $form{'textwidth'}=$LaTeXwidth;   $form{'textwidth'}=$LaTeXwidth;
  $form{'problem_split'}=$parmhash{'problem_stream_switch'};   $form{'problem_split'}=$parmhash{'problem_stream_switch'};
    $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
  my $flag_latex_header_remove = 'NO';   my $flag_latex_header_remove = 'NO';
  my $flag_page_in_sequence = 'NO';   my $flag_page_in_sequence = 'NO';
  my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};   my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
Line 753  ENDPART Line 758  ENDPART
  if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {   if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
     my %form;      my %form;
     $form{'answer_output_mode'}='tex';      $form{'answer_output_mode'}='tex';
       $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
     my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$ENV{'request.course.id'},%form);      my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$ENV{'request.course.id'},%form);
     $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;      $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;
  }   }
Line 802  ENDPART Line 808  ENDPART
     my %form;      my %form;
     $form{'grade_target'}='answer';      $form{'grade_target'}='answer';
     $form{'answer_output_mode'}='tex';      $form{'answer_output_mode'}='tex';
       $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
     $form{'rndseed'}=$rndseed;      $form{'rndseed'}=$rndseed;
     my $answer=&Apache::lonnet::ssi($urlp,%form);      my $answer=&Apache::lonnet::ssi($urlp,%form);
     $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;      $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
Line 1155  CHOOSE_FROM_SUBDIR Line 1162  CHOOSE_FROM_SUBDIR
                                    ['Print with answers', 'no'] ];                                     ['Print with answers', 'no'] ];
         Apache::lonhelper::choices->new();          Apache::lonhelper::choices->new();
     }      }
       if ($ENV{'request.role.adv'}) {
           $paramHash = Apache::lonhelper::getParamHash();
           $paramHash->{MESSAGE_TEXT} = "<br /><big><b><i>Another option available only for advanced users:</i></b></big><br />";
           Apache::lonhelper::message->new();
           $paramHash = Apache::lonhelper::getParamHash();
    $paramHash->{'variable'} = 'LATEX_TYPE';   
    $helper->declareVar('LATEX_TYPE');  
    if ($helper->{VARS}->{'construction'} eq '1') {       
       $paramHash->{CHOICES} = [
        ['Print in standard LaTeX mode', 'standard'], 
        ['Print in LaTeX batchmode', 'batchmode'], ];
    } else {
       $paramHash->{CHOICES} = [
        ['Print in LaTeX batchmode', 'batchmode'],
        ['Print in standard LaTeX mode', 'standard'] ];
    }
           Apache::lonhelper::choices->new();
       } 
   
     Apache::lonprintout::page_format_state->new("FORMAT");      Apache::lonprintout::page_format_state->new("FORMAT");
   
Removed from v.1.201  
changed lines
  Added in v.1.203

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