Merge with master

[lilypond.git] / lily / book.cc

diff --git a/lily/book.cc b/lily/book.cc
index f307bcf3c31c830a1523f29788c828c71ef6bece..01e52ce9cdce87151b731a9301e653813a399af1 100644 (file)
--- a/lily/book.cc
+++ b/lily/book.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "book.hh"
@@ -11,14 +11,11 @@
 #include <cstdio>
 using namespace std;
 
-#include "lilypond-key.hh"
 #include "main.hh"
-#include "music-output.hh"
 #include "music.hh"
 #include "output-def.hh"
 #include "paper-book.hh"
 #include "score.hh"
-#include "stencil.hh"
 #include "text-interface.hh"
 #include "warn.hh"
 #include "performance.hh"
@@ -46,13 +43,17 @@ Book::Book (Book const &s)
   smobify_self ();
 
   if (s.paper_)
-    paper_ = s.paper_->clone ();
+    {
+      paper_ = s.paper_->clone ();
+      paper_->unprotect ();
+    }
   
   input_location_ = make_input (*s.origin ());
+
   header_ = ly_make_anonymous_module (false);
   if (ly_is_module (s.header_))
     ly_module_copy (header_, s.header_);
-
+  
   SCM *t = &scores_;
   for (SCM p = s.scores_; scm_is_pair (p); p = scm_cdr (p))
     {
@@ -82,11 +83,6 @@ Book::mark_smob (SCM s)
 {
   Book *book = (Book *) SCM_CELL_WORD_1 (s);
 
-#if 0
-  if (book->key_)
-    scm_gc_mark (book->key_->self_scm ());
-#endif
-
   if (book->paper_)
     scm_gc_mark (book->paper_->self_scm ());
   scm_gc_mark (book->scores_);
@@ -128,9 +124,6 @@ Book::process (Output_def *default_paper,
   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);
-  SCM scm_key = key->unprotect ();
-
   paper_book->paper_ = scaled_bookdef;
   scaled_bookdef->unprotect ();
 
@@ -142,7 +135,7 @@ Book::process (Output_def *default_paper,
       if (Score *score = unsmob_score (scm_car (s)))
        {
          SCM outputs = score
-           ->book_rendering (paper_book->paper_, default_layout, key);
+           ->book_rendering (paper_book->paper_, default_layout);
 
          while (scm_is_pair (outputs))
            {
@@ -166,7 +159,6 @@ Book::process (Output_def *default_paper,
        assert (0);
     }
 
-  scm_remember_upto_here_1 (scm_key);
   return paper_book;
 }