Pflichtenheft -> Angebot/Auftrag: Positionen in richtiger Reihenfolge anlegen

[kivitendo-erp.git] / SL / Template / LaTeX.pm

diff --git a/SL/Template/LaTeX.pm b/SL/Template/LaTeX.pm
index 4bb4ce6..6eb331d 100644 (file)
--- a/SL/Template/LaTeX.pm
+++ b/SL/Template/LaTeX.pm
@@ -71,7 +71,7 @@ sub _format_html {
 
   $content =~ s{ \r+ }{}gx;
   $content =~ s{ \n+ }{ }gx;
-  $content =~ s{ \s+ }{ }gx;
+  $content =~ s{ (?:\ |\s)+ }{ }gx;
 
   my @parts = map {
     if (substr($_, 0, 1) eq '<') {
@@ -589,7 +589,7 @@ sub parse_and_create_pdf {
 
   my $error;
   eval {
-    my $template = SL::Template::LaTeX->new($template_file_name, $local_form, \%::myconfig, $::lx_office_conf{paths}->{userspath});
+    my $template = SL::Template::LaTeX->new(file_name => $template_file_name, form => $local_form);
     my $result   = $template->parse($tex_fh) && $template->convert_to_pdf;
 
     die $template->{error} unless $result;