Merge branch 'master' into lilypond/translation

[lilypond.git] / lily / book.cc

diff --git a/lily/book.cc b/lily/book.cc
index 44f7ee4ef933f7f206c151c1b4738c72aece689c..335507601d37fc46d3e1fa381e904b4b27421f82 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,7 +11,6 @@
 #include <cstdio>
 using namespace std;
 
-#include "lilypond-key.hh"
 #include "main.hh"
 #include "music.hh"
 #include "output-def.hh"
@@ -21,6 +20,7 @@ using namespace std;
 #include "warn.hh"
 #include "performance.hh"
 #include "paper-score.hh"
+#include "page-marker.hh"
 
 #include "ly-smobs.icc"
 
@@ -44,20 +44,24 @@ 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))
     {
       Score *newscore = unsmob_score (scm_car (p))->clone ();
 
       *t = scm_cons (newscore->self_scm (), SCM_EOL);
-      t = SCM_CDRLOC(*t);
+      t = SCM_CDRLOC (*t);
       newscore->unprotect ();
     }
 }
@@ -80,11 +84,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_);
@@ -126,9 +125,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 ();
 
@@ -140,7 +136,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))
            {
@@ -150,21 +146,21 @@ Book::process (Output_def *default_paper,
                paper_book->add_performance (perf->self_scm ());
              else if (Paper_score *pscore = dynamic_cast<Paper_score *> (output))
                {
-                 if (ly_is_module (score->header_))
-                   paper_book->add_score (score->header_);
+                 if (ly_is_module (score->get_header ()))
+                   paper_book->add_score (score->get_header ());
                  paper_book->add_score (pscore->self_scm ());
                }
 
              outputs = scm_cdr (outputs);
            }
        }
-      else if (Text_interface::is_markup (scm_car (s)))
+      else if (Text_interface::is_markup_list (scm_car (s))
+              || unsmob_page_marker (scm_car (s)))
        paper_book->add_score (scm_car (s));
       else
        assert (0);
     }
 
-  scm_remember_upto_here_1 (scm_key);
   return paper_book;
 }