Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / book.cc

diff --git a/lily/book.cc b/lily/book.cc
index 1d6edde999acb733da443ee9e67f136c04546765..87df4efe841e33cf9b7d9317b7df960cb112aadb 100644 (file)
--- a/lily/book.cc
+++ b/lily/book.cc
@@ -81,6 +81,7 @@ Book::add_score (SCM s)
   scores_ = scm_cons (s, scores_);
 }
 
+
 /* Concatenate all score outputs into a Paper_book
  */
 Paper_book *
@@ -97,7 +98,7 @@ Book::process (Output_def *default_paper,
     return 0;
   
   Paper_book *paper_book = new Paper_book ();
-  Real scale = scm_to_double (paper->c_variable ("outputscale"));
+  Real scale = scm_to_double (paper->c_variable ("output-scale"));
   Output_def *scaled_bookdef = scale_output_def (paper, scale);
 
   Object_key *key = new Lilypond_general_key (0, user_key_, 0);
@@ -124,10 +125,9 @@ Book::process (Output_def *default_paper,
                paper_book->add_performance (perf->self_scm ());
              else if (Paper_score *pscore = dynamic_cast<Paper_score *> (output))
                {
-                 SCM systems = pscore->get_paper_systems ();
                  if (ly_is_module (score->header_))
                    paper_book->add_score (score->header_);
-                 paper_book->add_score (systems);
+                 paper_book->add_score (pscore->self_scm ());
                }
 
              outputs = scm_cdr (outputs);