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

Diff for /loncom/interface/printout.pl between versions 1.166 and 1.169

version 1.166, 2017/11/12 16:23:03 version 1.169, 2023/04/15 21:50:34
Line 211  if ($student_names=~/_END_/) { Line 211  if ($student_names=~/_END_/) {
     @names_pack=split(/_ENDPERSON_/,$student_names);      @names_pack=split(/_ENDPERSON_/,$student_names);
 }  }
 if ($backref) {  if ($backref) {
       if ($backref =~ m{^(/uploaded/$LONCAPA::match_domain/$LONCAPA::match_courseid/default_\d+.page)}) {
           $backref = $1;
       }
     print('<p>'.&mt("[_1]Return[_2] to resource.",      print('<p>'.&mt("[_1]Return[_2] to resource.",
     "<a href=\"$backref\"><b>","</b></a>").'</p>');      "<a href=\"$backref\"><b>","</b></a>").'</p>');
     print('<p><a href="javascript:gopost(\'/adm/printout\',\''.$backref.'\');">'.      print('<p><a href="javascript:gopost(\'/adm/printout\',\''.$backref.'\');">'.
Line 519  foreach $texfile (@texfile) { Line 522  foreach $texfile (@texfile) {
   
       # Use gs to fix the postscript -> level 1.5         # Use gs to fix the postscript -> level 1.5 
       # .. if pdfs were included        # .. 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) {        if ($pdfs_converted > 0) {
   $comma = "gs -sDEVICE=pswrite -dLanguageLevel=1.5 ";    my @possdevices = qw(ps2write pswrite);
   &busy_wait_command("$comma -o $tempo_file $new_name_file 2>/dev/null 1>/dev/null",    my $device;
      "for $status_statement now validating PS",    foreach my $poss (@possdevices) {
      \%prog_state, $tempo_file);        if (open(PIPE,"gs -h |grep ' $poss ' 2>&1 |")) {
               my $output = <PIPE>;
             close(PIPE);
             chomp($output);
             if ($output =~ /\Q $poss \E/) {
                 $device = $poss;
             }
         }
         last if ($device ne '');
     }
     if ($device ne '') {
         $comma = "gs -sDEVICE=$device -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);
   
 #---  #---
   &busy_wait_command("mv $tempo_file $new_name_file",        if (-e $tempo_file) {
      'File move', \%prog_state, $new_name_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') {        if ($laystyle eq 'album' and $numberofcolumns eq '2') {
   $comma = "psnup $papera -2 -s1.0 $new_name_file";    $comma = "psnup $papera -2 -s1.0 $new_name_file";
Line 981  sub convert_figure { Line 1007  sub convert_figure {
  &File::Path::mkpath($path,0,0777);   &File::Path::mkpath($path,0,0777);
  $not_eps =~ s/^\s+//;   $not_eps =~ s/^\s+//;
  $not_eps =~ s/\s+$//;   $not_eps =~ s/\s+$//;
  $not_eps =~ s/ /\\ /g;  
     my $prettyname=$not_eps;      my $prettyname=$not_eps;
  if ($advanced_role) {   if ($advanced_role) {
     $prettyname=~s|$perlvar{'lonDocRoot'}/|/|;      $prettyname=~s|$perlvar{'lonDocRoot'}/|/|;
Removed from v.1.166  
changed lines
  Added in v.1.169

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