projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changelog: Neue Verknüpfung E-Mail-Journal <-> Beleg
[kivitendo-erp.git]
/
SL
/
Template
/
LaTeX.pm
diff --git
a/SL/Template/LaTeX.pm
b/SL/Template/LaTeX.pm
index
8a579ef
..
ba310a9
100644
(file)
--- a/
SL/Template/LaTeX.pm
+++ b/
SL/Template/LaTeX.pm
@@
-123,6
+123,9
@@
sub format_string {
// $formatters{ $self->{default_content_type} }
// $formatters{ text };
// $formatters{ $self->{default_content_type} }
// $formatters{ text };
+ $content =~ s{[^\p{Print}\n]|\p{Cf}}{}g;
+ $variable =~ s{[^\p{Print}\n]|\p{Cf}}{}g;
+
return $formatter->($self, $content, variable => $variable);
}
return $formatter->($self, $content, variable => $variable);
}
@@
-448,9
+451,9
@@
sub parse {
$contents = "[% TAGS $self->{tag_start} $self->{tag_end} %]\n" . $contents;
}
$contents = "[% TAGS $self->{tag_start} $self->{tag_end} %]\n" . $contents;
}
-
$form->prepare_global_vars
;
+
my $globals = global_vars()
;
- $::form->
init_template->process(\$contents, $form
, \$new_contents) || die $::form->template->error;
+ $::form->
template->process(\$contents, { %$form, %$globals }
, \$new_contents) || die $::form->template->error;
} else {
$new_contents = $self->parse_block($contents);
}
} else {
$new_contents = $self->parse_block($contents);
}
@@
-637,4
+640,15
@@
sub parse_and_create_pdf {
return (file_name => do { $tex_file_name =~ s/tex$/pdf/; $tex_file_name });
}
return (file_name => do { $tex_file_name =~ s/tex$/pdf/; $tex_file_name });
}
+sub global_vars {
+ {
+ AUTH => $::auth,
+ INSTANCE_CONF => $::instance_conf,
+ LOCALE => $::locale,
+ LXCONFIG => $::lx_office_conf,
+ LXDEBUG => $::lxdebug,
+ MYCONFIG => \%::myconfig,
+ };
+}
+
1;
1;