Diff for /loncom/interface/lonprintout.pm between versions 1.39 and 1.44

version 1.39, 2002/07/18 17:34:29 version 1.44, 2002/08/01 19:48:18
Line 72  sub menu_for_output { Line 72  sub menu_for_output {
 <input type="radio" name="choice" value="Standard LaTeX output for current document" checked>  Current document  <input type="radio" name="choice" value="Standard LaTeX output for current document" checked>  Current document
 (you will print what you see on the screen)<br />  (you will print what you see on the screen)<br />
 ENDMENUOUT1  ENDMENUOUT1
     if (!$ENV{'request.role'}=~m/^au\./) {      if (not $ENV{'request.role'}=~m/^au\./) {
     $r->print(<<ENDMENUOUT2);      $r->print(<<ENDMENUOUT2);
 <input type="radio" name="choice" value="Standard LaTeX output for the primary sequence">  All problems from the primary sequence<br />  <input type="radio" name="choice" value="Standard LaTeX output for the primary sequence">  All problems from the primary sequence<br />
 <input type="radio" name="choice" value="Standard LaTeX output for whole primary sequence">  The whole primary sequence (problems plus all html and xml files)<br />  <input type="radio" name="choice" value="Standard LaTeX output for whole primary sequence">  The whole primary sequence (problems plus all html and xml files)<br />
 <input type="radio" name="choice" value="Standard LaTeX output for the top level sequence">  All problems from the top level sequence<br />  <input type="radio" name="choice" value="Standard LaTeX output for the top level sequence">  All problems from the top level sequence<br />
 <br />  <br />
 ENDMENUOUT2  ENDMENUOUT2
       }
       my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});        my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
       $subdirtoprint =~ s/\/[^\/]+$//;        $subdirtoprint =~ s/\/[^\/]+$//;
       if (&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') {        if (&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') {
Line 86  ENDMENUOUT2 Line 87  ENDMENUOUT2
   <input type="radio" name="choice" value="Subdirectory print">  All problems from current subdirectory (where this particular problem is)<br />    <input type="radio" name="choice" value="Subdirectory print">  All problems from current subdirectory (where this particular problem is)<br />
 ENDMENUOUT4  ENDMENUOUT4
       }        }
     }  
     $r->print(<<ENDMENUOUT5);      $r->print(<<ENDMENUOUT5);
 <br /><hr /><br />  <br /><hr /><br />
 <h1>And what page format do you prefer?</h1>  <h1>And what page format do you prefer?</h1>
Line 98  ENDMENUOUT4 Line 98  ENDMENUOUT4
    </td>     </td>
    <td>&nbsp;</td>     <td>&nbsp;</td>
    <td rawspan="2">     <td rawspan="2">
      Number of columns: <input type="text" size="2" name="numberofcolumns" value="2">        Number of columns: <select name="numberofcolumns">
                            <option selected> 1 </option>
                            <option> 2 </option>
                            <option> 3 </option>
                            <option> 4 </option>
                            <option> 5 </option>
                            <option> 6 </option>
                            <option> 7 </option>
                            <option> 8 </option>
                            <option> 9 </option>
                           </select> 
    </td>     </td>
  </tr>   </tr>
 </table>  </table>
Line 142  ENDPART Line 152  ENDPART
       &Apache::lonnet::delenv('form.grade_target');        &Apache::lonnet::delenv('form.grade_target');
       $result .= $texversion;        $result .= $texversion;
       $result = &additional_cleanup($result);        $result = &additional_cleanup($result);
       if ($ENV{'form.url'}=~m/\.page\s*$/) {($result,$number_of_columns) = &page_cleanup($result);}        if ($ENV{'form.url'}=~m/\.page\s*$/) {
     } elsif ($choice eq 'Standard LaTeX output for the primary sequence' or $choice eq 'Standard LaTeX output for whole primary sequence') {    ($result,$number_of_columns) = &page_cleanup($result);
         }
       } elsif ($choice eq 'Standard LaTeX output for the primary sequence' or 
                $choice eq 'Standard LaTeX output for whole primary sequence') {
       #-- minimal sequence to which the current document belongs        #-- minimal sequence to which the current document belongs
         #-- where is the primary sequence containing file?          #-- where is the primary sequence containing file?
  my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});   my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
