patch::: 1.0.16.jcn1: geile pats

[lilypond.git] / lily / paper-outputter.cc

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 17231564b8555774d6be312d1e4c7d67af9a639d..2ecf72a5ca87e62a968b1bfa35490ba9c4d5ccc5 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -9,7 +9,6 @@
 
 #include "paper-outputter.hh"
 #include "paper-stream.hh"
-#include "paper-def.hh"
 #include "molecule.hh"
 #include "atom.hh"
 #include "array.hh"
@@ -28,7 +27,7 @@ Paper_outputter::~Paper_outputter ()
 }
 
 void
-Paper_outputter::output_molecule (Molecule const*m, Offset o, char const *nm, String s)
+Paper_outputter::output_molecule (Molecule const*m, Offset o, char const *nm, String s, String output_str)
 {
   if (check_debug)
     *outstream_l_ << String ("\n%start: ") << nm << "\n";
@@ -43,9 +42,17 @@ Paper_outputter::output_molecule (Molecule const*m, Offset o, char const *nm, St
       Array<String> a;
       String r;
   
-      a.push (global_paper_l->dimension_str (a_off.y()));
-      a.push (global_paper_l->dimension_str (a_off.x()));
-      a.push (i->str_);
+      a.push (global_lookup_l->print_dimen (a_off.y()));
+      a.push (global_lookup_l->print_dimen (a_off.x()));
+      if (i->lambda_)
+        {
+         SCM str_scm = gh_call1 (gh_eval (i->lambda_), gh_eval_str ("'ps"));
+         char* c = gh_scm2newstr (str_scm, NULL);
+         a.push (String (c));
+         free (c);
+       }
+      else
+       a.push (i->str_);
       r += global_lookup_l->substitute_args (s, a);
       *outstream_l_ << r;
     }