--- loncom/interface/printout.pl 2013/07/19 18:24:16 1.155 +++ loncom/interface/printout.pl 2024/11/09 16:08:15 1.177 @@ -1,7 +1,7 @@ #!/usr/bin/perl # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc. # -# $Id: printout.pl,v 1.155 2013/07/19 18:24:16 bisitz Exp $ +# $Id: printout.pl,v 1.177 2024/11/09 16:08:15 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,6 +40,8 @@ use Apache::lonlocal; use Apache::lonmsg(); use LONCAPA::Enrollment; use LONCAPA::Configuration; +use LONCAPA; +use Archive::Zip qw( :ERROR_CODES ); use strict; @@ -159,6 +161,36 @@ sub send_error_mail { } } +sub get_pstops_offsets { + my ($paper) = @_; + my ($origwidth,$origheight,$origunits,$ptype,$xoff,$yoffl,$yoffr); + $ptype = "-p$paper"; + if ($paper eq 'letter') { + $origwidth = 11.0; + $origheight = 8.5; + $origunits = 'in'; + $xoff = $origheight - 0.9; + $yoffl = 0.0; + } elsif ($paper eq 'legal') { + $ptype = ''; + $origwidth = 14.0; + $origheight = 8.5; + $origunits = 'in'; + $xoff = $origheight - 3.0; + $yoffl = 0.5; + } elsif ($paper eq 'a4') { + $origwidth = 29.7; + $origheight = 21.0; + $origunits = 'cm'; + $xoff = $origheight; + $yoffl = 0.7; + } + if (($origwidth ne '') && ($yoffl ne '')) { + $yoffr = $origwidth/2 + $yoffl; + } + return ($ptype,$xoff,$yoffl,$yoffr,$origunits); +} + $|=1; if (! &LONCAPA::loncgi::check_cookie_and_load_env()) { print <'.&mt("[_1]Return[_2] to editing resource.", + if ($backref =~ m{^(/uploaded/$LONCAPA::match_domain/$LONCAPA::match_courseid/default_\d+.page)}) { + $backref = $1; + } + print('

'.&mt("[_1]Return[_2] to resource.", "","").'

'); + print('

'. + &mt("Change Printing Options").'

