X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FTemplate%2FLaTeX.pm;h=2f99f7e180a8b8c89849a52011b040fa3c26990a;hb=73a58f3dceeb378343ceb151942828eea686b75a;hp=8aac39dbbc32ff56785f56b564a02b98f0c371d7;hpb=6f2893dcf199d5e5147cc2020c2ab6984f4274dc;p=kivitendo-erp.git diff --git a/SL/Template/LaTeX.pm b/SL/Template/LaTeX.pm index 8aac39dbb..2f99f7e18 100644 --- a/SL/Template/LaTeX.pm +++ b/SL/Template/LaTeX.pm @@ -4,6 +4,16 @@ use parent qw(SL::Template::Simple); use strict; +use Carp; +use Cwd; +use English qw(-no_match_vars); +use File::Basename; +use File::Temp; +use List::MoreUtils qw(any); +use Unicode::Normalize qw(); + +use SL::DB::Default; + sub new { my $type = shift; @@ -14,7 +24,6 @@ sub new { sub format_string { my ($self, $variable) = @_; - my $form = $self->{"form"}; $variable = $main::locale->quote_special_chars('Template/LaTeX', $variable); @@ -60,6 +69,7 @@ sub parse_foreach { $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) @@ -100,6 +110,7 @@ sub parse_foreach { } $current_line += $lines; } + #stop removing code here. if ( ref $linetotal_array eq 'ARRAY' && $i < scalar(@{$linetotal_array})) { @@ -132,7 +143,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)) { @@ -252,6 +263,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 { @@ -264,7 +278,7 @@ sub _parse_config_lines { $comment_start = '\s*%'; } elsif (ref $self eq 'SL::Template::HTML') { $comment_start = '\s*