Line 154  ENDPART Line 167  ENDPART
  my $sequence_file=&Apache::lonnet::filelocation("",$primary_sequence);   my $sequence_file=&Apache::lonnet::filelocation("",$primary_sequence);
  my $sequencefilecontents=&Apache::lonnet::getfile($sequence_file);   my $sequencefilecontents=&Apache::lonnet::getfile($sequence_file);
  my @master_seq = &content_map($sequencefilecontents);   my @master_seq = &content_map($sequencefilecontents);
   #
   # for (my $iu=0;$iu<=$#master_seq;$iu++) {
   #    $result .= ' '.$master_seq[$iu].'    ';
   # }
   #
         #-- produce an output string          #-- produce an output string
  for (my $i=0;$i<=$#master_seq;$i++) {   for (my $i=0;$i<=$#master_seq;$i++) {
     $_ = $master_seq[$i];      $_ = $master_seq[$i];
Line 281  ENDPART Line 299  ENDPART
  $first_comment = index($result,'<!--',$first_comment);   $first_comment = index($result,'<!--',$first_comment);
     }      }
     $result =~ s/^\s+$//gm; #remove empty lines      $result =~ s/^\s+$//gm; #remove empty lines
     $result =~ s/%/\\%/g;   #corrects %      $result =~ s/([^\\])%/\$1\%/g;   #corrects %
     $result =~ s/(\s)+/$1/g; #removes more than one empty space      $result =~ s/(\s)+/$1/g; #removes more than one empty space
     $result =~ s/\\\\\s*\\vskip/\\vskip/gm;      $result =~ s/\\\\\s*\\vskip/\\vskip/gm;
     $result =~ s/ (<|>|) / \$$1\$ /g; #corrects < or >      $result =~ s/ (<|>|) / \$$1\$ /g; #corrects < or >
