X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbook.cc;h=87df4efe841e33cf9b7d9317b7df960cb112aadb;hb=70d5609d63efe8a9b42ff763b79348bf99953bf2;hp=0c3106e3fa2037ff9c8240eff1f4154331e34225;hpb=108cf0e8c08c8e15e2a800feb161cfad9057daa8;p=lilypond.git

diff --git a/lily/book.cc b/lily/book.cc
index 0c3106e3fa..87df4efe84 100644
--- a/lily/book.cc
+++ b/lily/book.cc
@@ -3,12 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "book.hh"
 
 #include <cstdio>
+using namespace std;
 
 #include "lilypond-key.hh"
 #include "global-context.hh"
@@ -37,6 +38,12 @@ Book::Book ()
   smobify_self ();
 }
 
+Book* 
+Book::clone () const
+{
+  return new Book (*this);
+}
+
 Book::~Book ()
 {
 }
@@ -74,6 +81,7 @@ Book::add_score (SCM s)
   scores_ = scm_cons (s, scores_);
 }
 
+
 /* Concatenate all score outputs into a Paper_book
  */
 Paper_book *
@@ -85,10 +93,12 @@ Book::process (Output_def *default_paper,
       if (score->error_found_)
 	return 0;
 
-  Output_def *paper = paper_ ? default_paper : paper_;
-
+  Output_def *paper = paper_ ? paper_ : default_paper;
+  if (!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);
@@ -115,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);
@@ -133,3 +142,4 @@ Book::process (Output_def *default_paper,
   scm_remember_upto_here_1 (scm_key);
   return paper_book;
 }
+