use strict;
+use Cwd;
+
sub new {
my $type = shift;
my $keyword_pos = $pos - 1 + $tag_start_len;
- if ((substr($text, $keyword_pos, 2) eq 'if') || (substr($text, $keyword_pos, 3) eq 'for')) {
+ if ((substr($text, $keyword_pos, 2) eq 'if') || (substr($text, $keyword_pos, 7) eq 'foreach')) {
$depth++;
} elsif ((substr($text, $keyword_pos, 4) eq 'else') && (1 == $depth)) {
$comment_start = '\s*%';
} elsif (ref $self eq 'SL::Template::HTML') {
$comment_start = '\s*<!--';
- $comment_end = '>\s*';
+ $comment_end = '(?:--)?>\s*';
} else {
$comment_start = '\s*\#';
}
while ($i < $num_lines) {
my $line = $lines->[$i];
- if ($line !~ m/^${comment_start}\s*config\s*:(.*)${comment_end}$/i) {
+ if ($line !~ m/^${comment_start}\s*config\s*:(.*?)${comment_end}$/i) {
$i++;
next;
}
my $self = shift;
my $lines = shift;
- my (%used_packages, $document_start_line);
+ my (%used_packages, $document_start_line, $last_usepackage_line);
foreach my $i (0 .. scalar @{ $lines } - 1) {
if ($lines->[$i] =~ m/\\usepackage[^\{]*{(.*?)}/) {
$used_packages{$1} = 1;
+ $last_usepackage_line = $i;
} elsif ($lines->[$i] =~ m/\\begin{document}/) {
$document_start_line = $i;
}
}
- $document_start_line = scalar @{ $lines } - 1 if (!defined $document_start_line);
+ my $insertion_point = defined($document_start_line) ? $document_start_line
+ : defined($last_usepackage_line) ? $last_usepackage_line
+ : scalar @{ $lines } - 1;
- if (!$used_packages{textcomp}) {
- splice @{ $lines }, $document_start_line, 0, "\\usepackage{textcomp}\n";
- $document_start_line++;
+ foreach my $package (qw(textcomp)) {
+ next if $used_packages{$package};
+ splice @{ $lines }, $insertion_point, 0, "\\usepackage{${package}}\n";
+ $insertion_point++;
}
}
$form->{tmpfile} =~ s/\Q$userspath\E\///g;
my $latex = $self->_get_latex_path();
+ my $old_home = $ENV{HOME};
+ $ENV{HOME} = $userspath =~ m|^/| ? $userspath : getcwd() . "/" . $userspath;
for (my $run = 1; $run <= 2; $run++) {
system("${latex} --interaction=nonstopmode $form->{tmpfile} " .
"> $form->{tmpfile}.err");
if ($?) {
+ $ENV{HOME} = $old_home;
$self->{"error"} = $form->cleanup();
$self->cleanup();
return 0;
$form->{tmpfile} =~ s/tex$/dvi/;
system("dvips $form->{tmpfile} -o -q > /dev/null");
+ $ENV{HOME} = $old_home;
+
if ($?) {
$self->{"error"} = "dvips : $!";
$self->cleanup();
$form->{tmpfile} =~ s/\Q$userspath\E\///g;
my $latex = $self->_get_latex_path();
+ my $old_home = $ENV{HOME};
+ $ENV{HOME} = $userspath =~ m|^/| ? $userspath : getcwd() . "/" . $userspath;
for (my $run = 1; $run <= 2; $run++) {
system("${latex} --interaction=nonstopmode $form->{tmpfile} " .
"> $form->{tmpfile}.err");
if ($?) {
+ $ENV{HOME} = $old_home;
$self->{"error"} = $form->cleanup();
$self->cleanup();
return 0;
}
}
+ $ENV{HOME} = $old_home;
$form->{tmpfile} =~ s/tex$/pdf/;
$self->cleanup();
}
sub _get_latex_path {
- return $main::latex_bin || 'pdflatex';
+ return $::lx_office_conf{applications}->{latex} || 'pdflatex';
}
sub get_mime_type() {