'."\n"); } my $figfile = $texfile; $figfile =~ s/^(.*_printout)_\d+_\d+_\d+\.tex/$1\.dat/; @@ -309,11 +346,20 @@ foreach $texfile (@texfile) { my $name_range=''; # $name -> Either user's full name or username:domain - # $name_range -> Either user's last name or usrname. + # $name_range -> Either user's last name or username. if ($tempo_array[3]) { $name=$tempo_array[3]; - ($name_range) = split(/,/,$name, 2); + $name =~ s{^\s+|\s+$}{}g; + if ($name =~ /,/) { + ($name_range) = split(/,/,$name, 2); + } elsif ($name =~ /\s/) { + $name_range = $name; + $name_range =~ s/\s+/_/; + } else { + $name_range = $name; + } + $name_range =~ s/[^\w\:\-]+//g; } else { $name=$tempo_array[0].':'.$tempo_array[1]; $name_range = $tempo_array[0]; @@ -336,8 +382,18 @@ foreach $texfile (@texfile) { @tempo_array=split(/:/,$stud_info[-1]); if ($tempo_array[3]) { $name=$tempo_array[3]; - my ($lastname) = split(/,/, $name,2); + $name =~ s{^\s+|\s+$}{}g; + my $lastname; + if ($name =~ /,/) { + ($lastname) = split(/,/, $name,2); + } elsif ($name =~ /\s/) { + $lastname = $name; + $lastname =~ s/\s+/_/; + } else { + $lastname = $name; + } $name_range .= "-".$lastname; + $name_range =~ s/[^\w\:\-]+//g; } else { $name=$tempo_array[0].':'.$tempo_array[1]; $name_range .= '-'.$tempo_array[0]; @@ -419,9 +475,13 @@ foreach $texfile (@texfile) { $name_file =~ s/\.tex/\.dvi/; my $new_name_file = $name_file; $new_name_file =~ s/\.dvi/\.ps/; - my $papera=$paper; - if ($papera eq 'letter') {$papera='';} - if ($papera ne '') {$papera='-t'.$papera;} +# Explicitly include a switch for papertype, otherwise dvips will default +# to whatever is listed first in config.ps (which in most cases is a4). + my $papera; + unless (($paper eq '') || + (($laystyle eq 'album') && ($numberofcolumns eq '1'))) { + $papera='-t'.$paper; + } my $extra_ps_header = $perlvar{'lonLib'} .'/includepsheader.ps'; my $comma = "dvips $papera -h $extra_ps_header -Ppdf -G0 -o $new_name_file"; &busy_wait_command("$comma $name_file 1>/dev/null 2>/dev/null", @@ -476,7 +536,9 @@ foreach $texfile (@texfile) { $new_name_file =~ m/^(.*)\./; my $ps_file = my $tempo_file = $1.'temporar.ps'; my $pdf_file = $1.'.pdf'; - $papera=~s/t/p/; + unless ($paper eq '') { + $papera='-p'.$paper; + } #---- # The code below uses fixps to make pdf include in sequences work. # @@ -491,20 +553,83 @@ foreach $texfile (@texfile) { # Use gs to fix the postscript -> level 1.5 # .. if pdfs were included + # + # pswrite device was removed from ghostscript 9.09 and later, + # (ps2write device is used instead). + # check which device is available, and use as the value + # passed via -sDEVICE= arg in gs call to fix the postscript. + # if ($pdfs_converted > 0) { - $comma = "gs -sDEVICE=pswrite -dLanguageLevel=1.5 "; - &busy_wait_command("$comma -o $tempo_file $new_name_file 2>/dev/null 1>/dev/null", - "for $status_statement now validating PS", - \%prog_state, $tempo_file); - + my @possdevices = qw(ps2write pswrite); + my $device; + foreach my $poss (@possdevices) { + if (open(PIPE,"gs -h |grep ' $poss ' 2>&1 |")) { + my $output = ; + close(PIPE); + chomp($output); + if ($output =~ /\Q $poss \E/) { + $device = $poss; + } + } + last if ($device ne ''); + } + if ($device ne '') { + my ($major,$minor); + if (open(PIPE,"gs -v |grep 'GPL Ghostscript' 2>&1 |")) { + my $info = ; + close(PIPE); + chomp($info); + if ($info =~ /Ghostscript\s+(\d+)\.(\d+)/) { + ($major,$minor) = ($1,$2); + } + } + $comma = "gs -sDEVICE=$device -dLanguageLevel=1.5 "; + if (($major > 9) || (($major == 9) && ($minor >= 50))) { + $comma .= '--permit-file-read=* '; + } + &busy_wait_command("$comma -o $tempo_file $new_name_file 2>/dev/null 1>/dev/null", + "for $status_statement now validating PS", + \%prog_state, $tempo_file); + #--- - &busy_wait_command("mv $tempo_file $new_name_file", - 'File move', \%prog_state, $new_name_file); + if (-e $tempo_file) { + &busy_wait_command("mv $tempo_file $new_name_file", + 'File move', \%prog_state, $new_name_file); + } + } } if ($laystyle eq 'album' and $numberofcolumns eq '2') { - $comma = "psnup $papera -2 -s1.0 $new_name_file"; - &debug("PSNUP command: $comma"); + my $canscale; + if (open(PIPE,"psnup --version 2>&1 |")) { + while () { + chomp(); + next if (/pstops:\s+invalid\s+option/); + if (/^psnup\s+release\s+(\d+)\s+patchlevel\s+(\d+)/) { + if (($1 == 1) && ($2 < 90)) { + $canscale = 1; + } + last; + } elsif (/^psnup\s+(\d+)\.(\d+)/) { + if (($1 == 1) && ($2 < 90)) { + $canscale = 1; + } + last; + } + } + close(PIPE); + } + if ($canscale) { + $comma = "psnup $papera -2 -s1.0 $new_name_file"; + &debug("PSNUP command: $comma"); + } elsif (($paper eq 'letter') || ($paper eq 'legal') || ($paper eq 'a4')) { + my ($ptype,$xoff,$yoffl,$yoffr,$units) = &get_pstops_offsets($paper); + $comma = "pstops $ptype '2:0L\@1.0($xoff$units,$yoffl$units)+1L\@1.0($xoff$units,$yoffr$units)' $new_name_file"; + &debug("PSTOPS command: $comma"); + } else { + $comma = "psnup $papera -2 $new_name_file"; + &debug("PSNUP command: $comma"); + } &busy_wait_command("$comma $tempo_file 1>/dev/null 2>/dev/null", "for $status_statement now Modifying PS layout", \%prog_state,$tempo_file); @@ -517,7 +642,8 @@ foreach $texfile (@texfile) { } else { $ps_file=$new_name_file; } - my $addtoPSfile={'legal'=>'<< /PageSize [612 1008] >> setpagedevice', + my $addtoPSfile={'letter'=>'<< /PageSize [612 792] >> setpagedevice', + 'legal'=>'<< /PageSize [612 1008] >> setpagedevice', 'tabloid'=>'<< /PageSize [792 1224] >> setpagedevice', 'executive'=>,'<< /PageSize [540 720] >> setpagedevice', 'a2'=>'<< /PageSize [1195.02 1690.09] >> setpagedevice', @@ -525,19 +651,17 @@ foreach $texfile (@texfile) { 'a4'=>'<< /PageSize [595.2 842] >> setpagedevice', 'a5'=>'<< /PageSize [421.1 595.2] >> setpagedevice', 'a6'=>'<< /PageSize [298.75 421.1] >> setpagedevice', - }; - if ($paper ne 'letter') { - open(FFH,'<',$ps_file) || die "Couldn't open ps file $ps_file for reading: $!\n"; - my $new_ps_file='new'.$ps_file; - open(FFHS,'>',$new_ps_file) || die "Couldn't open new ps file $new_ps_file for reading: $!\n"; - print FFHS $addtoPSfile->{$paper}."\n"; - while () { - print FFHS $_; - } - close(FFH); - close(FFHS); - $ps_file=$new_ps_file; + }; + open(FFH,'<',$ps_file) || die "Couldn't open ps file $ps_file for reading: $!\n"; + my $new_ps_file='new'.$ps_file; + open(FFHS,'>',$new_ps_file) || die "Couldn't open new ps file $new_ps_file for reading: $!\n"; + print FFHS $addtoPSfile->{$paper}."\n"; + while () { + print FFHS $_; } + close(FFH); + close(FFHS); + $ps_file=$new_ps_file; &busy_wait_command("ps2pdf13 $ps_file $pdf_file 1>/dev/null 2>/dev/null", "for $status_statement now Converting PS to PDF", \%prog_state,$pdf_file); @@ -570,26 +694,46 @@ foreach $texfile (@texfile) { .'

