Diff for /loncom/interface/lonprintout.pm between versions 1.74 and 1.75

version 1.74, 2002/09/23 21:09:58 version 1.75, 2002/09/24 13:52:24
Line 460  ENDPART Line 460  ENDPART
  my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});   my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
  my @sequence = split('___',$symbolic);   my @sequence = split('___',$symbolic);
  my $primary_sequence = '/res/'.$sequence[0];   my $primary_sequence = '/res/'.$sequence[0];
  my @master_seq = &coming_from_hash($primary_sequence,$sequence[0);    my @master_seq = &coming_from_hash($primary_sequence,$sequence[0]); 
         #loop over students          #loop over students
  my $flag_latex_header_remove = 'NO';     my $flag_latex_header_remove = 'NO';  
  foreach my $person (@students) {   foreach my $person (@students) {
Line 527  ENDPART Line 527  ENDPART
  $result .= '\end{document}';         $result .= '\end{document}';      
     }      }
 #-------------------------------------------------------- corrections for the different page formats  #-------------------------------------------------------- corrections for the different page formats
 #    my ($textwidth,$textheight,$offset) = (0,0,0);      my ($textwidth,$textheight,$oddoffset,$evenoffset) = (0,0,0,0);
 #    if ($papersize=~/Letter/) {      if ($papersize=~/Letter/) {
 # $textwidth = ;   if ($layout eq 'CAPA') {
 #        $textheight = ;      if ($numberofcolumns == 1) {
 #        $offset = ;   $textwidth = '18 cm';
    $textheight = '25.9 cm';
    $oddoffset = '-0.57 in';
    $evenoffset = '-0.57 in';
       } elsif ($numberofcolumns == 2) {
    $textwidth = '9 cm';
    $textheight = '25.9 cm';
    $oddoffset = '-0.57 in';
    $evenoffset = '-0.57 in';
       }
    } elsif ($layout eq 'CBI') {
       if ($numberofcolumns == 1) {
    $textwidth = '8.8 in';
    $textheight = '6.8 in';
    $oddoffset = '-40 pt';
    $evenoffset = '-60 pt';
       } elsif ($numberofcolumns == 2) {
    $textwidth = '4.4 in';
    $textheight = '6.8 in';
    $oddoffset = '-40 pt';
    $evenoffset = '-60 pt';
       }
    }
 #    } elsif($papersize=~/Legal/) {  #    } elsif($papersize=~/Legal/) {
 # $textwidth = ;  # $textwidth = ;
 #        $textheight = ;  #        $textheight = ;
Line 574  ENDPART Line 596  ENDPART
 #                                            <option> A5 [148x210 mm] </option>  #                                            <option> A5 [148x210 mm] </option>
 #                                            <option> A6 [105x148 mm] </option>  #                                            <option> A6 [105x148 mm] </option>
 #  #
 #    }      }
   
     if ($layout eq 'CBI' and $numberofcolumns eq '1') {      if ($layout eq 'CBI' and $numberofcolumns eq '1') {
  $result =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{-40pt}\\setlength{\\evensidemargin}{-60pt}\\setlength{\\topmargin}{200pt}\\setlength{\\textwidth}{4\.4in}\\setlength{\\textheight}{6\.8in}\\setlength{\\parindent}{20pt}\\setlength{\\marginparwidth}{90pt}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt} \\begin{document}/;   $result =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{-40pt}\\setlength{\\evensidemargin}{-60pt}\\setlength{\\topmargin}{200pt}\\setlength{\\textwidth}{4\.4in}\\setlength{\\textheight}{6\.8in}\\setlength{\\parindent}{20pt}\\setlength{\\marginparwidth}{90pt}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt} \\begin{document}/;
Line 624  ENDPART Line 646  ENDPART
     $result =~ s/\\\\\s*\\noindent\s*(\\\\)+/\\\\\\noindent /g;      $result =~ s/\\\\\s*\\noindent\s*(\\\\)+/\\\\\\noindent /g;
     $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/\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+);/) {
Line 1071  sub character_chart { Line 1092  sub character_chart {
 #    $result =~ s/&#254;//g;  #    $result =~ s/&#254;//g;
 #    $result =~ s/&thorn;//g;  #    $result =~ s/&thorn;//g;
     $result =~ s/&#255;/\\"{y}/g;      $result =~ s/&#255;/\\"{y}/g;
     $result =~ s/&yuml;/\\"{y}/g;      $result =~ s/&yuml;/\\"{y}/g;    
       $result =~ s/&#952;/\$\\theta\$/g; #converts theta from html into tex
     return $result;      return $result;
 }  }
   

Removed from v.1.74  
changed lines
  Added in v.1.75


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