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

Diff for /loncom/interface/lonprintout.pm between versions 1.375 and 1.379

version 1.375, 2005/05/02 11:23:22 version 1.379, 2005/07/25 10:27:51
Line 445  my %page_formats= Line 445  my %page_formats=
      '2' => ['3.16 in','13 in','-0.57 in','-0.57 in','-0.5 in']       '2' => ['3.16 in','13 in','-0.57 in','-0.57 in','-0.5 in']
  },   },
  'album' => {   'album' => {
      '1' => [],       '1' => ['12 in','7.1 in',,'-0.57 in','-0.57 in','-0.5 in'],
      '2' => []               '2' => ['6.0 in','7.1 in','-1 in','-1 in','5 in']
           },            },
      },       },
      'tabloid' => {       'tabloid' => {
Line 455  my %page_formats= Line 455  my %page_formats=
      '2' => ['4.9 in','16 in','-0.57 in','-0.57 in','-0.5 in']       '2' => ['4.9 in','16 in','-0.57 in','-0.57 in','-0.5 in']
  },   },
  'album' => {   'album' => {
      '1' => [],       '1' => ['16 in','9.8 in','-0.57 in','-0.57 in','-0.5 in'],
      '2' => []       '2' => ['16 in','4.9 in','-0.57 in','-0.57 in','-0.5 in']
           },            },
      },       },
      'executive' => {       'executive' => {
Line 650  sub latex_corrections { Line 650  sub latex_corrections {
  $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/(\s)(\s+)/$1/g; #removes more than one empty space      #removes more than one empty space
       $result =~ s|(\s\s+)|($1=~/[\n\r]/)?"\n":" "|ge;
     $result =~ s/\\\\\s*\\vskip/\\vskip/gm;      $result =~ s/\\\\\s*\\vskip/\\vskip/gm;
     $result =~ s/\\\\\s*\\noindent\s*(\\\\)+/\\\\\\noindent /g;      $result =~ s/\\\\\s*\\noindent\s*(\\\\)+/\\\\\\noindent /g;
     $result =~ s/{\\par }\s*\\\\/\\\\/gm;      $result =~ s/{\\par }\s*\\\\/\\\\/gm;
Line 1372  ENDPART Line 1373  ENDPART
 #-- writing .tex file in prtspool   #-- writing .tex file in prtspool 
     my $temp_file;      my $temp_file;
     my $identifier = &Apache::loncommon::get_cgi_id();      my $identifier = &Apache::loncommon::get_cgi_id();
     my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout_".$identifier.".tex";      my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout_$identifier.tex";
     if (!($#print_array>0)) {       if (!($#print_array>0)) { 
  unless ($temp_file = Apache::File->new('>'.$filename)) {   unless ($temp_file = Apache::File->new('>'.$filename)) {
     $r->log_error("Couldn't open $filename for output $!");      $r->log_error("Couldn't open $filename for output $!");
Line 1395  ENDPART Line 1396  ENDPART
     my $temp_file;      my $temp_file;
     my $newfilename=$filename;      my $newfilename=$filename;
     my $num=$i+1;      my $num=$i+1;
     $newfilename =~s/\.tex$/_$num\.tex/;       $newfilename =~s/\.tex$//; 
       $newfilename=sprintf("%s_%03d.tex",$newfilename, $num);
     unless ($temp_file = Apache::File->new('>'.$newfilename)) {      unless ($temp_file = Apache::File->new('>'.$newfilename)) {
  $r->log_error("Couldn't open $newfilename for output $!");   $r->log_error("Couldn't open $newfilename for output $!");
  return SERVER_ERROR;    return SERVER_ERROR; 
Line 2191  CHOOSE_FROM_ANY_SEQUENCE Line 2193  CHOOSE_FROM_ANY_SEQUENCE
         </defaultvalue>          </defaultvalue>
     </string>      </string>
      <message></td></tr><tr><td align="right">Use style file:</td><td></message>       <message></td></tr><tr><td align="right">Use style file:</td><td></message>
              <message><input type="text" size="40" name="style_file_value" value="$stylevalue"  />&nbsp; <a href="javascript:openbrowser('helpform','style_file','sty')">Select style file</a> </td><td></message>               <message><input type="text" size="40" name="style_file_value" value="$stylevalue"  />&nbsp; <a href="javascript:openbrowser('helpform','style_file','sty')">Select style file</a> </td><tr><td></message>
              <message></td></tr></message>  
      <choices allowempty="1" multichoice="true" variable="showallfoils">       <choices allowempty="1" multichoice="true" variable="showallfoils">
                 <choice computer="1">Show all foils?</choice>                  <choice computer="1">Show all foils?</choice>
              </choices>               </choices>
        <message></td></tr></message>
 RNDSEED  RNDSEED
             &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);              &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
     $helper->{'VARS'}->{'style_file'}=$env{'form.style_file_value'};      $helper->{'VARS'}->{'style_file'}=$env{'form.style_file_value'};
Line 2271  use Apache::lonlocal; Line 2273  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
   
 my $maxColumns = 2;  my $maxColumns = 2;
   # it'd be nice if these all worked
   #my @paperSize = ("letter [8 1/2x11 in]", "legal [8 1/2x14 in]", 
   #                 "tabloid (ledger) [11x17 in]", "executive [7 1/2x10 in]",
   #                 "a2 [420x594 mm]", "a3 [297x420 mm]", "a4 [210x297 mm]", 
   #                 "a5 [148x210 mm]", "a6 [105x148 mm]" );
 my @paperSize = ("letter [8 1/2x11 in]", "legal [8 1/2x14 in]",   my @paperSize = ("letter [8 1/2x11 in]", "legal [8 1/2x14 in]", 
                  "tabloid (ledger) [11x17 in]", "executive [7 1/2x10 in]",   "a4 [210x297 mm]");
                  "a2 [420x594 mm]", "a3 [297x420 mm]", "a4 [210x297 mm]",   
                  "a5 [148x210 mm]", "a6 [105x148 mm]" );  
   
 # Tentative format: Orientation (L = Landscape, P = portrait) | Colnum |  # Tentative format: Orientation (L = Landscape, P = portrait) | Colnum |
 #                   Paper type  #                   Paper type
Line 2310  sub render { Line 2315  sub render {
   </tr>    </tr>
   <tr>    <tr>
     <td>      <td>
       <input type="radio" name="${var}.layout" value="L" /> Landscape<br />        <label><input type="radio" name="${var}.layout" value="L" /> Landscape </label><br />
       <input type="radio" name="${var}.layout" value="P" checked='1'  /> Portrait        <label><input type="radio" name="${var}.layout" value="P" checked='1'  /> Portrait </label>
     </td>      </td>
     <td align="center">      <td align="center">
       <select name="${var}.cols">        <select name="${var}.cols">
Removed from v.1.375  
changed lines
  Added in v.1.379

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