Line 289  ENDPART Line 307  ENDPART
     $result =~ s/{\\par }\s*\\\\/\\\\/gm;      $result =~ s/{\\par }\s*\\\\/\\\\/gm;
  $result =~ s/\\\\\s+\[/ \[/g;   $result =~ s/\\\\\s+\[/ \[/g;
     $result =~ s/&#952;/\$\\theta\$/g; #converts theta from html into tex      $result =~ s/&#952;/\$\\theta\$/g; #converts theta from html into tex
     $result =~ s/\b_+\b/\\makebox\[1 cm\]\[b\]{\\hrulefill}/g;      $result =~ s/\b__+\b/\\makebox\[1 cm\]\[b\]{\\hrulefill}/g;
     #conversion of html characters to LaTeX equivalents      #conversion of html characters to LaTeX equivalents
     if ($result =~ m/&(\w+|#\d+);/) {      if ($result =~ m/&(\w+|#\d+);/) {
  $result = &character_chart($result);   $result = &character_chart($result);
     }      }
       $result =~ s/(\\end{tabular})\s*\\vskip 0 mm/$1/g;
       $result =~ s/(\\begin{enumerate})\s*\\noindent/$1/g;
 #-- 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 311  FINALEND Line 331  FINALEND
   
 sub character_chart {  sub character_chart {
     my $result = shift;      my $result = shift;
     $result =~ s/&#009;//g;      $result =~ s/&#0?0?7;//g;
     $result =~ s/&#010;//g;      $result =~ s/&#0?0?9;//g;
     $result =~ s/&#013;//g;      $result =~ s/&#0?10;//g;
     $result =~ s/&#032;/ /g;      $result =~ s/&#0?13;//g;
     $result =~ s/&#033;/!/g;      $result =~ s/&#0?32;/ /g;
     $result =~ s/&#034;/"/g;      $result =~ s/&#0?33;/!/g;
       $result =~ s/&#0?34;/"/g;
     $result =~ s/&quot;/"/g;       $result =~ s/&quot;/"/g; 
     $result =~ s/&#035;/\\#/g;      $result =~ s/&#0?35;/\\#/g;
 #    $result =~ s/&#036;/\\\$/g;  #    $result =~ s/&#0?36;/\\\$/g;
     $result =~ s/&#037;/\\%/g;       $result =~ s/&#0?37;/\\%/g; 
     $result =~ s/&#038;/\\&/g;       $result =~ s/&#0?38;/\\&/g; 
     $result =~ s/&amp;/\\&/g;      $result =~ s/&amp;/\\&/g;
     $result =~ s/&#039;/'/g;      $result =~ s/&#0?39;/'/g;
     $result =~ s/&#040;/(/g;      $result =~ s/&#0?40;/(/g;
     $result =~ s/&#041;/)/g;      $result =~ s/&#0?41;/)/g;
     $result =~ s/&#042;/\*/g;      $result =~ s/&#0?42;/\*/g;
     $result =~ s/&#043;/\+/g;      $result =~ s/&#0?43;/\+/g;
     $result =~ s/&#044;/,/g;      $result =~ s/&#0?44;/,/g;
     $result =~ s/&#045;/-/g;      $result =~ s/&#0?45;/-/g;
     $result =~ s/&#046;/\./g;      $result =~ s/&#0?46;/\./g;
     $result =~ s/&#047;/\//g;      $result =~ s/&#0?47;/\//g;
     $result =~ s/&#048;/0/g;      $result =~ s/&#0?48;/0/g;
     $result =~ s/&#049;/1/g;      $result =~ s/&#0?49;/1/g;
     $result =~ s/&#050;/2/g;      $result =~ s/&#0?50;/2/g;
     $result =~ s/&#051;/3/g;      $result =~ s/&#0?51;/3/g;
     $result =~ s/&#052;/4/g;      $result =~ s/&#0?52;/4/g;
     $result =~ s/&#053;/5/g;      $result =~ s/&#0?53;/5/g;
     $result =~ s/&#054;/6/g;      $result =~ s/&#0?54;/6/g;
     $result =~ s/&#055;/7/g;      $result =~ s/&#0?55;/7/g;
     $result =~ s/&#056;/8/g;      $result =~ s/&#0?56;/8/g;
     $result =~ s/&#057;/9/g;      $result =~ s/&#0?57;/9/g;
     $result =~ s/&#058;/:/g;      $result =~ s/&#0?58;/:/g;
     $result =~ s/&#059;/;/g;      $result =~ s/&#0?59;/;/g;
     $result =~ s/&#060;/\$<\$/g;      $result =~ s/&#0?60;/\$<\$/g;
     $result =~ s/&lt;/\$<\$/g;      $result =~ s/&lt;/\$<\$/g;
     $result =~ s/&#061;/\$=\$/g;      $result =~ s/&#0?61;/\$=\$/g;
     $result =~ s/&#062;/\$>\$/g;      $result =~ s/&#0?62;/\$>\$/g;
     $result =~ s/&gt;/\$>\$/g;      $result =~ s/&gt;/\$>\$/g;
     $result =~ s/&#063;/?/g;      $result =~ s/&#0?63;/?/g;
 #    $result =~ s/&#064;//g;  #    $result =~ s/&#0?64;//g;
     $result =~ s/&#065;/A/g;      $result =~ s/&#0?65;/A/g;
     $result =~ s/&#066;/B/g;      $result =~ s/&#0?66;/B/g;
     $result =~ s/&#067;/C/g;      $result =~ s/&#0?67;/C/g;
     $result =~ s/&#068;/D/g;      $result =~ s/&#0?68;/D/g;
     $result =~ s/&#069;/E/g;      $result =~ s/&#0?69;/E/g;
     $result =~ s/&#070;/F/g;      $result =~ s/&#0?70;/F/g;
     $result =~ s/&#071;/G/g;      $result =~ s/&#0?71;/G/g;
     $result =~ s/&#072;/H/g;      $result =~ s/&#0?72;/H/g;
     $result =~ s/&#073;/I/g;      $result =~ s/&#0?73;/I/g;
     $result =~ s/&#074;/J/g;      $result =~ s/&#0?74;/J/g;
     $result =~ s/&#075;/K/g;      $result =~ s/&#0?75;/K/g;
     $result =~ s/&#076;/L/g;      $result =~ s/&#0?76;/L/g;
     $result =~ s/&#077;/M/g;      $result =~ s/&#0?77;/M/g;
     $result =~ s/&#078;/N/g;      $result =~ s/&#0?78;/N/g;
     $result =~ s/&#079;/O/g;      $result =~ s/&#0?79;/O/g;
     $result =~ s/&#080;/P/g;      $result =~ s/&#0?80;/P/g;
     $result =~ s/&#081;/Q/g;      $result =~ s/&#0?81;/Q/g;
     $result =~ s/&#082;/R/g;      $result =~ s/&#0?82;/R/g;
     $result =~ s/&#083;/S/g;      $result =~ s/&#0?83;/S/g;
     $result =~ s/&#084;/T/g;      $result =~ s/&#0?84;/T/g;
     $result =~ s/&#085;/U/g;      $result =~ s/&#0?85;/U/g;
     $result =~ s/&#086;/V/g;      $result =~ s/&#0?86;/V/g;
     $result =~ s/&#087;/W/g;      $result =~ s/&#0?87;/W/g;
     $result =~ s/&#088;/X/g;      $result =~ s/&#0?88;/X/g;
     $result =~ s/&#089;/Y/g;      $result =~ s/&#0?89;/Y/g;
     $result =~ s/&#090;/Z/g;      $result =~ s/&#0?90;/Z/g;
     $result =~ s/&#091;/[/g;      $result =~ s/&#0?91;/[/g;
     $result =~ s/&#092;/\\/g;      $result =~ s/&#0?92;/\\/g;
     $result =~ s/&#093;/]/g;      $result =~ s/&#0?93;/]/g;
 #    $result =~ s/&#094;//g;  #    $result =~ s/&#0?94;//g;
 #    $result =~ s/&#095;//g;  #    $result =~ s/&#0?95;//g;
     $result =~ s/&#096;/`/g;      $result =~ s/&#0?96;/`/g;
     $result =~ s/&#097;/a/g;      $result =~ s/&#0?97;/a/g;
     $result =~ s/&#098;/b/g;      $result =~ s/&#0?98;/b/g;
     $result =~ s/&#099;/c/g;      $result =~ s/&#0?99;/c/g;
     $result =~ s/&#100;/d/g;      $result =~ s/&#100;/d/g;
     $result =~ s/&#101;/e/g;      $result =~ s/&#101;/e/g;
     $result =~ s/&#102;/f/g;      $result =~ s/&#102;/f/g;
Line 469  sub character_chart { Line 490  sub character_chart {
 #    $result =~ s/&reg;//g;  #    $result =~ s/&reg;//g;
 #    $result =~ s/&#175;//g;  #    $result =~ s/&#175;//g;
 #    $result =~ s/&macr;//g;  #    $result =~ s/&macr;//g;
     $result =~ s/&#176;/\$^\\{\\circ\\}\$/g;      $result =~ s/&#176;/\$^{\\circ}\$/g;
     $result =~ s/&deg;/\$^\\{\\circ\\}\$/g;      $result =~ s/&deg;/\$^{\\circ}\$/g;
     $result =~ s/&#177;/\$\\pm\$/g;      $result =~ s/&#177;/\$\\pm\$/g;
     $result =~ s/&plusmn;/\$\\pm\$/g;      $result =~ s/&plusmn;/\$\\pm\$/g;
     $result =~ s/&#178;/\$^2\$/g;      $result =~ s/&#178;/\$^2\$/g;
Line 632  sub character_chart { Line 653  sub character_chart {
     return $result;      return $result;
 }  }
   
   
   #'"`
   
 sub additional_cleanup {  sub additional_cleanup {
     my $result = shift;      my $result = shift;
     my $first_app = index($result,'\documentclass',0);      my $first_app = index($result,'\documentclass',0);
Line 678  sub content_map { Line 702  sub content_map {
  $_ = $chunk;   $_ = $chunk;
         m/to=\"(\d+)\"/;          m/to=\"(\d+)\"/;
  push @number_seq,$1;   push @number_seq,$1;
  $startlink = index($map_string,'from="'.$1.'"',$startlink);   $startlink = index($map_string,'from="'.$1.'"',0);
  $startlink = rindex($map_string,'<link ',$startlink);   $startlink = rindex($map_string,'<link ',$startlink);
     }      }
     my $stalink = index($map_string,' to="'.$number_seq[0].'"',$startlink);      my $stalink = index($map_string,' to="'.$number_seq[0].'"',$startlink);

Removed from v.1.39  
changed lines
  Added in v.1.44


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