'; } } +if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); } print "
"; if ($number_of_files>1) { + print('

'.&mt('Zip Output:')."\n"); + my %zip_prog_state; + if ($advanced_role) { %zip_prog_state=&Apache::lonhtmlcommon::Create_PrgWin('',$number_of_files); } my $zipfile=$texfile[0]; $zipfile=~s/\.tex/\.zip/; - my $statement="zip $zipfile"; + my $zip = Archive::Zip->new(); + my $counter = 0; foreach my $file (@texfile) { - $file=~s/\.tex/.\pdf/; - $statement.=' '.$file; + $file=~s/\.tex/.\pdf/; + my $dest=$file; + $dest=~s{^\Q$perlvar{'lonPrtDir'}\E}{prtspool}; + $zip->addFile($file,$dest); + $dest=~s/^prtspool//; + $counter ++; + if ($advanced_role) { + &Apache::lonhtmlcommon::Update_PrgWin('',\%zip_prog_state, + &mt('[_1] added to zip archive ([_2] of [_3]', + $dest,$counter,$number_of_files)); + } + } + if ($advanced_role) { + &Apache::lonhtmlcommon::Update_PrgWin('',\%zip_prog_state,&mt('Writing zip file')); + } + if ($zip->writeToFileNamed($zipfile) == AZ_OK) { + $zipfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool}; + print + '

' + .&mt('A [_1]ZIP file[_2] of all the PDF files is ready for download.', + '','') + .'

'; + } else { + print '

'. + &mt('An error occurred creating a ZIP file of all the PDF files'). + '

'; } - print('

'.&mt('Zip Output:')."\n

\n");
-    system($statement);
-    print("

\n"); - $zipfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool}; - print - '

' - .&mt('A [_1]ZIP file[_2] of all the PDF files is ready for download.', - '','') - .'

'; + if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%zip_prog_state); } } -if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); } print(&Apache::loncommon::end_page()); my $done; @@ -914,7 +1058,7 @@ sub convert_figure { # Spaces are problematic for system commands and LaTeX, replace with _ - $eps_f =~ s/ /\_/g; + $eps_f =~ s/ /\_/g; # # If the file is already an .eps or .ps file (eps_f still has the original @@ -933,7 +1077,6 @@ sub convert_figure { &File::Path::mkpath($path,0,0777); $not_eps =~ s/^\s+//; $not_eps =~ s/\s+$//; - $not_eps =~ s/ /\\ /g; my $prettyname=$not_eps; if ($advanced_role) { $prettyname=~s|$perlvar{'lonDocRoot'}/|/|; @@ -953,18 +1096,29 @@ sub convert_figure { $eps_f = $perlvar{'lonPrtDir'}.'/'.$eps_f; &debug("Converting pdf $not_eps to postscript: $eps_f"); - system("pdftops $not_eps $eps_f"); - $pdfs_converted++; # Need to fix ps in last pass. + my @args = ('pdftops',$not_eps,$eps_f); + system({$args[0]} @args); # Indirect object forces list processing mode. + # See perlfunc documentation for exec(). + if ($? and $advanced_role) { + print '

' + .&mt('An error occurred during the conversion of [_1] to postscript.', + ''.$prettyname.'') + .'

'; + } else { + $pdfs_converted++; # Need to fix ps in last pass. + } } else { - system("convert $not_eps $eps_f"); - if($? and $advanced_role){ - print '

' - .&mt('An error occured during the conversion of [_1].', + my @args = ('convert',$not_eps,$eps_f); + system({$args[0]} @args); # Indirect object forces list processing mode. + # See perlfunc documentation for exec(). + if ($? and $advanced_role) { + print '

' + .&mt('An error occurred during the conversion of [_1].', ''.$prettyname.'') - .'
' - .&mt('If possible try to save this image using different settings and republish it.') - .'

'; - } + .'
' + .&mt('If possible try to save this image using different settings and republish it.') + .'

'; + } } if (not -e $eps_f) { @@ -1052,7 +1206,7 @@ sub analyze_logfile { print "

".&mt('LaTeX could not successfully parse your TeX file.')."

"; print &mt('It probably has errors in it.')."
"; if ($badtext) { - print &mt('With very high probability this error occured in [_1].',$badtext) + print &mt('With very high probability this error occurred in [_1].',$badtext) ."

"; } print &mt('Here are the error messages in the LaTeX log file:') @@ -1141,7 +1295,7 @@ sub analyze_logfile { my $whereitends = index $body_log_file,'STAMPOFPASSEDRESOURCEEND',$whereitbegins; print "
" .&mt('It has found an error in [_1][_2]and corrected it.',substr($body_log_file,$whereitbegins+26,$whereitends-$whereitbegins-26),"
")."\n"; - print &mt('Usually this correction is valid but you probably need to check the indicated resource one more time and implement neccessary corrections by yourself.')."\n"; + print &mt('Usually this correction is valid but you probably need to check the indicated resource one more time and implement necessary corrections by yourself.')."\n"; $whereitbegins = index $body_log_file,'',$tempobegin+10; }