) {
if ($line eq "\\special{ps:ENDOFSTUDENTSTAMP}\n") {
@@ -809,8 +810,7 @@ sub repaginate {
}
$student_number++;
- &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,
- "Repaginating student ".$student_number+1);
+ &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,&mt("Repaginating student: [_1]",$student_number+1));
} else {
print LATEXOUT $line;
@@ -891,8 +891,8 @@ sub convert_figure {
my $status_statement='EPS picture for '.$not_eps;
my $eps_f = $not_eps;
- if ($eps_f=~/\/home\/([^\/]+)\/public_html\//) {
- $eps_f=~s/\/home\/([^\/]+)\/public_html/$1/;
+ if ($eps_f=~/\/home\/httpd\/html\/priv\/[^\/]+\/([^\/]+)\//) {
+ $eps_f=~s/\/home\/httpd\/html\/priv\/[^\/]+\/([^\/]+)/$1/;
} elsif ($eps_f=~/$perlvar{'lonDocRoot'}\/res\//) {
$eps_f=~ s/$perlvar{'lonDocRoot'}\/res\/(.+)/$1/;
} elsif ($eps_f=~/$perlvar{'lonUsersDir'}\//) {
@@ -923,12 +923,10 @@ sub convert_figure {
$not_eps =~ s/^\s+//;
$not_eps =~ s/\s+$//;
$not_eps =~ s/ /\\ /g;
- my $prettyname=$not_eps;
+ my $prettyname=$not_eps;
if ($advanced_role) {
- $prettyname=~s|/home/([^/]+)/public_html|/priv/$1|;
$prettyname=~s|$perlvar{'lonDocRoot'}/|/|;
- &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,
- 'Converting to EPS '.$prettyname);
+ &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,&mt('Converting to EPS: [_1]',$prettyname));
}
#
# If the file is a PDF, need to use pdftops to convert it to a ps file.
@@ -945,14 +943,16 @@ sub convert_figure {
&debug("Converting pdf $not_eps to postscript: $eps_f");
system("pdftops $not_eps $eps_f");
+ $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].[_2]If possible try to save this image using different settings and republish it.',
- ''.$prettyname.'','
')
- .'
';
- }
+ if($? and $advanced_role){
+ print ""
+ .mt("An error occured during the conversion of [_1].[_2]"
+ ."If possible try to save this image using different settings and republish it.",
+ "".$prettyname."", "
")
+ ."
";
+ }
}
if (not -e $eps_f) {