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

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

version 1.195, 2003/06/24 14:56:16 version 1.203, 2003/07/14 14:30: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) {
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}/;
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 587  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'};
  my $prevassignment='';   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 602  ENDPART Line 684  ENDPART
  $selectionmade = 4;   $selectionmade = 4;
     }      }
     $form{'symb'}=$master_seq[$i];      $form{'symb'}=$master_seq[$i];
     $master_seq[$i]=~/\/([^\/]+)\.sequence_/;      $master_seq[$i]=~/(.*)___\d*___/;
     my $assignment=' '.$1.' ';      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 625  ENDPART Line 707  ENDPART
  $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)) {      if (($selectionmade == 4) and ($assignment ne $prevassignment) and ($i>=1)) {
  my $name = &get_name();   my $name = &get_name();
  if ($name =~ /^\s*$/) {   if ($name =~ /^\s*$/) {
     $name=&Apache::lonxml::latex_special_symbols($ENV{'user.name'},undef,      $name=&Apache::lonxml::latex_special_symbols($ENV{'user.name'},undef,
Line 657  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 672  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 721  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 812  sub handler { Line 900  sub handler {
   
     my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'});      my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'});
           
    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 1069  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.195  
changed lines
  Added in v.1.203

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