--- loncom/interface/lonprintout.pm 2002/09/19 20:18:09 1.72
+++ loncom/interface/lonprintout.pm 2003/01/10 15:41:26 1.103
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.72 2002/09/19 20:18:09 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.103 2003/01/10 15:41:26 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -54,7 +54,7 @@ use GDBM_File;
my %hash;
-
+my $LaTeXwidth = 0;
sub headerform {
my $r = shift;
@@ -66,37 +66,41 @@ sub headerform {
<body bgcolor="FFFFFF">
<form method="post" enctype="multipart/form-data" action="/adm/printout" name="printform">
ENDHEADER
- if ($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) {
- $r->print(<<ENDHEADER1);
+
+ if ($ENV{'form.postdata'}=~m|^/res/|) {
+ $r->print(<<ENDHEADER1);
<b>Path to current document: </b><tt>$ENV{'form.postdata'}</tt><p>
ENDHEADER1
-}
+ }
}
sub menu_for_output {
my $r = shift;
my ($title_for_single_resource,$title_for_sequence,$title_for_main_map) = &details_for_menu;
+ my $assignment = $title_for_sequence;
if ($title_for_single_resource ne '') {$title_for_single_resource = '"'.$title_for_single_resource.'"';}
if ($title_for_sequence ne '') {$title_for_sequence = '"'.$title_for_sequence.'"';}
if ($title_for_main_map ne '') {$title_for_main_map = '"'.$title_for_main_map.'"';}
+ $ENV{'form.postdata'} =~ s|http://[^/]+||;
my $subdir_to_print = $ENV{'form.postdata'};
$subdir_to_print =~ m/\/([^\/]+)$/;
- $subdir_to_print =~ s/$1//;
+ $subdir_to_print =~ s/\Q$1\E//;
$r->print(<<ENDMENUOUT1);
<h1>What do you want to print? Make a choice.</h1><br />
<input type="hidden" name="phase" value="two">
<input type="hidden" name="url" value="$ENV{'form.postdata'}">
+<input type="hidden" name="assignment" value="$assignment">
<input type="radio" name="choice" value="Standard LaTeX output for current document" checked> Current document <b>$title_for_single_resource</b>
(prints what you just saw on the screen)<br />
ENDMENUOUT1
- if ((not $ENV{'request.role'}=~m/^au\./) and (not $ENV{'request.role'}=~m/^ca\./)) {
+ if ($ENV{'form.postdata'}=~/\/res\//) {
$r->print(<<ENDMENUOUT2);
-<input type="radio" name="choice" value="Standard LaTeX output for the primary sequence"> All problems from <b>$title_for_sequence</b><br />
-<input type="radio" name="choice" value="Standard LaTeX output for whole primary sequence"> All problems plus any pages or html/xml files from <b>$title_for_sequence</b><br />
+<input type="radio" name="choice" value="Standard LaTeX output for the primary sequence"> Problem(s) from <b>$title_for_sequence</b><br />
+<input type="radio" name="choice" value="Standard LaTeX output for whole primary sequence"> Problem(s) plus page(s) or html/xml file(s) from <b>$title_for_sequence</b><br />
ENDMENUOUT2
}
- if ($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) {
+ if (($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) and ($ENV{'form.postdata'}=~/\/res\//)) {
$r->print(<<ENDMENUOUT6);
<input type="radio" name="choice" value="Standard LaTeX output for the top level sequence"> All problems in this course (<b>warning:</b> this may be time consuming) <br />
<br />
@@ -105,7 +109,7 @@ ENDMENUOUT6
}
my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
$subdirtoprint =~ s/\/[^\/]+$//;
- if (&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') {
+ if ((&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') and ($ENV{'form.postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) {
$r->print(<<ENDMENUOUT4);
<input type="radio" name="choice" value="Subdirectory print"> Problems from current subdirectory <b>$subdir_to_print</b><br />
ENDMENUOUT4
@@ -147,19 +151,84 @@ ENDMENUOUT5
}
+sub sequence_content_menu {
+ my ($key_to,$r) = @_;
+ my $primary_sequence;
+ my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
+ my @sequence = split('___',$symbolic);
+ if ($sequence[0]=~/^uploaded/) {$primary_sequence = '/'.$sequence[0];}
+ else {$primary_sequence = '/res/'.$sequence[0];}
+ my @master_seq = &coming_from_hash($primary_sequence,$sequence[0]);
+ my @master_seq_view = sort @master_seq;
+ @master_seq = sort @master_seq;
+ for (my $i=0;$i<=$#master_seq_view;$i++) {
+ $master_seq_view[$i]=~/\/([^\/]+)$/;
+ $master_seq_view[$i]=$1;
+ }
+ $r->print(<<ENDMENUOUT1);
+<input type="hidden" name="url" value="$ENV{'form.url'}">
+<input type="hidden" name="choice" value="$ENV{'form.choice'}">
+<input type="hidden" name="layout" value="$ENV{'form.layout'}">
+<input type="hidden" name="papersize" value="$ENV{'form.papersize'}">
+<input type="hidden" name="assignment" value="$ENV{'form.assignment'}">
+<input type="hidden" name="numberofcolumns" value="$ENV{'form.numberofcolumns'}">
+<h1>Mark item(s) which you want to print</h1>
+<script>
+ function checkall() {
+ for (i=0; i<document.forms.printform.elements.length; i++) {
+ if
+ (document.forms.printform.elements[i].name.indexOf('whatfile')==0) {
+ document.forms.printform.elements[i].checked=true;
+ }
+ }
+ }
+ function uncheckall() {
+ for (i=0; i<document.forms.printform.elements.length; i++) {
+ if
+ (document.forms.printform.elements[i].name.indexOf('whatfile')==0) {
+ document.forms.printform.elements[i].checked=false;
+ }
+ }
+ }
+</script>
+<input type=button onClick="checkall()" value="Check All">
+<input type=button onClick="uncheckall()" value="Uncheck">
+<p>
+ENDMENUOUT1
+ my $inc=0;
+ for (my $i=0;$i<=$#master_seq_view;$i++) {
+ if ($key_to==1 && $master_seq_view[$i]=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
+ $r->print('<br /><input type=checkbox name="whatfile'.$inc.'" value="'.$master_seq[$i].'"> '."\n".
+ $master_seq_view[$i]);
+ $inc++;
+ } elsif ($key_to==0 && $master_seq_view[$i]=~/\.(problem|exam|quiz|assess|survey|form|library|xml|htm|html|page)$/) {
+ $r->print('<br /><input type=checkbox name="whatfile'.$inc.'" value="'.$master_seq[$i].'"> '.
+ $master_seq_view[$i]);
+ $inc++;
+ }
+ }
+ $r->print(<<ENDMENUOUT2);
+<br />
+<input type="hidden" name="numberoffiles" value="$inc">
+<input type="hidden" name="phase" value="three">
+<input type="submit" value="Submit">
+ENDMENUOUT2
+
+}
+
+
sub problem_choice_menu {
my $r = shift;
my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
$subdirtoprint =~ s/\/[^\/]+$//;
my @list_of_files = ();
- if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
- $subdirtoprint =~ s/^[^~]*~(\w+)\//\/home\/$1\/public_html\//;
- } else {
- $subdirtoprint =~ s/.*(\/res\/)/$1/;
- }
my @content_directory = ();
- if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
- @content_directory = &Apache::lonnet::dirlist($subdirtoprint,$ENV{'user.domain'}, $ENV{'user.name'},'');
+ if ($subdirtoprint =~ m|/home/([^/]+)/public_html|) {
+ #localmachine CSTR space
+ my $user=$1;
+ my $domain=$Apache::lonnet::perlvar{'lonDefDomain'};
+ @content_directory = &Apache::lonnet::dirlist($subdirtoprint,
+ $domain, $user,'');
} else {
@content_directory = &Apache::lonnet::dirlist($subdirtoprint);
}
@@ -203,14 +272,15 @@ sub problem_choice_menu {
<input type=button onClick="uncheckall()" value="Uncheck">
<p>
ENDMENUOUT1
- my $i;
- foreach my $file (@list_of_files) {
+ my $i=0;
+ foreach my $file (sort @list_of_files) {
$r->print('<br /><input type=checkbox name="whattoprint'.$i.'" value="'.$file.'"> '.
$file);
$i++;
}
$r->print(<<ENDMENUOUT2);
<br />
+<input type="hidden" name="papersize" value="$ENV{'form.papersize'}">
<input type="hidden" name="numberofproblems" value="$i">
<input type="hidden" name="phase" value="three">
<input type="submit" value="Submit">
@@ -225,7 +295,8 @@ sub additional_class_menu {
<input type="hidden" name="choice" value="$ENV{'form.choice'}">
<input type="hidden" name="layout" value="$ENV{'form.layout'}">
<input type="hidden" name="numberofcolumns" value="$ENV{'form.numberofcolumns'}">
-<h1>Mark students which assignments you want to print</h1>
+<input type="hidden" name="assignment" value="$ENV{'form.assignment'}">
+<h1>Select student(s) whose assignment you want to print</h1>
ENDMENUOUT1
my %courselist=&Apache::lonnet::dump(
'classlist',
@@ -263,7 +334,7 @@ ENDMENUOUT1
}
</script>
<input type=button onClick="checkall()" value="Check All">
-<input type=button onClick="checksec()" value="Check Section/Group">
+<input type=button onClick="checksec()" value="Type Section/Group then click">
<input type=text size=5 name=chksec>
<input type=button onClick="uncheckall()" value="Uncheck">
<p>
@@ -291,7 +362,13 @@ ENDDISHEADER
}
}
$r->print(<<ENDMENUOUT2);
-<br />
+<br />Number of blank pages to add: <select name="addedpages"><option selected>0</option>
+ <option>1</option>
+ <option>2</option>
+ <option>3</option>
+ </select>
+<br />
+<input type="hidden" name="papersize" value="$ENV{'form.papersize'}">
<input type="hidden" name="numberofstudents" value="$i">
<input type="hidden" name="phase" value="three">
<input type="submit" value="Submit">
@@ -308,15 +385,22 @@ sub additional_print_menu {
for (my $i=0; $i<$ENV{'form.numberofproblems'};$i++) {
$what_to_print .= '<input type="hidden" name="whattoprint'.$i.'" value="'.$ENV{'form.whattoprint'.$i}.'">';
}
+ for (my $i=0; $i<$ENV{'form.numberoffiles'};$i++) {
+ $what_to_print .= '<input type="hidden" name="whatfile'.$i.'" value="'.$ENV{'form.whatfile'.$i}.'">';
+ }
$r->print(<<ENDMENUOUT);
$what_to_print
<input type="hidden" name="url" value="$ENV{'form.url'}">
<input type="hidden" name="choice" value="$ENV{'form.choice'}">
<input type="hidden" name="layout" value="$ENV{'form.layout'}">
+<input type="hidden" name="papersize" value="$ENV{'form.papersize'}">
<input type="hidden" name="numberofstudents" value="$ENV{'form.numberofstudents'}">
<input type="hidden" name="numberofproblems" value="$ENV{'form.numberofproblems'}">
+<input type="hidden" name="numberoffiles" value="$ENV{'form.numberoffiles'}">
<input type="hidden" name="numberofcolumns" value="$ENV{'form.numberofcolumns'}">
-Define page layout parameters: <br />
+<input type="hidden" name="assignment" value="$ENV{'form.assignment'}">
+<input type="hidden" name="addedpages" value="$ENV{'form.addedpages'}">
+Define one column layout parameters: <br />
<b>Width</b>: <input type="text" name="width" width="8" value="9cm"> <br />
<b>Height</b>: <input type="text" name="height" width="8" value="25.9cm"> <br />
<b>Left margin</b>: <input type="text" name="leftmargin" width="8" value="-0.57in"> <br />
@@ -342,88 +426,108 @@ ENDPART
my $choice = $ENV{'form.choice'};
my $layout = $ENV{'form.layout'};
- my $numberofcolumns = $ENV{'form.numberofcolumns'};
+ my $numberofcolumns = $ENV{'form.numberofcolumns'};
+ my $papersize = $ENV{'form.papersize'};
my $laystyle = 'book';
+ my $assignment = $ENV{'form.assignment'};
+ if ($choice eq 'Subdirectory print') {
+ if ($ENV{'form.layout'} eq '') {$layout = 'CAPA';}
+ if ($ENV{'form.papersize'} eq '') {$papersize = 'Letter [8 1/2x11 in]';}
+ if ($ENV{'form.numberofcolumns'} eq '') {$numberofcolumns = 2;}
+ }
+ if (($choice eq 'Standard LaTeX output for current document') &&
+ ($ENV{'form.url'}=~m|^/~|)) {
+ if ($ENV{'form.layout'} eq '') {$layout = 'CAPA';}
+ if ($ENV{'form.papersize'} eq '') {$papersize = 'Letter [8 1/2x11 in]';}
+ if ($ENV{'form.numberofcolumns'} eq '') {$numberofcolumns = 2;}
+ }
my $result = '';
my $number_of_columns = 1; #used only for pages to determine the width of the cell
my $selectionmade = '';
+ my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$layout,$numberofcolumns);
+ my $LaTeXwidth;
+ if ($textwidth=~/(\d+\s*cm)/) {
+ $LaTeXwidth = $1*10;
+ } elsif ($textwidth=~/(\d+\s*mm)/) {
+ $LaTeXwidth = $1;
+ }
if ($choice eq 'Standard LaTeX output for current document') {
#-- single document - problem, page, html, xml
$selectionmade = 1;
- my %moreenv;
- $moreenv{'form.grade_target'}='tex';
- if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
+ if ($ENV{'form.url'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+ my %moreenv;
+ $moreenv{'form.grade_target'}='tex';
+ if (&Apache::lonnet::allowed('bre',$ENV{'form.url'})) {
$ENV{'form.url'}=~s/http:\/\/[^\/]+//;
- }
- $moreenv{'request.filename'}=$ENV{'form.url'};
- &Apache::lonnet::appenv(%moreenv);
- my $texversion=&Apache::lonnet::ssi($ENV{'form.url'});
- &Apache::lonnet::delenv('form.grade_target');
- $result .= $texversion;
- if ($ENV{'form.url'}=~m/\.page\s*$/) {
+ }
+ $moreenv{'request.filename'}=$ENV{'form.url'};
+ $moreenv{'form.textwidth'}=$LaTeXwidth;
+ &Apache::lonnet::appenv(%moreenv);
+ my $texversion=&Apache::lonnet::ssi($ENV{'form.url'});
+ &Apache::lonnet::delenv('form.grade_target','form.textwidth','form.counter');
+ $result .= $texversion;
+ if ($ENV{'form.url'}=~m/\.page\s*$/) {
($result,$number_of_columns) = &page_cleanup($result);
+ }
+ } else {
+ $result='\documentclass[letterpaper]{article}\usepackage{calc}\begin{document}Printout of this type of document is currently not supported: ';
+ if ($ENV{'form.url'}=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) {
+ $result.=$1;
+ } else {
+ $result.=$ENV{'form.url'};
+ }
+ $result.=' \end{document}'
}
} 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
#-- where is the primary sequence containing file?
- my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
- $symbolic =~ m/([^_]+)_/;
- my $primary_sequence = '/res/'.$1;
- my @master_seq = &coming_from_hash($primary_sequence);
+ my @master_seq = ();
+ for (my $i=0; $i<$ENV{'form.numberoffiles'};$i++) {
+ if ($ENV{'form.whatfile'.$i}=~/\S/) {
+ push @master_seq,$ENV{'form.whatfile'.$i};
+ }
+ }
#-- produce an output string
my $flag_latex_header_remove = 'NO';
my $flag_page_in_sequence = 'NO';
for (my $i=0;$i<=$#master_seq;$i++) {
- my ($urlp,$symb) = split /&&/, $master_seq[$i];
+ my ($urlp,$symb) = split /&&/, $master_seq[$i];
if ($choice eq 'Standard LaTeX output for the primary sequence') {
- #prints only problems
- $selectionmade = 2;
- if ($urlp =~ m/\.(problem|exam|quiz|assess|survey|form|library)/) {
- my %moreenv;
- $moreenv{'form.grade_target'}='tex';
- &Apache::lonnet::appenv(%moreenv);
- my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb));
- &Apache::lonnet::delenv('form.grade_target');
- if ($flag_latex_header_remove ne 'NO') {
- $texversion = &latex_header_footer_remove($texversion);
- } else {
- $texversion =~ s/\\end{document}//;
- }
- $result .= $texversion;
- $flag_latex_header_remove = 'YES';
- }
- } elsif ($urlp =~ /\S+/) {
- #prints problems, pages and any html/xml files
- $selectionmade = 3;
- my %moreenv;
- $moreenv{'form.grade_target'}='tex';
- &Apache::lonnet::appenv(%moreenv);
- my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb));
- &Apache::lonnet::delenv('form.grade_target');
- if ($urlp =~ m/\.page/) {
- ($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
- if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;}
- $texversion =~ s/\\end{document}\d*/\\end{document}/;
- $flag_page_in_sequence = 'YES';
- }
- if ($flag_latex_header_remove ne 'NO') {
- $texversion = &latex_header_footer_remove($texversion);
- } else {
- $texversion =~ s/\\end{document}//;
- }
- $result .= $texversion;
- $flag_latex_header_remove = 'YES';
+ $selectionmade = 2;
+ } elsif ($choice eq 'Standard LaTeX output for whole primary sequence') {
+ $selectionmade = 3;
}
- }
+ my %moreenv;
+ $moreenv{'form.grade_target'}='tex';
+ $moreenv{'form.textwidth'}=$LaTeXwidth;
+ &Apache::lonnet::appenv(%moreenv);
+ #&Apache::lonnet::logthis("Trying to get $urlp with symb $symb");
+ my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb));
+ &Apache::lonnet::delenv('form.grade_target','form.textwidth');
+ if ($urlp =~ m/\.page/) {
+ ($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
+ if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;}
+ $texversion =~ s/\\end{document}\d*/\\end{document}/;
+ $flag_page_in_sequence = 'YES';
+ }
+ if ($flag_latex_header_remove ne 'NO') {
+ $texversion = &latex_header_footer_remove($texversion);
+ } else {
+ $texversion =~ s/\\end{document}//;
+ }
+ $result .= $texversion;
+ $flag_latex_header_remove = 'YES';
+ }
+ &Apache::lonnet::delenv('form.counter');
if ($flag_page_in_sequence eq 'YES') {$result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;}
$result .= '\end{document}';
} elsif ($choice eq 'Standard LaTeX output for the top level sequence') {
# where is the main sequence of the course?
$selectionmade = 4;
my $main_seq = '/res/'.$ENV{'request.course.uri'};
- my @file_seq = &coming_from_hash($main_seq);
+ my @file_seq = &coming_from_hash_whole($main_seq);
my $flag_latex_header_remove = 'NO';
#-- produce an output string
for (my $i=0;$i<=$#file_seq;$i++) {
@@ -432,23 +536,24 @@ ENDPART
if ($urlp=~m/\.(problem|exam|quiz|assess|survey|form|library)/) {
my %moreenv;
$moreenv{'form.grade_target'}='tex';
+ $moreenv{'form.textwidth'}=$LaTeXwidth;
&Apache::lonnet::appenv(%moreenv);
- my $texversion=&Apache::lonnet::ssi($urlp);
- &Apache::lonnet::delenv('form.grade_target');
+ my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb));
+ &Apache::lonnet::delenv('form.grade_target','form.textwidth');
if ($flag_latex_header_remove ne 'NO') {
$texversion = &latex_header_footer_remove($texversion);
} else {
$texversion =~ s/\\end{document}//;
}
- $result .= $texversion;
+ $result .= $texversion;
+ $flag_latex_header_remove = 'YES';
}
- $flag_latex_header_remove = 'YES';
}
$result .= '\end{document}';
} elsif ($choice eq 'All class print') {
#-- prints assignments for whole class or for selected students
$selectionmade = 5;
- my (@students,@st_output) = ((),());
+ my @students = ();
for (my $i=0; $i<$ENV{'form.numberofstudents'};$i++) {
if ($ENV{'form.whomtoprint'.$i}=~/:/) {
push @students,$ENV{'form.whomtoprint'.$i};
@@ -456,11 +561,14 @@ ENDPART
}
#where is the primary sequence containing current resource (the same for all students)?
my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
- $symbolic =~ m/([^_]+)_/;
- my $primary_sequence = '/res/'.$1;
- my @master_seq = &coming_from_hash($primary_sequence);
+ my @sequence = split('___',$symbolic);
+ my $primary_sequence = '/res/'.$sequence[0];
+ my @master_seq = &coming_from_hash($primary_sequence,$sequence[0]);
#loop over students
- my $flag_latex_header_remove = 'NO';
+ my $flag_latex_header_remove = 'NO';
+ my %moreenv;
+ $moreenv{'form.textwidth'}=$LaTeXwidth;
+ &Apache::lonnet::appenv(%moreenv);
foreach my $person (@students) {
my $current_output = '';
my ($usersection,$username,$userdomain) = split /:/,$person;
@@ -468,31 +576,34 @@ ENDPART
#goes through all resources, checks if they are available for current student, and produces output
foreach my $curresline (@master_seq) {
my ($curres,$symb) = split /&&/, $curresline;
- $curres =~ s/^"//;
- $curres =~ s/"$//;
- if ($curres=~/\w+/) {
+ if ($curres=~ m/\.(problem|exam|quiz|assess|survey|form|library)/) {
my ($map,$id,$res_url) = split(/___/,$symb);
if (&Apache::lonnet::allowed('bre',$res_url)) {
my $rendered = &Apache::loncommon::get_student_view($symb,$username,$userdomain,
$ENV{'request.course.id'},'tex');
- if ($flag_latex_header_remove ne 'NO') {
+ if ($flag_latex_header_remove eq 'YES') {
$rendered = &latex_header_footer_remove($rendered);
} else {
$rendered =~ s/\\end{document}//;
}
$current_output .= $rendered;
}
+ $flag_latex_header_remove = 'YES';
}
- $flag_latex_header_remove = 'YES';
}
if ($current_output=~/\\documentclass/) {
- $current_output =~ s/\\begin{document}/\\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent\\fbox{\\textbf{$fullname}}\\hskip 1\.4in } \\vskip 5 mm /;
+ my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+ $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm}\\setlength{\\headheight}{1cm}\\setlength{\\headsep}{0.5cm}\\pagestyle{myheadings}\\markboth{}{{$courseidinfo - $assignment}}\\begin{document}\\noindent\\textit{\\textbf{$fullname}}\\vskip 3 mm /;
} else {
- $current_output = '\\vskip 3mm\noindent\parbox{\minipagewidth}{\noindent\fbox{\textbf{'.$fullname.'}}\hskip 1.4in } \vskip 5 mm '.$current_output;
+ my $blanspages = '';
+ for (my $j=0;$j<$ENV{'form.addedpages'};$j++) {$blanspages.='\clearpage\strut\clearpage';}
+ $current_output = '\strut\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License } \\vskip 3mm'.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\textit{\textbf{'.$fullname.'}}\hskip 1.4in } \vskip 5 mm '.$current_output;
}
$result .= $current_output;
+ &Apache::lonnet::delenv('form.counter');
}
- $result .= '\end{document}';
+ $result .= '\end{document}';
+ &Apache::lonnet::delenv('form.textwidth');
} elsif ($choice eq 'Subdirectory print') {
#prints selected problems from the subdirectory
$selectionmade = 6;
@@ -508,13 +619,33 @@ ENDPART
if ($urlp=~/\//) {
my %moreenv;
$moreenv{'form.grade_target'}='tex';
+ $moreenv{'form.textwidth'}=$LaTeXwidth;
&Apache::lonnet::appenv(%moreenv);
- if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
- $urlp =~ s/\/home\/([^\/]*)\/public_html/\/~$1/;
+ if ($urlp =~ m|/home/([^/]+)/public_html|) {
+ $urlp =~ s|/home/([^/]*)/public_html|/~$1|;
}
my $texversion=&Apache::lonnet::ssi($urlp);
- &Apache::lonnet::delenv('form.grade_target');
- $texversion =~ s/(\\begin{document})/$1 {\\tiny\\begin{verbatim}$urlp\\end{verbatim}}/;
+ &Apache::lonnet::delenv('form.grade_target','form.textwidth');
+ #this chunck is responsible for printing the path to problem
+ my $newurlp = '';
+ my $HowMany = length($urlp)*2;
+ if ($HowMany > $LaTeXwidth) {
+ my @temporrary = split '/',$urlp;
+ my $HowManyNew = 0;
+ for (my $ii=0;$ii<=$#temporrary;$ii++) {
+ if ($temporrary[$ii] ne '') {
+ $HowManyNew += length($temporrary[$ii])*2;
+ if ($HowManyNew < $LaTeXwidth ) {
+ $newurlp .= '/'.$temporrary[$ii];
+ } else {
+ $HowManyNew = 0;
+ $newurlp .= '|\vskip -1 mm \noindent \verb|';
+ $ii--;
+ }
+ }
+ }
+ }
+ $texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 {\\small\\noindent\\verb|$newurlp\|\\vskip 0 mm}/;
if ($flag_latex_header_remove ne 'NO') {
$texversion = &latex_header_footer_remove($texversion);
} else {
@@ -526,35 +657,12 @@ ENDPART
}
$result .= '\end{document}';
}
-#-- corrections for the different page formats
- 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/\$number_of_columns/$number_of_columns/g;
- $laystyle = 'album';
- } elsif ($layout eq 'CBI' and $numberofcolumns eq '2') {
- $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/\$number_of_columns/$number_of_columns/g;
+#-------------------------------------------------------- corrections for the different page formats
+ $result = &page_format_transformation($papersize,$layout,$numberofcolumns,$choice,$result,$assignment);
+ if ($layout eq 'CBI') {
$laystyle = 'album';
- } elsif ($layout eq 'CAPA') {
- my $courseidinfo = $ENV{'request.role'};
- $_ = $courseidinfo;
- m/.*\/(.*)/;
- $courseidinfo = $ENV{'course.physnet_'.$1.'.description'};
- $result =~ s/\\documentclass\[letterpaper\]{article}/\\documentclass{article}/;
- if ($choice ne 'All class print') {
- $result =~ s/\\begin{document}/\\textheight 25\.9cm\\oddsidemargin = -0\.57in\\evensidemargin = -0\.57in\\textwidth= 9cm\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1}\\parbox{\\minipagewidth}{\\noindent\\fbox{\\textbf{$ENV{'environment.firstname'} $ENV{'environment.lastname'}}}\\hskip 1\.4in $courseidinfo} \\vskip 5 mm /;
- } else {
- $result =~ s/\\begin{document}/\\textheight 25\.9cm\\oddsidemargin = -0\.57in\\evensidemargin = -0\.57in\\textwidth= 9cm\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1} \\vskip 5 mm /;
- }
- $result =~ s/\\includegraphics{/\\includegraphics\[width=9\.0 cm\]{/g;
-# $result =~ s/\\includegraphics{/\\includegraphics\[width=\\textwidth\]{/g;
-# $result =~ s/(\\end{document})/\\newline\\noindent\\makebox\[9.0cm\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Dept\. of Physics and Astronomy, MSU\\makebox\[1.5cm\]\[b\]{\\hfill}LON-CAPA\\copyright MSU GNU\/GPL $1/;
- $result =~ s/(\\end{document})/\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny \\makebox\[1.5cm\]\[b\]{\\hfill}LON-CAPA\\copyright Michigan State University Board of Trustees $1/;
-# $result =~ s/(\\end{longtable}\s*)(\\newline\\noindent\\makebox\[9\.0cm\]\[b\]{\\hrulefill})/$2$1/g;
- $result =~ s/(\\end{longtable}\s*)(\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g;
- $result =~ s/(\\end{longtable}\s*)\\newline/$1/g;
- $result =~ s/\$number_of_columns/$number_of_columns/g;
}
+ $result = &latex_corrections($number_of_columns,$result);
#changes page's parameters for the one column output
if ($ENV{'form.numberofcolumns'} == 1) {
$result =~ s/\\textwidth= 9cm/\\textwidth= $ENV{'form.width'}/;
@@ -562,27 +670,6 @@ ENDPART
$result =~ s/\\evensidemargin = -0\.57in/\\evensidemargin= $ENV{'form.leftmargin'}/;
$result =~ s/\\oddsidemargin = -0\.57in/\\oddsidemargin= $ENV{'form.leftmargin'}/;
}
-#-- LaTeX corrections
- my $first_comment = index($result,'<!--',0);
- while ($first_comment != -1) {
- my $end_comment = index($result,'-->',$first_comment);
- substr($result,$first_comment,$end_comment-$first_comment+3) = '';
- $first_comment = index($result,'<!--',$first_comment);
- }
- $result =~ s/^\s+$//gm; #remove empty lines
- $result =~ s/(\s)+/$1/g; #removes more than one empty space
- $result =~ s/\\\\\s*\\vskip/\\vskip/gm;
- $result =~ s/\\\\\s*\\noindent\s*(\\\\)+/\\\\\\noindent /g;
- $result =~ s/{\\par }\s*\\\\/\\\\/gm;
- $result =~ s/\\\\\s+\[/ \[/g;
- $result =~ s/θ/\$\\theta\$/g; #converts theta from html into tex
- $result =~ s/\b__+\b/\\makebox\[1 cm\]\[b\]{\\hrulefill}/g;
- #conversion of html characters to LaTeX equivalents
- if ($result =~ m/&(\w+|#\d+);/) {
- $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
my $temp_file;
my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout_".time."_".rand(10000000).".tex";
@@ -599,15 +686,57 @@ FINALEND
}
-sub coming_from_hash {
+sub coming_from_hash_whole {
my $mainsequence = shift;
my @resourcelist = ();
my $mapid = $hash{'map_pc_'.$mainsequence};
my $mapstart = $hash{'map_start_'.$mainsequence};
my $mapfinish = $hash{'map_finish_'.$mainsequence};
- my $symb = &Apache::lonnet::symbread($hash{'src_'.$mapstart});
- my ($presymb) = split(/___/,$symb);
+ my $current_resource = $mapstart;
+ while ($current_resource ne $mapfinish) {
+ if ($hash{'src_'.$current_resource}=~/\.sequence$/) {
+ push @resourcelist,&coming_from_hash_whole($hash{'src_'.$current_resource});
+ } else {
+ $mainsequence =~ /\/res\/(.*)$/;
+ my $presymb = $1;
+ my $rid = $hash{'ids_'.$hash{'src_'.$current_resource}};
+ if ($rid=~/,/) {
+ my @rid = split /,/, $rid;
+ foreach my $rid_element (@rid) {
+ if ($rid_element =~ m/^$mapid\.(\d*)/) {
+ $rid = $1;
+ last;
+ }
+ }
+ } else {
+ $rid =~ m/^$mapid\.(\d*)/;
+ $rid = $1;
+ }
+ $hash{'src_'.$current_resource} =~ m/\/res\/(.*)$/;
+ my $symb = $presymb.'___'.$rid.'___'.$1;
+ push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$symb;
+ }
+ $current_resource = $hash{'goesto_'.$hash{'to_'.$current_resource}};
+ }
+ return @resourcelist;
+}
+
+
+sub coming_from_hash {
+
+ my ($mainsequence,$symb) = @_;
+ my @resourcelist = ();
+ my $mapid = $hash{'map_pc_'.$mainsequence};
+ my $mapstart = $hash{'map_start_'.$mainsequence};
+ my $mapfinish = $hash{'map_finish_'.$mainsequence};
+ my ($presymb);
+ if ($symb) {
+ ($presymb)=split(/___/,$symb);
+ } else {
+ $presymb=$mainsequence;
+ $presymb=~s|^/res/||;
+ }
$presymb = $presymb.'___';
my $current_resource = $mapstart;
while ($current_resource ne $mapfinish) {
@@ -675,7 +804,7 @@ sub character_chart {
$result =~ s/�?32;/ /g;
$result =~ s/�?33;/!/g;
$result =~ s/�?34;/"/g;
- $result =~ s/"/"/g;
+ $result =~ s/"/"/g; #"
$result =~ s/�?35;/\\#/g;
# $result =~ s/�?36;/\\\$/g;
$result =~ s/�?37;/\\%/g;
@@ -857,82 +986,82 @@ sub character_chart {
# $result =~ s/½//g;
# $result =~ s/¾//g;
# $result =~ s/¾//g;
- $result =~ s/¿/?`/g;
- $result =~ s/¿/?`/g;
- $result =~ s/À/\\`{A}/g;
- $result =~ s/À/\\`{A}/g;
+ $result =~ s/¿/?`/g;
+ $result =~ s/¿/?`/g; #`
+ $result =~ s/À/\\`{A}/g;
+ $result =~ s/À/\\`{A}/g; #`
$result =~ s/Á/\\'{A}/g;
- $result =~ s/Á/\\'{A}/g;
+ $result =~ s/Á/\\'{A}/g; #'
$result =~ s/Â/\\^{A}/g;
$result =~ s/Â/\\^{A}/g;
$result =~ s/Ã/\\~{A}/g;
$result =~ s/Ã/\\~{A}/g;
$result =~ s/Ä/\\"{A}/g;
- $result =~ s/Ä/\\"{A}/g;
+ $result =~ s/Ä/\\"{A}/g; #"
$result =~ s/Å/{\\AA}/g;
$result =~ s/Å/{\\AA}/g;
$result =~ s/Æ/{\\AE}/g;
$result =~ s/Æ/{\\AE}/g;
# $result =~ s/Ç//g;
# $result =~ s/Ç//g;
- $result =~ s/È/\\`{E}/g;
- $result =~ s/È/\\`{E}/g;
- $result =~ s/É/\\'{E}/g;
- $result =~ s/É/\\'{E}/g;
+ $result =~ s/È/\\`{E}/g;
+ $result =~ s/È/\\`{E}/g; #`
+ $result =~ s/É/\\'{E}/g; #'
+ $result =~ s/É/\\'{E}/g; #'
$result =~ s/Ê/\\^{E}/g;
$result =~ s/Ê/\\^{E}/g;
$result =~ s/Ë/\\`{E}/g;
- $result =~ s/Ë/\\`{E}/g;
+ $result =~ s/Ë/\\`{E}/g; #`
$result =~ s/Ì/\\`{I}/g;
- $result =~ s/Ì/\\`{I}/g;
- $result =~ s/Í/\\'{I}/g;
- $result =~ s/Í/\\'{I}/g;
+ $result =~ s/Ì/\\`{I}/g; #`
+ $result =~ s/Í/\\'{I}/g;
+ $result =~ s/Í/\\'{I}/g; #'
$result =~ s/Î/\\^{I}/g;
$result =~ s/Î/\\^{I}/g;
- $result =~ s/Ï/\\"{I}/g;
- $result =~ s/Ï/\\"{I}/g;
+ $result =~ s/Ï/\\"{I}/g;
+ $result =~ s/Ï/\\"{I}/g; #"
# $result =~ s/Ð//g;
# $result =~ s/Ð//g;
$result =~ s/Ñ/\\~{N}/g;
$result =~ s/Ñ/\\~{N}/g;
$result =~ s/Ò/\\`{O}/g;
- $result =~ s/Ò/\\`{O}/g;
+ $result =~ s/Ò/\\`{O}/g; #`
$result =~ s/Ó/\\'{O}/g;
- $result =~ s/Ó/\\'{O}/g;
+ $result =~ s/Ó/\\'{O}/g; #'
$result =~ s/Ô/\\^{O}/g;
$result =~ s/Ô/\\^{O}/g;
$result =~ s/Õ/\\~{O}/g;
$result =~ s/Õ/\\~{O}/g;
- $result =~ s/Ö/\\"{O}/g;
- $result =~ s/Ö/\\"{O}/g;
+ $result =~ s/Ö/\\"{O}/g;
+ $result =~ s/Ö/\\"{O}/g; #"
$result =~ s/×/\$\\times\$/g;
$result =~ s/×/\$\\times\$/g;
$result =~ s/Ø/{\\O}/g;
$result =~ s/Ø/{\\O}/g;
- $result =~ s/Ù/\\`{U}/g;
- $result =~ s/Ù/\\`{U}/g;
- $result =~ s/Ú/\\'{U}/g;
- $result =~ s/Ú/\\'{U}/g;
+ $result =~ s/Ù/\\`{U}/g;
+ $result =~ s/Ù/\\`{U}/g; #`
+ $result =~ s/Ú/\\'{U}/g; #'
+ $result =~ s/Ú/\\'{U}/g; #'
$result =~ s/Û/\\^{U}/g;
$result =~ s/Û/\\^{U}/g;
- $result =~ s/Ü/\\"{U}/g;
- $result =~ s/Ü/\\"{U}/g;
+ $result =~ s/Ü/\\"{U}/g; #"
+ $result =~ s/Ü/\\"{U}/g; #"
$result =~ s/Ý/\\'{Y}/g;
- $result =~ s/Ý/\\'{Y}/g;
+ $result =~ s/Ý/\\'{Y}/g; #'
# $result =~ s/Þ//g;
# $result =~ s/Þ//g;
# $result =~ s/ß//g;
# $result =~ s/ß//g;
$result =~ s/à/\\`{a}/g;
- $result =~ s/à/\\`{a}/g;
+ $result =~ s/à/\\`{a}/g; #`
$result =~ s/á/\\'{a}/g;
- $result =~ s/á/\\'{a}/g;
+ $result =~ s/á/\\'{a}/g; #'
$result =~ s/â/\\^{a}/g;
$result =~ s/â/\\^{a}/g;
$result =~ s/ã/\\~{a}/g;
$result =~ s/ã/\\~{a}/g;
$result =~ s/ä/\\"{a}/g;
- $result =~ s/ä/\\"{a}/g;
+ $result =~ s/ä/\\"{a}/g; #"
$result =~ s/å/{\\aa}/g;
$result =~ s/å/{\\aa}/g;
$result =~ s/æ/{\\ae}/g;
@@ -940,58 +1069,141 @@ sub character_chart {
# $result =~ s/ç//g;
# $result =~ s/ç//g;
$result =~ s/è/\\`{e}/g;
- $result =~ s/è/\\`{e}/g;
+ $result =~ s/è/\\`{e}/g; #`
$result =~ s/é/\\'{e}/g;
- $result =~ s/é/\\'{e}/g;
+ $result =~ s/é/\\'{e}/g; #'
$result =~ s/ê/\\^{e}/g;
$result =~ s/ê/\\^{e}/g;
$result =~ s/ë/\\"{e}/g;
- $result =~ s/ë/\\"{e}/g;
+ $result =~ s/ë/\\"{e}/g; #"
$result =~ s/ì/\\`{i}/g;
- $result =~ s/ì/\\`{i}/g;
+ $result =~ s/ì/\\`{i}/g; #`
$result =~ s/í/\\'{i}/g;
- $result =~ s/í/\\'{i}/g;
+ $result =~ s/í/\\'{i}/g; #'
$result =~ s/î/\\^{i}/g;
$result =~ s/î/\\^{i}/g;
$result =~ s/ï/\\"{i}/g;
- $result =~ s/ï/\\"{i}/g;
+ $result =~ s/ï/\\"{i}/g; #"
# $result =~ s/ð//g;
# $result =~ s/ð//g;
$result =~ s/ñ/\\~{n}/g;
$result =~ s/ñ/\\~{n}/g;
$result =~ s/ò/\\`{o}/g;
- $result =~ s/ò/\\`{o}/g;
+ $result =~ s/ò/\\`{o}/g; #`
$result =~ s/ó/\\'{o}/g;
- $result =~ s/ó/\\'{o}/g;
+ $result =~ s/ó/\\'{o}/g; #'
$result =~ s/ô/\\^{o}/g;
$result =~ s/ô/\\^{o}/g;
$result =~ s/õ/\\~{o}/g;
$result =~ s/õ/\\~{o}/g;
$result =~ s/ö/\\"{o}/g;
- $result =~ s/ö/\\"{o}/g;
+ $result =~ s/ö/\\"{o}/g; #"
$result =~ s/÷/\$\\div\$/g;
$result =~ s/÷/\$\\div\$/g;
$result =~ s/ø/{\\o}/g;
$result =~ s/ø/{\\o}/g;
$result =~ s/ù/\\`{u}/g;
- $result =~ s/ù/\\`{u}/g;
+ $result =~ s/ù/\\`{u}/g; #`
$result =~ s/ú/\\'{u}/g;
- $result =~ s/ú/\\'{u}/g;
+ $result =~ s/ú/\\'{u}/g; #'
$result =~ s/û/\\^{u}/g;
$result =~ s/û/\\^{u}/g;
$result =~ s/ü/\\"{u}/g;
- $result =~ s/ü/\\"{u}/g;
+ $result =~ s/ü/\\"{u}/g; #"
$result =~ s/ý/\\'{y}/g;
- $result =~ s/ý/\\'{y}/g;
+ $result =~ s/ý/\\'{y}/g; #'
# $result =~ s/þ//g;
# $result =~ s/þ//g;
$result =~ s/ÿ/\\"{y}/g;
- $result =~ s/ÿ/\\"{y}/g;
+ $result =~ s/ÿ/\\"{y}/g; #"
+ $result =~ s/θ/\$\\theta\$/g; #converts theta from html into tex
return $result;
}
-#'"`
+ sub page_format {
+ my ($papersize,$layout,$numberofcolumns) = @_;
+ my ($textwidth,$textheight,$oddoffset,$evenoffset) = (0,0,0,0);
+ if ($papersize=~/Letter/) {
+ if ($layout eq 'CAPA') {
+ if ($numberofcolumns == 1) {
+ $textwidth = '18 cm';
+ $textheight = '25.9 cm';
+ $oddoffset = '-0.57 in';
+ $evenoffset = '-0.57 in';
+ } elsif ($numberofcolumns == 2) {
+ $textwidth = '93 mm';
+ $textheight = '25.9 cm';
+ $oddoffset = '-0.57 in';
+ $evenoffset = '-0.57 in';
+ }
+ } elsif ($layout eq 'CBI') {
+ if ($numberofcolumns eq '1') {
+ $textwidth = '8.8 in';
+ $textheight = '6.8 in';
+ $oddoffset = '-40 pt';
+ $evenoffset = '-60 pt';
+ } elsif ($numberofcolumns == 2) {
+ $textwidth = '4.2 in';
+ $textheight = '6.8 in';
+ $oddoffset = '-40 pt';
+ $evenoffset = '-60 pt';
+ }
+ }
+# } elsif($papersize=~/Legal/) {
+# } elsif($papersize=~/Ledger/) {
+# } elsif($papersize=~/Executive/) {
+ } elsif($papersize=~/A4/) {
+ if ($layout eq 'CAPA') {
+ if ($numberofcolumns == 1) {
+ $textwidth = '18 cm';
+ $textheight = '28 cm';
+ $oddoffset = '-0.57 in';
+ $evenoffset = '-0.57 in';
+ } elsif ($numberofcolumns == 2) {
+ $textwidth = '96 mm';
+ $textheight = '2 cm';
+ $oddoffset = '-0.57 in';
+ $evenoffset = '-0.57 in';
+ }
+ } elsif ($layout eq 'CBI') {
+ if ($numberofcolumns eq '1') {
+ $textwidth = '8.5 in';
+ $textheight = '7.7 in';
+ $oddoffset = '-40 pt';
+ $evenoffset = '-60 pt';
+ } elsif ($numberofcolumns == 2) {
+ $textwidth = '3.9 in';
+ $textheight = '7.7 in';
+ $oddoffset = '-40 pt';
+ $evenoffset = '-60 pt';
+ }
+ }
+# } elsif($papersize=~/A3/) {
+# } elsif($papersize=~/A2/) {
+# } elsif($papersize=~/A5/) {
+# } elsif($papersize=~/A6/) {
+ }
+ return $textwidth,$textheight,$oddoffset,$evenoffset;
+ }
+
+
+sub page_format_transformation {
+ my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment) = @_;
+ $assignment=~s/_/ /g;
+ my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$layout,$numberofcolumns);
+ my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+ if ($layout eq 'CBI') {
+ $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{$ENV{'environment.firstname'} $ENV{'environment.lastname'}}} \\hfill $courseidinfo} \\vskip 5 mm /;
+ } elsif ($layout eq 'CAPA') {
+ 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\}\\setlength{\\topmargin}{1cm}\\setlength{\\headheight}{1cm}\\setlength{\\headsep}{0.5cm}\\markboth{}{\\textbf{$ENV{'environment.firstname'} $ENV{'environment.lastname'}} $courseidinfo - $assignment}\\pagestyle{myheadings}\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1}/;
+ } else {
+ $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\}\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1} \\vskip 5 mm /;
+ }
+ }
+ return $text;
+}
sub page_cleanup {
@@ -1013,21 +1225,60 @@ sub details_for_menu {
my $name_of_resourse = $hash{'title_'.$hash{'ids_'.$ENV{'form.postdata'}}};
my $symbolic = &Apache::lonnet::symbread($ENV{'form.postdata'});
my ($map,$id,$resource)=split(/___/,$symbolic);
- my $name_of_sequence = $hash{'title_'.$hash{'ids_/res/'.$map}};
+ my $name_of_sequence;
+ if ($map=~/^uploaded/) {
+ $name_of_sequence = $hash{'title_'.$hash{'ids_/'.$map}};
+ } else {
+ $name_of_sequence = $hash{'title_'.$hash{'ids_/res/'.$map}};
+ }
if ($name_of_sequence =~ /^\s*$/) {
- $map =~ m|([^/]+)$|;
+ $map =~ m|([^/]+)$|;
$name_of_sequence = $1;
}
my $name_of_map = $hash{'title_'.$hash{'ids_/res/'.$ENV{'request.course.uri'}}};
if ($name_of_map =~ /^\s*$/) {
$ENV{'request.course.uri'} =~ m|([^/]+)$|;
$name_of_map = $1;
- }
+ }
return ($name_of_resourse,$name_of_sequence,$name_of_map);
}
+sub latex_corrections {
+
+ my ($number_of_columns,$result) = @_;
+
+ $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g;
+ $result =~ s/\$number_of_columns/$number_of_columns/g;
+ $result =~ s/(\\end{document})/\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License $1/;
+ $result =~ s/(\\end{longtable}\s*)(\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g;
+ $result =~ s/(\\end{longtable}\s*)\\strut\\newline/$1/g;
+#-- LaTeX corrections
+ my $first_comment = index($result,'<!--',0);
+ while ($first_comment != -1) {
+ my $end_comment = index($result,'-->',$first_comment);
+ substr($result,$first_comment,$end_comment-$first_comment+3) = '';
+ $first_comment = index($result,'<!--',$first_comment);
+ }
+ $result =~ s/^\s+$//gm; #remove empty lines
+ $result =~ s/(\s)(\s+)/$1/g; #removes more than one empty space
+ $result =~ s/\\\\\s*\\vskip/\\vskip/gm;
+ $result =~ s/\\\\\s*\\noindent\s*(\\\\)+/\\\\\\noindent /g;
+ $result =~ s/{\\par }\s*\\\\/\\\\/gm;
+ $result =~ s/\\\\\s+\[/ \[/g;
+ $result =~ s/\b__+\b/\\makebox\[1 cm\]\[b\]{\\hrulefill}/g;
+ #conversion of html characters to LaTeX equivalents
+ if ($result =~ m/&(\w+|#\d+);/) {
+ $result = &character_chart($result);
+ }
+ $result =~ s/(\\end{tabular})\s*\\vskip 0 mm/$1/g;
+ $result =~ s/(\\begin{enumerate})\s*\\noindent/$1/g;
+
+ return $result;
+}
+
+
sub handler {
my $r = shift;
@@ -1056,7 +1307,11 @@ sub handler {
}
#-- additional menu for class printing
if ($ENV{'form.phase'} eq 'two') {
- if($ENV{'form.choice'} eq 'All class print') {
+ if($ENV{'form.choice'} eq 'Standard LaTeX output for whole primary sequence') {
+ &sequence_content_menu(0,$r);
+ } elsif($ENV{'form.choice'} eq 'Standard LaTeX output for the primary sequence') {
+ &sequence_content_menu(1,$r);
+ } elsif($ENV{'form.choice'} eq 'All class print') {
&additional_class_menu($r);
} elsif($ENV{'form.choice'} eq 'Subdirectory print') {
&problem_choice_menu($r);
@@ -1085,12 +1340,3 @@ sub handler {
1;
__END__
-
-
-
-#### Test block
-# my $ere;
-# foreach $ere (%ENV) {
-# $result .= ' SS '.$ere.' => '.$ENV{$ere}.' FF '."\n\n";
-# }
-####