Skip to content

Restructure the warning handling for the LaTeXImage.pm module. #1329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Restructure the warning handling for the LaTeXImage.pm module. #1329

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 31 additions & 33 deletions lib/LaTeXImage.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,17 @@ sub draw {
system "cd $working_dir && "
. WeBWorK::PG::IO::externalCommand('latex')
. " --interaction=nonstopmode image-dvisvgm.tex > latex.stdout 2> /dev/null";
move("$working_dir/image-dvisvgm.dvi", "$working_dir/image.dvi");
chmod(oct(664), "$working_dir/image.dvi");

if (-r "$working_dir/image-dvisvgm.dvi") {
move("$working_dir/image-dvisvgm.dvi", "$working_dir/image.dvi");
chmod(oct(664), "$working_dir/image.dvi");
} else {
warn 'The dvi file was not created.';
if (open(my $err_fh, '<', "$working_dir/latex.stdout")) {
while (my $error = <$err_fh>) { warn $error; }
close($err_fh);
}
}
} else {
warn "Can't open $working_dir/image-dvisvgm.tex for writing.";
return '';
Expand All @@ -200,47 +209,36 @@ sub draw {
system "cd $working_dir && "
. WeBWorK::PG::IO::externalCommand('latex2pdf')
. " --interaction=nonstopmode image.tex > latex.stdout 2> /dev/null";
chmod(oct(664), "$working_dir/image.pdf");

if (-r "$working_dir/image.pdf") {
chmod(oct(664), "$working_dir/image.pdf");
} else {
warn 'The pdf file was not created.';
if (open(my $err_fh, '<', "$working_dir/latex.stdout")) {
while (my $error = <$err_fh>) { warn $error; }
close($err_fh);
}
}
} else {
warn "Can't open $working_dir/image.tex for writing.";
return '';
}
}

# Make derivatives of the dvi
if (($ext eq 'svg' || $ext eq 'tgz') && $svgMethod eq 'dvisvgm') {
if (-r "$working_dir/image.dvi") {
$self->use_svgMethod($working_dir);
} else {
warn "The dvi file was not created.";
if (open(my $err_fh, "<", "$working_dir/latex.stdout")) {
while (my $error = <$err_fh>) {
warn $error;
}
close($err_fh);
}
}
if (($ext eq 'svg' || $ext eq 'tgz') && $svgMethod eq 'dvisvgm' && -r "$working_dir/image.dvi") {
$self->use_svgMethod($working_dir);
}

# Make derivatives of the pdf
if (($svgMethod ne 'dvisvgm' || $ext ne 'svg') && $ext ne 'pdf') {
if (-r "$working_dir/image.pdf") {
if (($ext eq 'svg' || $ext eq 'tgz') && $svgMethod ne 'dvisvgm') {
$self->use_svgMethod($working_dir);
}
if ($ext eq 'tgz') {
$self->use_convert($working_dir, "png");
} elsif ($ext ne 'svg' && $ext ne 'pdf') {
$self->use_convert($working_dir, $ext);
}
} else {
warn "The pdf file was not created.";
if (open(my $err_fh, "<", "$working_dir/latex.stdout")) {
while (my $error = <$err_fh>) {
warn $error;
}
close($err_fh);
}
if (($svgMethod ne 'dvisvgm' || $ext ne 'svg') && $ext ne 'pdf' && -r "$working_dir/image.pdf") {
if (($ext eq 'svg' || $ext eq 'tgz') && $svgMethod ne 'dvisvgm') {
$self->use_svgMethod($working_dir);
}
if ($ext eq 'tgz') {
$self->use_convert($working_dir, 'png');
} elsif ($ext ne 'svg' && $ext ne 'pdf') {
$self->use_convert($working_dir, $ext);
}
}

Expand Down