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

Diff for /loncom/interface/lonprintout.pm between versions 1.186 and 1.204

version 1.186, 2003/05/28 20:27:40 version 1.204, 2003/07/18 15:47:35
Line 286  sub character_chart { Line 286  sub character_chart {
     $result =~ s/&(mu|\#956);/\$\\mu \$/g;      $result =~ s/&(mu|\#956);/\$\\mu \$/g;
     $result =~ s/&(nu|\#957);/\$\\nu \$/g;      $result =~ s/&(nu|\#957);/\$\\nu \$/g;
     $result =~ s/&(xi|\#958);/\$\\xi \$/g;      $result =~ s/&(xi|\#958);/\$\\xi \$/g;
       $result =~ s/&(omicron|\#959);/o/g;
     $result =~ s/&(pi|\#960);/\$\\pi \$/g;      $result =~ s/&(pi|\#960);/\$\\pi \$/g;
     $result =~ s/&(rho|\#961);/\$\\rho \$/g;      $result =~ s/&(rho|\#961);/\$\\rho \$/g;
     $result =~ s/&(sigma|\#963);/\$\\sigma \$/g;      $result =~ s/&(sigma|\#963);/\$\\sigma \$/g;
Line 295  sub character_chart { Line 296  sub character_chart {
     $result =~ s/&(chi|\#967);/\$\\chi \$/g;      $result =~ s/&(chi|\#967);/\$\\chi \$/g;
     $result =~ s/&(psi|\#968);/\$\\psi \$/g;      $result =~ s/&(psi|\#968);/\$\\psi \$/g;
     $result =~ s/&(omega|\#969);/\$\\omega \$/g;      $result =~ s/&(omega|\#969);/\$\\omega \$/g;
       $result =~ s/&(thetasym|\#977);/\$\\vartheta \$/g;
       $result =~ s/&(piv|\#982);/\$\\varpi \$/g;
       $result =~ s/&(Alpha|\#913);/A/g;
       $result =~ s/&(Beta|\#914);/B/g;
     $result =~ s/&(Gamma|\#915);/\$\\Gamma \$/g;      $result =~ s/&(Gamma|\#915);/\$\\Gamma \$/g;
     $result =~ s/&(Delta|\#916);/\$\\Delta \$/g;      $result =~ s/&(Delta|\#916);/\$\\Delta \$/g;
       $result =~ s/&(Epsilon|\#917);/E/g;
       $result =~ s/&(Zeta|\#918);/Z/g;
       $result =~ s/&(Eta|\#919);/H/g;
     $result =~ s/&(Theta|\#920);/\$\\Theta \$/g;      $result =~ s/&(Theta|\#920);/\$\\Theta \$/g;
       $result =~ s/&(Iota|\#921);/I/g;
       $result =~ s/&(Kappa|\#922);/K/g;
     $result =~ s/&(Lambda|\#923);/\$\\Lambda \$/g;      $result =~ s/&(Lambda|\#923);/\$\\Lambda \$/g;
       $result =~ s/&(Mu|\#924);/M/g;
       $result =~ s/&(Nu|\#925);/N/g;
     $result =~ s/&(Xi|\#926);/\$\\Xi \$/g;      $result =~ s/&(Xi|\#926);/\$\\Xi \$/g;
       $result =~ s/&(Omicron|\#927);/O/g;
     $result =~ s/&(Pi|\#928);/\$\\Pi \$/g;      $result =~ s/&(Pi|\#928);/\$\\Pi \$/g;
       $result =~ s/&(Rho|\#929);/P/g;
     $result =~ s/&(Sigma|\#931);/\$\\Sigma \$/g;      $result =~ s/&(Sigma|\#931);/\$\\Sigma \$/g;
       $result =~ s/&(Tau|\#932);/T/g;
     $result =~ s/&(Upsilon|\#933);/\$\\Upsilon \$/g;      $result =~ s/&(Upsilon|\#933);/\$\\Upsilon \$/g;
     $result =~ s/&(Phi|\#934);/\$\\Phi \$/g;      $result =~ s/&(Phi|\#934);/\$\\Phi \$/g;
       $result =~ s/&(Chi|\#935);/X/g;
     $result =~ s/&(Psi|\#936);/\$\\Psi \$/g;      $result =~ s/&(Psi|\#936);/\$\\Psi \$/g;
     $result =~ s/&(Omega|\#937);/\$\\Omega \$/g;      $result =~ s/&(Omega|\#937);/\$\\Omega \$/g;
   #Arrows (extended HTML 4.01)
       $result =~ s/&(larr|\#8592);/\$\\leftarrow \$/g;
       $result =~ s/&(uarr|\#8593);/\$\\uparrow \$/g;
       $result =~ s/&(rarr|\#8594);/\$\\rightarrow \$/g;
       $result =~ s/&(darr|\#8595);/\$\\downarrow \$/g;
       $result =~ s/&(harr|\#8596);/\$\\leftrightarrow \$/g;
       $result =~ s/&(lArr|\#8656);/\$\\Leftarrow \$/g;
       $result =~ s/&(uArr|\#8657);/\$\\Uparrow \$/g;
       $result =~ s/&(rArr|\#8658);/\$\\Rightarrow \$/g;
       $result =~ s/&(dArr|\#8659);/\$\\Downarrow \$/g;
       $result =~ s/&(hArr|\#8660);/\$\\Leftrightarrow \$/g;
   #Mathematical Operators (extended HTML 4.01)
       $result =~ s/&(forall|\#8704);/\$\\forall \$/g;
       $result =~ s/&(part|\#8706);/\$\\partial \$/g;
       $result =~ s/&(exist|\#8707);/\$\\exists \$/g;
       $result =~ s/&(empty|\#8709);/\$\\emptyset \$/g;
       $result =~ s/&(nabla|\#8711);/\$\\nabla \$/g;
       $result =~ s/&(isin|\#8712);/\$\\in \$/g;
       $result =~ s/&(notin|\#8713);/\$\\notin \$/g;
       $result =~ s/&(ni|\#8715);/\$\\ni \$/g;
       $result =~ s/&(prod|\#8719);/\$\\prod \$/g;
       $result =~ s/&(sum|\#8721);/\$\\sum \$/g;
       $result =~ s/&(minus|\#8722);/\$-\$/g;
       $result =~ s/&(lowast|\#8727);/\$*\$/g;
       $result =~ s/&(radic|\#8730);/\$\\surd \$/g;
       $result =~ s/&(prop|\#8733);/\$\\propto \$/g;
       $result =~ s/&(infin|\#8734);/\$\\infty \$/g;
       $result =~ s/&(ang|\#8736);/\$\\angle \$/g;
       $result =~ s/&(and|\#8743);/\$\\wedge \$/g;
       $result =~ s/&(or|\#8744);/\$\\vee \$/g;
       $result =~ s/&(cap|\#8745);/\$\\cap \$/g;
       $result =~ s/&(cup|\#8746);/\$\\cup \$/g;
       $result =~ s/&(int|\#8747);/\$\\int \$/g;
       $result =~ s/&(sim|\#8764);/\$\\sim \$/g;
       $result =~ s/&(cong|\#8773);/\$\\cong \$/g;
       $result =~ s/&(asymp|\#8776);/\$\\approx \$/g;
       $result =~ s/&(ne|\#8800);/\$\\not= \$/g;
       $result =~ s/&(equiv|\#8801);/\$\\equiv \$/g;
       $result =~ s/&(le|\#8804);/\$\\leq \$/g;
       $result =~ s/&(ge|\#8805);/\$\\geq \$/g;
       $result =~ s/&(sub|\#8834);/\$\\subset \$/g;
       $result =~ s/&(sup|\#8835);/\$\\supset \$/g;
       $result =~ s/&(nsub|\#8836);/\$\\not\\subset \$/g;
       $result =~ s/&(sube|\#8838);/\$\\subseteq \$/g;
       $result =~ s/&(supe|\#8839);/\$\\supseteq \$/g;
       $result =~ s/&(oplus|\#8853);/\$\\oplus \$/g;
       $result =~ s/&(otimes|\#8855);/\$\\otimes \$/g;
       $result =~ s/&(perp|\#8869);/\$\\perp \$/g;
       $result =~ s/&(sdot|\#8901);/\$\\cdot \$/g;
   #Geometric Shapes (extended HTML 4.01)
       $result =~ s/&(loz|\#9674);/\$\\Diamond \$/g;
   #Miscellaneous Symbols (extended HTML 4.01)
       $result =~ s/&(spades|\#9824);/\$\\spadesuit \$/g;
       $result =~ s/&(clubs|\#9827);/\$\\clubsuit \$/g;
       $result =~ s/&(hearts|\#9829);/\$\\heartsuit \$/g;
       $result =~ s/&(diams|\#9830);/\$\\diamondsuit \$/g;
     return $result;      return $result;
 }  }
   
Line 324  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) {
  $textwidth = '18 cm';   $textwidth = '7.1 in';      #'18 cm';
  $textheight = '25.9 cm';   $textheight = '10.2 in';    #'25.9 cm';
  $oddoffset = '-0.57 in';   $oddoffset = '-0.57 in';
  $evenoffset = '-0.57 in';   $evenoffset = '-0.57 in';
     } elsif ($numberofcolumns == 2) {      } elsif ($numberofcolumns == 2) {
  $textwidth = '93 mm';   $textwidth = '3.66 in';     #'93 mm';
  $textheight = '25.9 cm';   $textheight = '10.2 in';    #'25.9 cm';
  $oddoffset = '-0.57 in';   $oddoffset = '-0.57 in';
  $evenoffset = '-0.57 in';   $evenoffset = '-0.57 in';
     }      }
Line 345  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 385  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 402  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 416  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}/;
  } else {   } else {
     $text =~ s/\\pagestyle{fancy}\\rhead{}\\chead{}\s*\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\begin{document}\\voffset=-0\.8cm\\setcounter{page}{1}  \\vskip 5 mm /;      $text =~ s/\\pagestyle{fancy}\\rhead{}\\chead{}\s*\\begin{document}/\\textheight = $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\begin{document}\\voffset=-0\.8cm\\setcounter{page}{1}  \\vskip 5 mm /;
   
  }   }
     }      }
     return $text;      return $text;
Line 502  sub latex_corrections { Line 576  sub latex_corrections {
 sub output_data {  sub output_data {
     my ($r,$helper,$rparmhash) = @_;      my ($r,$helper,$rparmhash) = @_;
     my %parmhash = %$rparmhash;      my %parmhash = %$rparmhash;
       my $bodytag=&Apache::loncommon::bodytag('Preparing Printout');
     $r->print(<<ENDPART);      $r->print(<<ENDPART);
 <html>  <html>
 <head>  <head>
 <title>LON-CAPA output for printing</title>  <title>LON-CAPA output for printing</title>
 </head>  </head>
 <body bgcolor="FFFFFF">  $bodytag
 <hr>  Please stand by while processing your print request, this may take some time ...
 ENDPART  ENDPART
   
     my $format_from_helper = $helper->{'VARS'}->{'FORMAT'};      my $format_from_helper = $helper->{'VARS'}->{'FORMAT'};
Line 524  ENDPART Line 599  ENDPART
     my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$laystyle,$numberofcolumns);      my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$laystyle,$numberofcolumns);
     my $assignment =  $ENV{'form.assignment'};      my $assignment =  $ENV{'form.assignment'};
     my $LaTeXwidth;       my $LaTeXwidth; 
     if ($textwidth=~/(\d+)\s*cm/) {      if ($textwidth=~/(\d+\.?\d*)\s*cm/) {
  $LaTeXwidth = $1*10;   $LaTeXwidth = $1*10;
     } elsif ($textwidth=~/(\d+)\s*mm/) {      } elsif ($textwidth=~/(\d+\.?\d*)\s*mm/) {
  $LaTeXwidth = $1;   $LaTeXwidth = $1;
     } elsif ($textwidth=~/(\d+)\s*in/) {      } elsif ($textwidth=~/(\d+\.?\d*)\s*in/) {
  $LaTeXwidth = $1*25.4;   $LaTeXwidth = $1*25.4;
     }      }
     $LaTeXwidth.=' mm';      $LaTeXwidth.=' mm';
Line 551  ENDPART Line 626  ENDPART
     $moreenv{'request.filename'}=$currentURL;      $moreenv{'request.filename'}=$currentURL;
     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{'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);
       &Apache::lonnet::delenv('form.counter');
       &Apache::lonxml::init_counter();
     my $texversion=&Apache::lonnet::ssi($currentURL,%form);      my $texversion=&Apache::lonnet::ssi($currentURL,%form);
     &Apache::lonnet::delenv('form.counter');      &Apache::lonnet::delenv('form.counter');
     &Apache::lonnet::delenv('request.filename');      &Apache::lonnet::delenv('request.filename');
Line 583  ENDPART Line 662  ENDPART
              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or               ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or
              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')) {                ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')) { 
         #-- produce an output string          #-- produce an output string
    my %form=();   
    $form{'grade_target'}='tex';
    $form{'textwidth'}=$LaTeXwidth;
    $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'};
    my $prevassignment='';
    &Apache::lonnet::delenv('form.counter');
    &Apache::lonxml::init_counter();
  for (my $i=0;$i<=$#master_seq;$i++) {   for (my $i=0;$i<=$#master_seq;$i++) {
     $master_seq[$i]=~/___\d+___(.*)$/;      $master_seq[$i]=~/___\d+___(.*)$/;
     my $urlp='/res/'.$1;      my $urlp='/res/'.$1;
Line 596  ENDPART Line 683  ENDPART
     } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') {      } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') {
  $selectionmade = 4;   $selectionmade = 4;
     }      }
     my %form;     
     $form{'grade_target'}='tex';  
     $form{'textwidth'}=$LaTeXwidth;  
     $form{'symb'}=$master_seq[$i];      $form{'symb'}=$master_seq[$i];
             $form{'problem_split'}=$parmhash{'problem_stream_switch'};      $master_seq[$i]=~/(.*)___\d*___/;
       my $assignment=&Apache::lonnet::gettitle($1); #tittle of the assignment which contains this problem
     #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]");      #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]");
     my $texversion=&Apache::lonnet::ssi($urlp,%form);      my $texversion=&Apache::lonnet::ssi($urlp,%form);
     if ($urlp=~/\.page$/) {      if ($urlp=~/\.page$/) {
Line 621  ENDPART Line 706  ENDPART
  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/;
     }      }
     $result .= $texversion;           #    $result .= $texversion;
       if (($selectionmade == 4) and ($assignment ne $prevassignment) and ($i>=1)) {
    my $name = &get_name();
    if ($name =~ /^\s*$/) {
       $name=&Apache::lonxml::latex_special_symbols($ENV{'user.name'},undef,
    undef,'header');
    }
    my $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'','','header');
    $prevassignment=$assignment;
    $result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$name.'}} - '.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}} \vskip -5 mm ';
       }
       $result .= $texversion;
     $flag_latex_header_remove = 'YES';         $flag_latex_header_remove = 'YES';   
  }   }
  &Apache::lonnet::delenv('form.counter');   &Apache::lonnet::delenv('form.counter');
Line 643  ENDPART Line 739  ENDPART
 #    my ($usersection,$username,$userdomain) = split /:/,$person;  #    my ($usersection,$username,$userdomain) = split /:/,$person;
     my ($username,$userdomain) = split /:/,$person;      my ($username,$userdomain) = split /:/,$person;
     my $fullname = &get_name($username,$userdomain);      my $fullname = &get_name($username,$userdomain);
   
       if ($parmhash{'anonymous_quiz'}=~/yes/) {$fullname=' ';} #put here something reasonable for anonymous exams or quiz
             #goes through all resources, checks if they are available for current student, and produces output                 #goes through all resources, checks if they are available for current student, and produces output   
       &Apache::lonnet::delenv('form.counter');
       &Apache::lonxml::init_counter();
     foreach my $curresline (@master_seq)  {      foreach my $curresline (@master_seq)  {
  if ($curresline=~ m/\.(problem|exam|quiz|assess|survey|form|library)$/) {   if ($curresline=~ m/\.(problem|exam|quiz|assess|survey|form|library)$/) {
     my ($map,$id,$res_url) = split(/___/,$curresline);      my ($map,$id,$res_url) = split(/___/,$curresline);
Line 658  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';
     my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,      $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
       $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/;
  }   }
  $current_output .= $rendered;   $current_output .= $rendered;
Line 708  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 747  ENDPART Line 848  ENDPART
 #-------------------------------------------------------- corrections for the different page formats  #-------------------------------------------------------- corrections for the different page formats
     $result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'});      $result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'});
     $result = &latex_corrections($number_of_columns,$result);      $result = &latex_corrections($number_of_columns,$result);
 #    #changes page's parameters for the one column output       #changes page's parameters for the one column output 
 #    if ($ENV{'form.numberofcolumns'} == 1) {      if ($numberofcolumns == 1) {
 # $result =~ s/\\textwidth= 9cm/\\textwidth= $ENV{'form.width'}/;   $result =~ s/\\textwidth= 9cm/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /;
 # $result =~ s/\\textheight 25\.9cm/\\textheight $ENV{'form.height'}/;   $result =~ s/\\textheight 25\.9cm/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;
 # $result =~ s/\\evensidemargin = -0\.57in/\\evensidemargin= $ENV{'form.leftmargin'}/;   $result =~ s/\\evensidemargin = -0\.57in/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
 # $result =~ s/\\oddsidemargin = -0\.57in/\\oddsidemargin= $ENV{'form.leftmargin'}/;   $result =~ s/\\oddsidemargin = -0\.57in/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
 #    }      }
 #-- writing .tex file in prtspool   #-- writing .tex file in prtspool 
     my $temp_file;      my $temp_file;
     my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout_".time."_".rand(10000000).".tex";      my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout_".time."_".rand(10000000).".tex";
Line 798  sub handler { Line 899  sub handler {
 # return OK;  # return OK;
   
     my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'});      my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'});
 #    $r->print('<br /> START '.$ENV{'request.course.fn'}.' FINISH <br />');  
 #    my $key;   
 #    foreach $key (keys %parmhash) {  
 # $r->print(' '.$key.'->'.$parmhash{$key}.'<-<br />');  
 #    }  
 #    return OK;  
           
    my $key; 
   # foreach $key (keys %parmhash) {
   #    $r->print(' '.$key.'->'.$parmhash{$key}.'<-<br />');
   # }
   # return OK;
   
     &output_data($r,$helper,\%parmhash);      &output_data($r,$helper,\%parmhash);
     return OK;      return OK;
Line 856  sub printHelper { Line 956  sub printHelper {
     # very first screen.      # very first screen.
     # Detect whether we're coming from construction space      # Detect whether we're coming from construction space
     if ($ENV{'form.postdata'} =~ /http:\/\// ) {      if ($ENV{'form.postdata'} =~ /http:\/\// ) {
         $ENV{'form.postdata'} =~ /http:\/\/[a-zA-Z.]+\/~([a-zA-Z0-9]+)\/(.*)/;          $ENV{'form.postdata'} =~ /http:\/\/[^\/]+\/~([^\/]+)\/(.*)/;
         $helper->{VARS}->{'filename'} = "/home/$1/public_html/$2";          $helper->{VARS}->{'filename'} = "/home/$1/public_html/$2";
         $helper->{VARS}->{'construction'} = 1;          $helper->{VARS}->{'construction'} = 1;
     } else {      } else {
Line 905  sub printHelper { Line 1005  sub printHelper {
         $subdir = &Apache::lonnet::filelocation("", $url);          $subdir = &Apache::lonnet::filelocation("", $url);
     }      }
   
       my $userCanSeeHidden = Apache::lonnavmaps::advancedUser();
   
     Apache::lonhelper::registerHelperTags();      Apache::lonhelper::registerHelperTags();
   
     # "Delete everything after the last slash."      # "Delete everything after the last slash."
Line 912  sub printHelper { Line 1014  sub printHelper {
     if (not $helper->{VARS}->{'construction'}) {      if (not $helper->{VARS}->{'construction'}) {
  $subdir='/home/httpd/html/res/'.$subdir;   $subdir='/home/httpd/html/res/'.$subdir;
     }      }
       # "Remove all duplicate slashes."
       $subdir =~ s|/+|/|g;
   
     # What can be printed is a very dynamic decision based on      # What can be printed is a very dynamic decision based on
     # lots of factors. So we need to dynamically build this list.      # lots of factors. So we need to dynamically build this list.
Line 931  sub printHelper { Line 1035  sub printHelper {
         push @{$printChoices}, ["<b>$resourceTitle</b> (prints what you just saw on the screen)", 'current_document', 'PAGESIZE'];          push @{$printChoices}, ["<b>$resourceTitle</b> (prints what you just saw on the screen)", 'current_document', 'PAGESIZE'];
     }      }
   
     $r->print($helper->{VARS}->{'postdata'});  #    $r->print($helper->{VARS}->{'postdata'});
   
     # If we're in a sequence...      # If we're in a sequence...
     if ($helper->{'VARS'}->{'construction'} ne '1') {      if ($helper->{'VARS'}->{'construction'} ne '1') {
Line 940  sub printHelper { Line 1044  sub printHelper {
         # Allow all resources from sequence          # Allow all resources from sequence
         push @{$printChoices}, ["Everything (problem(s), page(s), html/xml file(s)) from <b>$sequenceTitle</b>", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];          push @{$printChoices}, ["Everything (problem(s), page(s), html/xml file(s)) from <b>$sequenceTitle</b>", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
   
         my $isProblem = '$res->is_problem();';          my $isProblem = '$res->is_problem()';
    $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
         my $isProblemOrMap = '$res->is_problem() || $res->is_map()';          my $isProblemOrMap = '$res->is_problem() || $res->is_map()';
         my $isNotMap = '!$res->is_map();';          my $isNotMap = '!$res->is_map()';
         my $symb = '$res->symb();';   $isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
           my $symb = '$res->symb()';
         my $helperFragment = <<HELPERFRAGMENT;          my $helperFragment = <<HELPERFRAGMENT;
   <state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">    <state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">
     <message>(mark them then click "next" button) <br /></message>      <message>(mark them then click "next" button) <br /></message>
     <resource variable="RESOURCES" multichoice="1" toponly='1'>      <resource variable="RESOURCES" multichoice="1" toponly='1'>
       <nextstate>PAGESIZE</nextstate>        <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isProblem</filterfunc>        <filterfunc>return $isProblem;</filterfunc>
       <mapurl>$map</mapurl>        <mapurl>$map</mapurl>
       <valuefunc>return $symb</valuefunc>        <valuefunc>return $symb;</valuefunc>
       </resource>        </resource>
     </state>      </state>
   
Line 961  sub printHelper { Line 1067  sub printHelper {
       <nextstate>PAGESIZE</nextstate>        <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isNotMap;</filterfunc>        <filterfunc>return $isNotMap;</filterfunc>
       <mapurl>$map</mapurl>        <mapurl>$map</mapurl>
       <valuefunc>return $symb</valuefunc>        <valuefunc>return $symb;</valuefunc>
       </resource>        </resource>
     </state>      </state>
 HELPERFRAGMENT  HELPERFRAGMENT
Line 975  HELPERFRAGMENT Line 1081  HELPERFRAGMENT
         push @{$printChoices}, ['<b>Problems</b> in this course', 'all_problems', 'ALL_PROBLEMS'];          push @{$printChoices}, ['<b>Problems</b> in this course', 'all_problems', 'ALL_PROBLEMS'];
         push @{$printChoices}, ["Problems from <b>$sequenceTitle</b> for selected students", 'problems_for_students', 'CHOOSE_STUDENTS'];          push @{$printChoices}, ["Problems from <b>$sequenceTitle</b> for selected students", 'problems_for_students', 'CHOOSE_STUDENTS'];
   
         my $isProblem = '$res->is_problem();';          my $isProblem = '$res->is_problem()';
         my $isProblemOrMap = '$res->is_problem() || $res->is_map()';   $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
         my $symb = '$res->symb();';          my $isProblemOrMap = '($res->is_problem() || $res->is_map())';
    $isProblemOrMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
           my $symb = '$res->symb()';
         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);          &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
   <state name="ALL_PROBLEMS" title="Select Problem(s) to print">    <state name="ALL_PROBLEMS" title="Select Problem(s) to print">
     <message>(mark them then click "next" button) <br /></message>      <message>(mark them then click "next" button) <br /></message>
     <resource variable="RESOURCES" multichoice="1" suppressEmptySequences='1'>      <resource variable="RESOURCES" multichoice="1" suppressEmptySequences='1'>
       <nextstate>PAGESIZE</nextstate>        <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isProblemOrMap</filterfunc>        <filterfunc>return $isProblemOrMap;</filterfunc>
       <choicefunc>return $isProblem</choicefunc>        <choicefunc>return $isProblem;</choicefunc>
       <valuefunc>return $symb</valuefunc>        <valuefunc>return $symb;</valuefunc>
       </resource>        </resource>
     </state>      </state>
   
   <state name="CHOOSE_STUDENTS" title="Choose Students whose assignments you want to print">    <state name="CHOOSE_STUDENTS" title="Choose Students whose assignments you want to print">
     <message>(do not forget to select assignment itself - make another selection below) <br /></message>  
     <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />      <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />
     <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>      <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
     <resource variable="RESOURCES" multichoice="1">      <resource variable="RESOURCES" multichoice="1">
Line 1000  HELPERFRAGMENT Line 1107  HELPERFRAGMENT
       </resource>        </resource>
     <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>      <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
     <choices variable="EMPTY_PAGES">      <choices variable="EMPTY_PAGES">
       <choice computer='0'>Start each student's assignment on a new page (add a pagefeed after each assignment)</choice>        <choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>
       <choice computer='1'>Add one empty page after each student's assignment</choice>        <choice computer='1'>Add one empty page/column after each student\'s assignment</choice>
       <choice computer='2'>Add two empty pages after each student's assignment</choice>        <choice computer='2'>Add two empty pages/column after each student\'s assignment</choice>
         <choice computer='3'>Add three empty pages/column after each student\'s assignment</choice>
       </choices>        </choices>
     </state>      </state>
 CHOOSE_STUDENTS  CHOOSE_STUDENTS
     }      }
   
     # FIXME: That RE should come from a library somewhere.      # FIXME: That RE should come from a library somewhere.
     if (((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) or defined $helper->{'VARS'}->{'construction'}) {          if ((((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) or defined $helper->{'VARS'}->{'construction'}) and $ENV{'request.role.adv'}) {    
         push @{$printChoices}, ["Problems from current subdirectory <b>$subdir</b>", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];          push @{$printChoices}, ["Problems from current subdirectory <b>$subdir</b>", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
                   
         my $f = '$filename';          my $f = '$filename';
Line 1055  CHOOSE_FROM_SUBDIR Line 1163  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.186  
changed lines
  Added in v.1.204

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