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

Diff for /loncom/interface/lonprintout.pm between versions 1.461 and 1.464

version 1.461, 2006/07/17 10:41:30 version 1.464, 2006/07/18 18:19:51
Line 627  my %page_formats= Line 627  my %page_formats=
      '2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','0.7 cm']       '2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','0.7 cm']
  },   },
  'album' => {   'album' => {
      '1' => [ '8.8 in', '6.8 in','-40 pt in',  '-60 pt','1 cm'],       '1' => [ '8.8 in', '6.8 in','-0.55 in',  '-0.83 in','1 cm'],
      '2' => [ '4.4 in', '6.8 in','-0.5 in', '-1.5 in','3.5 in']       '2' => [ '4.4 in', '6.8 in','-0.5 in', '-1.5 in','3.5 in']
  },   },
      },       },
Line 683  my %page_formats= Line 683  my %page_formats=
      },       },
      'a4' => {       'a4' => {
  'book' => {   'book' => {
      '1' => ['176 mm','272 mm','-40 pt in','-60 pt','-0.5 in'],       '1' => ['17.6 cm','27.2 cm','-0.55  in','-0.83 in','-0.5 in'],
      '2' => [ '91 mm','272 mm','-40 pt in','-60 pt','-0.5 in']       '2' => [ '9.1 cm','27.2 cm','-0.55  in','-0.83 in','-0.5 in']
  },   },
  'album' => {   'album' => {
      '1' => ['8.5 in','7.7 in','-40 pt in','-60 pt','0 in'],       '1' => ['8.5 in','7.7 in','-0.55 in','-0.83 in','0 in'],
      '2' => ['3.9 in','7.7 in','-40 pt in','-60 pt','0 in']       '2' => ['3.9 in','7.7 in','-0.55 in','-0.83 in','0 in']
  },   },
      },       },
      'a5' => {       'a5' => {
Line 1082  sub print_construction_sequence { Line 1082  sub print_construction_sequence {
     #      #
     my @order    = @Apache::lonratedt::order;      my @order    = @Apache::lonratedt::order;
     my @resources = @Apache::lonratedt::resources;       my @resources = @Apache::lonratedt::resources; 
     &Apache::lonnet::logthis("mapread for $currentURL returned: $errtext");  
     for (my $member=0;$member<=$#order;$member++) {      for (my $member=0;$member<=$#order;$member++) {
  $resources[$order[$member]]=~/^([^:]*):([^:]*):/;   $resources[$order[$member]]=~/^([^:]*):([^:]*):/;
  my $urlp=$2;   my $urlp=$2;
  &Apache::lonnet::logthis("Processing $urlp from sequence ($member)");  
  if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {   if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
     my $texversion='';      my $texversion='';
     if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {      if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
Line 1133  sub print_construction_sequence { Line 1131  sub print_construction_sequence {
     $result.=$texversion;      $result.=$texversion;
   
  } elsif ($urlp=~/\.(sequence|page)$/) {   } elsif ($urlp=~/\.(sequence|page)$/) {
     &Apache::lonnet::logthis("elsif just strutting stuff");  
           
     # header:      # header:
   
Line 1337  ENDPART Line 1334  ENDPART
  && $currentURL=~/\.sequence$/ && $helper->{'VARS'}->{'construction'} eq '1') {   && $currentURL=~/\.sequence$/ && $helper->{'VARS'}->{'construction'} eq '1') {
             #printing content of sequence from the construction space              #printing content of sequence from the construction space
     $currentURL=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;      $currentURL=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;
     &Apache::lonnet::logthis("Sequence from constrution space. ouptput is:");  
     &Apache::lonnet::logthis($result);  
     $result .= &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});      $result .= &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
     $result .= &print_construction_sequence($currentURL, $helper, %form,      $result .= &print_construction_sequence($currentURL, $helper, %form,
     $LaTeXwidth);      $LaTeXwidth);
     &Apache::lonnet::logthis("Back from construction space print");  
     $result .= '\end{document}';        $result .= '\end{document}';  
     if (!($result =~ /\\begin\{document\}/)) {      if (!($result =~ /\\begin\{document\}/)) {
  &Apache::lonnet::logthis("inserting header");  
  $result = &print_latex_header() . $result;   $result = &print_latex_header() . $result;
     }      }
     # End construction space sequence.      # End construction space sequence.
Line 1766  ENDPART Line 1759  ENDPART
        $selectionmade,          $selectionmade, 
        $helper->{'VARS'}->{'ANSWER_TYPE'});         $helper->{'VARS'}->{'ANSWER_TYPE'});
     }      }
 #    if ($numberofcolumns == 1) {      #if ($numberofcolumns == 1) {
  $result =~ s/\\textwidth\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /;   $result =~ s/\\textwidth\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /;
  $result =~ s/\\textheight\s*=?\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;   $result =~ s/\\textheight\s*=?\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;
  $result =~ s/\\evensidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;   $result =~ s/\\evensidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
  $result =~ s/\\oddsidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;   $result =~ s/\\oddsidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\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;
Line 2973  sub new { Line 2966  sub new {
     # $helper->{VARS} to figure out whether the columns are one or two      # $helper->{VARS} to figure out whether the columns are one or two
     $self->{'formatvar'} = shift;      $self->{'formatvar'} = shift;
   
     # The state to transition to after selection, or after discovering  
     # the cols are not set to 1  
     $self->{NEXTSTATE} = shift;      $self->{NEXTSTATE} = shift;
     bless($self);      bless($self);
     return $self;      return $self;
Line 2987  sub render { Line 2979  sub render {
     my $var = $self->{'variable'};      my $var = $self->{'variable'};
   
     if (defined $self->{ERROR_MSG}) {      if (defined $self->{ERROR_MSG}) {
         $result .= '<br /><font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br />';          $result .= '<br /><span class="LC_error">' . $self->{ERROR_MSG} . '</span><br />';
     }      }
   
     my $width = 18;  
     my $format = $helper->{VARS}->{$self->{'formatvar'}};      my $format = $helper->{VARS}->{$self->{'formatvar'}};
     if (substr($format, 2, 1) ne '1') {  
  $width = 9;      # Use format to get sensible defaults for the margins:
   
   
       my ($laystyle, $cols, $papersize) = split(/\|/, $format);
       ($papersize)                      = split(/ /, $papersize);
   
   
       if ($laystyle eq 'L') {
    $laystyle = 'album';
       } else {
    $laystyle = 'book';
       }
   
   
       my %size;
       ($size{'width_and_units'},
        $size{'height_and_units'},
        $size{'margin_and_units'})=
    &Apache::lonprintout::page_format($papersize, $laystyle, $cols);
       
       foreach my $dimension ('width','height','margin') {
    ($size{$dimension},$size{$dimension.'_unit'}) =
       split(/ +/, $size{$dimension.'_and_units'},2);
          
    foreach my $unit ('cm','in') {
       $size{$dimension.'_options'} .= '<option ';
       if ($size{$dimension.'_unit'} eq $unit) {
    $size{$dimension.'_options'} .= 'selected="selected" ';
       }
       $size{$dimension.'_options'} .= '>'.$unit.'</option>';
    }
     }      }
   
     $result .= <<ELEMENTHTML;      $result .= <<ELEMENTHTML;
   
 <p>How should the column be formatted?</p>  
   
   <p>How should each column be formatted?</p>
   
 <table cellpadding='3'>  <table cellpadding='3'>
   <tr>    <tr>
     <td align='right'><b>Width</b>:</td>      <td align='right'><b>Width</b>:</td>
     <td align='left'><input type='text' name='$var.width' value='$width' size='4'></td>      <td align='left'><input type='text' name='$var.width' value="$size{'width'}" size='4' /></td>
     <td align='left'>      <td align='left'>
       <select name='$var.widthunit'>        <select name='$var.widthunit'>
         <option>cm</option><option>in</option>        $size{'width_options'}
       </select>        </select>
     </td>      </td>
   </tr>    </tr>
   <tr>    <tr>
     <td align='right'><b>Height</b>:</td>      <td align='right'><b>Height</b>:</td>
     <td align='left'><input type='text' name="$var.height" value="25.9" size='4'></td>      <td align='left'><input type='text' name="$var.height" value="$size{'height'}" size='4' /></td>
     <td align='left'>      <td align='left'>
       <select name='$var.heightunit'>        <select name='$var.heightunit'>
         <option>cm</option><option>in</option>        $size{'height_options'}
       </select>        </select>
     </td>      </td>
   </tr>    </tr>
   <tr>    <tr>
     <td align='right'><b>Left margin</b>:</td>      <td align='right'><b>Left margin</b>:</td>
     <td align='left'><input type='text' name='$var.lmargin' value='-1.5' size='4'></td>      <td align='left'><input type='text' name='$var.lmargin' value="$size{'margin'}" size='4' /></td>
     <td align='left'>      <td align='left'>
       <select name='$var.lmarginunit'>        <select name='$var.lmarginunit'>
         <option>cm</option><option>in</option>        $size{'margin_options'}
       </select>        </select>
     </td>      </td>
   </tr>    </tr>
 </table>  </table>
   
 <p>Hint: Some instructors like to leave scratch space for the student by  <!--<p>Hint: Some instructors like to leave scratch space for the student by
 making the width much smaller than the width of the page.</p>  making the width much smaller than the width of the page.</p>-->
   
 ELEMENTHTML  ELEMENTHTML
   
Line 3044  sub preprocess { Line 3067  sub preprocess {
     my $helper = Apache::lonhelper::getHelper();      my $helper = Apache::lonhelper::getHelper();
   
     my $format = $helper->{VARS}->{$self->{'formatvar'}};      my $format = $helper->{VARS}->{$self->{'formatvar'}};
 #    if (substr($format, 2, 1) ne '1') {  
 #        $helper->changeState($self->{NEXTSTATE});  
 #    }  
         
     return 1;      return 1;
 }  }
Line 3068  sub postprocess { Line 3088  sub postprocess {
     # /^-?[0-9]+(\.[0-9]*)?$/ -> optional minus, at least on digit, followed       # /^-?[0-9]+(\.[0-9]*)?$/ -> optional minus, at least on digit, followed 
     # by an optional period, followed by digits, ending the string      # by an optional period, followed by digits, ending the string
   
     if ($width !~  /^-?[0-9]+(\.[0-9]*)?$/) {      if ($width !~  /^-?[0-9]*(\.[0-9]*)?$/) {
         $error .= "Invalid width; please type only a number.<br />\n";          $error .= "Invalid width; please type only a number.<br />\n";
     }      }
     if ($height !~  /^-?[0-9]+(\.[0-9]*)?$/) {      if ($height !~  /^-?[0-9]*(\.[0-9]*)?$/) {
         $error .= "Invalid height; please type only a number.<br />\n";          $error .= "Invalid height; please type only a number.<br />\n";
     }      }
     if ($lmargin !~  /^-?[0-9]+(\.[0-9]*)?$/) {      if ($lmargin !~  /^-?[0-9]*(\.[0-9]*)?$/) {
         $error .= "Invalid left margin; please type only a number.<br />\n";          $error .= "Invalid left margin; please type only a number.<br />\n";
     }      }
   
Removed from v.1.461  
changed lines
  Added in v.1.464

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