use strict;
use Cwd;
+use Unicode::Normalize qw();
sub new {
my $type = shift;
$form->{"__odd__"} = (($i + 1) % 2) == 1;
$form->{"__counter__"} = $i + 1;
+ #everything from here to the next marker should be removed after the release of 2.7.0
if ( ref $description_array eq 'ARRAY'
&& scalar @{$description_array} == scalar @{$ary}
&& $self->{"chars_per_line"} != 0)
}
$current_line += $lines;
}
+ #stop removing code here.
if ( ref $linetotal_array eq 'ARRAY'
&& $i < scalar(@{$linetotal_array})) {
my $keyword_pos = $pos - 1 + $tag_start_len;
- if ((substr($text, $keyword_pos, 2) eq 'if') || (substr($text, $keyword_pos, 3) eq 'foreach')) {
+ 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)) {
return 0;
}
- binmode OUT, ":utf8" if $::locale->is_utf8;
- print(OUT $new_contents);
+ if ($::locale->is_utf8) {
+ binmode OUT, ":utf8";
+ print OUT Unicode::Normalize::normalize('C', $new_contents);
+
+ } else {
+ print OUT $new_contents;
+ }
if ($form->{"format"} =~ /postscript/i) {
return $self->convert_to_postscript();
my $latex = $self->_get_latex_path();
my $old_home = $ENV{HOME};
- $ENV{HOME} = $userspath =~ m|^/| ? $userspath : getcwd() . "/" . $userspath;
+ my $old_openin_any = $ENV{openin_any};
+ $ENV{HOME} = $userspath =~ m|^/| ? $userspath : getcwd();
+ $ENV{openin_any} = "p";
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();
+ $ENV{openin_any} = $old_openin_any;
+ $self->{"error"} = $form->cleanup($latex);
return 0;
}
}
system("dvips $form->{tmpfile} -o -q > /dev/null");
$ENV{HOME} = $old_home;
+ $ENV{openin_any} = $old_openin_any;
if ($?) {
$self->{"error"} = "dvips : $!";
- $self->cleanup();
+ $self->cleanup('dvips');
return 0;
}
$form->{tmpfile} =~ s/dvi$/ps/;
my $latex = $self->_get_latex_path();
my $old_home = $ENV{HOME};
- $ENV{HOME} = $userspath =~ m|^/| ? $userspath : getcwd() . "/" . $userspath;
+ my $old_openin_any = $ENV{openin_any};
+ $ENV{HOME} = $userspath =~ m|^/| ? $userspath : getcwd();
+ $ENV{openin_any} = "p";
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();
+ $ENV{HOME} = $old_home;
+ $ENV{openin_any} = $old_openin_any;
+ $self->{error} = $form->cleanup($latex);
return 0;
}
}
$ENV{HOME} = $old_home;
+ $ENV{openin_any} = $old_openin_any;
$form->{tmpfile} =~ s/tex$/pdf/;
$self->cleanup();