X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FTemplate%2FLaTeX.pm;h=6eb331d605b63c2b01ecc11d8d12ce00dbfe457f;hb=c4ce237aaab9c25c41334c30852d2ea640730efe;hp=4bb4ce63de5ad531bc3faff7755dbb0f775dad12;hpb=b849f0d37e42677bb6eb850272ba2bb22c57363f;p=kivitendo-erp.git diff --git a/SL/Template/LaTeX.pm b/SL/Template/LaTeX.pm index 4bb4ce63d..6eb331d60 100644 --- 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;