From: Sven Schöling <s.schoeling@linet-services.de>
Date: Tue, 11 Oct 2011 13:13:04 +0000 (+0200)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-2.7.0beta1~240
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/8084ef359515031ec8429b49baf0ab09858f55d2?hp=26ab499f25452b9f9d4ef04fdc4a12ecf05d3702

Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
---

diff --git a/SL/Template/LaTeX.pm b/SL/Template/LaTeX.pm
index c66399fc4..c7d51e0e0 100644
--- a/SL/Template/LaTeX.pm
+++ b/SL/Template/LaTeX.pm
@@ -5,6 +5,7 @@ use parent qw(SL::Template::Simple);
 use strict;
 
 use Cwd;
+use Unicode::Normalize qw();
 
 sub new {
   my $type = shift;
@@ -353,8 +354,13 @@ sub parse {
     return 0;
   }
 
-  binmode OUT, ":utf8" if $::locale->is_utf8;
-  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();