X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FTemplate%2FLaTeX.pm;h=5d5008c1f129cb67a84ad2ad2b8b36af41848aea;hb=1b9d0f70b5e58c510ed2ab4337eb0f6512d779ca;hp=889ed07130543b2351c0592c95fdd65b3da7bf99;hpb=0fba3edda47fca21bedb14eb88e0f5f8d983bb38;p=kivitendo-erp.git

diff --git a/SL/Template/LaTeX.pm b/SL/Template/LaTeX.pm
index 889ed0713..5d5008c1f 100644
--- a/SL/Template/LaTeX.pm
+++ b/SL/Template/LaTeX.pm
@@ -1,12 +1,12 @@
 package SL::Template::LaTeX;
 
-use vars qw(@ISA);
-
-use SL::Template;
-@ISA = qw(SL::Template::Simple);
+use parent qw(SL::Template::Simple);
 
 use strict;
 
+use Cwd;
+use Unicode::Normalize qw();
+
 sub new {
   my $type = shift;
 
@@ -17,7 +17,6 @@ sub new {
 
 sub format_string {
   my ($self, $variable) = @_;
-  my $form = $self->{"form"};
 
   $variable = $main::locale->quote_special_chars('Template/LaTeX', $variable);
 
@@ -58,11 +57,12 @@ sub parse_foreach {
 
   for (my $i = 0; $i < scalar(@{$ary}); $i++) {
     # do magic markers
-    $form->{"__first__"}   = $i == 1;
+    $form->{"__first__"}   = $i == 0;
     $form->{"__last__"}    = ($i + 1) == scalar(@{$ary});
     $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)
@@ -103,6 +103,7 @@ sub parse_foreach {
       }
       $current_line += $lines;
     }
+  #stop removing code here.
 
     if (   ref $linetotal_array eq 'ARRAY'
         && $i < scalar(@{$linetotal_array})) {
@@ -135,7 +136,7 @@ sub find_end {
 
     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)) {
@@ -255,6 +256,9 @@ sub _parse_config_option {
   if ($key eq 'tag-style') {
     $self->set_tag_style(split(m/\s+/, $value, 2));
   }
+  if ($key eq 'use-template-toolkit') {
+    $self->set_use_template_toolkit($value);
+  }
 }
 
 sub _parse_config_lines {
@@ -267,7 +271,7 @@ sub _parse_config_lines {
     $comment_start = '\s*%';
   } elsif (ref $self eq 'SL::Template::HTML') {
     $comment_start = '\s*<!--';
-    $comment_end   = '>\s*';
+    $comment_end   = '(?:--)?>\s*';
   } else {
     $comment_start = '\s*\#';
   }
@@ -278,7 +282,7 @@ sub _parse_config_lines {
   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;
     }
@@ -293,11 +297,12 @@ sub _force_mandatory_packages {
   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;
@@ -306,11 +311,14 @@ sub _force_mandatory_packages {
     }
   }
 
-  $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++;
   }
 }
 
@@ -323,6 +331,7 @@ sub parse {
     $self->{"error"} = "$!";
     return 0;
   }
+  binmode IN, ":utf8" if $::locale->is_utf8;
   my @lines = <IN>;
   close(IN);
 
@@ -343,13 +352,26 @@ sub parse {
 
   $self->{"forced_pagebreaks"} = [];
 
-  my $new_contents = $self->parse_block($contents);
+  my $new_contents;
+  if ($self->{use_template_toolkit}) {
+    my $additional_params = $::form;
+
+    $::form->init_template->process(\$contents, $additional_params, \$new_contents) || die $::form->template->error;
+  } else {
+    $new_contents = $self->parse_block($contents);
+  }
   if (!defined($new_contents)) {
     $main::lxdebug->leave_sub();
     return 0;
   }
 
-  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();
@@ -375,13 +397,18 @@ sub convert_to_postscript {
   $form->{tmpfile} =~ s/\Q$userspath\E\///g;
 
   my $latex = $self->_get_latex_path();
+  my $old_home = $ENV{HOME};
+  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 ($?) {
-      $self->{"error"} = $form->cleanup();
-      $self->cleanup();
+      $ENV{HOME} = $old_home;
+      $ENV{openin_any} = $old_openin_any;
+      $self->{"error"} = $form->cleanup($latex);
       return 0;
     }
   }
@@ -389,9 +416,12 @@ sub convert_to_postscript {
   $form->{tmpfile} =~ s/tex$/dvi/;
 
   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/;
@@ -416,24 +446,31 @@ sub convert_to_pdf {
   $form->{tmpfile} =~ s/\Q$userspath\E\///g;
 
   my $latex = $self->_get_latex_path();
+  my $old_home = $ENV{HOME};
+  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 ($?) {
-      $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();
 }
 
 sub _get_latex_path {
-  return $main::latex_bin || 'pdflatex';
+  return $::lx_office_conf{applications}->{latex} || 'pdflatex';
 }
 
 sub get_mime_type() {