Da fehlte noch eine Spalte.

[mfinanz.git] / SL / Template.pm

diff --git a/SL/Template.pm b/SL/Template.pm
index 6c26b4e5134c6805156423211164e193677efde2..b4c6bf509e2045efd51baf084fa98b39738a4657 100644 (file)
--- a/SL/Template.pm
+++ b/SL/Template.pm
@@ -196,7 +196,7 @@ sub parse_foreach {
         # replace the special variables <%sumcarriedforward%>
         # and <%lastpage%>
 
-        my $psum = $form->format_amount($myconfig, $sum, 2);
+        my $psum = $form->format_amount($self->{"myconfig"}, $sum, 2);
         $pb =~ s/<%sumcarriedforward%>/$psum/g;
         $pb =~ s/<%lastpage%>/$current_page/g;
 
@@ -210,7 +210,8 @@ sub parse_foreach {
       $current_line += $lines;
     }
     if ($i < scalar(@{$form->{"linetotal"}})) {
-      $sum += $form->parse_amount($myconfig, $form->{"linetotal"}->[$i]);
+      $sum += $form->parse_amount($self->{"myconfig"},
+                                  $form->{"linetotal"}->[$i]);
     }
 
     my $new_text = $self->parse_block($text, (@indices, $i));
@@ -357,10 +358,6 @@ sub parse {
   local *OUT = $_[1];
   my $form = $self->{"form"};
 
-  # Do we have to run LaTeX two times? This is needed if
-  # the template contains page references.
-  my $two_passes = 0;
-
   if (!open(IN, "$form->{templates}/$form->{IN}")) {
     $self->{"error"} = "$!";
     return 0;
@@ -369,7 +366,6 @@ sub parse {
   close(IN);
 
   my $contents = join("", @_);
-  $two_passes = 1 if ($contents =~ /\\pageref/s);
 
   # detect pagebreak block and its parameters
   if ($contents =~ /<%pagebreak\s+(\d+)\s+(\d+)\s+(\d+)\s*%>(.*?)<%end(\s*pagebreak)?%>/s) {
@@ -392,16 +388,16 @@ sub parse {
   print(OUT $new_contents);
 
   if ($form->{"format"} =~ /postscript/i) {
-    return $self->convert_to_postscript($two_passes);
+    return $self->convert_to_postscript();
   } elsif ($form->{"format"} =~ /pdf/i) {
-    return $self->convert_to_pdf($two_passes);
+    return $self->convert_to_pdf();
   } else {
     return 1;
   }
 }
 
 sub convert_to_postscript {
-  my ($self, $two_passes) = @_;
+  my ($self) = @_;
   my ($form, $userspath) = ($self->{"form"}, $self->{"userspath"});
 
   # Convert the tex file to postscript
@@ -414,14 +410,7 @@ sub convert_to_postscript {
 
   $form->{tmpfile} =~ s/$userspath\///g;
 
-  system("latex --interaction=nonstopmode $form->{tmpfile} " .
-         "> $form->{tmpfile}.err");
-  if ($?) {
-    $self->{"error"} = $form->cleanup();
-    $self->cleanup();
-    return 0;
-  }
-  if ($two_passes) {
+  for (my $run = 1; $run <= 2; $run++) {
     system("latex --interaction=nonstopmode $form->{tmpfile} " .
            "> $form->{tmpfile}.err");
     if ($?) {
@@ -447,7 +436,7 @@ sub convert_to_postscript {
 }
 
 sub convert_to_pdf {
-  my ($self, $two_passes) = @_;
+  my ($self) = @_;
   my ($form, $userspath) = ($self->{"form"}, $self->{"userspath"});
 
   # Convert the tex file to PDF
@@ -460,15 +449,7 @@ sub convert_to_pdf {
 
   $form->{tmpfile} =~ s/$userspath\///g;
 
-  system("pdflatex --interaction=nonstopmode $form->{tmpfile} " .
-         "> $form->{tmpfile}.err");
-  if ($?) {
-    $self->{"error"} = $form->cleanup();
-    $self->cleanup();
-    return 0;
-  }
-
-  if ($two_passes) {
+  for (my $run = 1; $run <= 2; $run++) {
     system("pdflatex --interaction=nonstopmode $form->{tmpfile} " .
            "> $form->{tmpfile}.err");
     if ($?) {
@@ -630,7 +611,7 @@ sub convert_to_pdf {
 
 
 ####
-#### HTMLTemplate
+#### OpenDocumentTemplate
 ####
 
 package OpenDocumentTemplate;