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 a6279b531cc1d6db66acf4e704d7f307fbb1491e..87df4efe841e33cf9b7d9317b7df960cb112aadb 100644 (file)
--- 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,8 +81,8 @@ Book::add_score (SCM s)
   scores_ = scm_cons (s, scores_);
 }
 
+
 /* Concatenate all score outputs into a Paper_book
-   
  */
 Paper_book *
 Book::process (Output_def *default_paper,
@@ -86,15 +93,17 @@ 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);
   SCM scm_key = key->unprotect ();
-  
+
   paper_book->paper_ = scaled_bookdef;
   scaled_bookdef->unprotect ();
 
@@ -113,21 +122,18 @@ Book::process (Output_def *default_paper,
              Music_output *output = unsmob_music_output (scm_car (outputs));
 
              if (Performance *perf = dynamic_cast<Performance *> (output))
+               paper_book->add_performance (perf->self_scm ());
+             else if (Paper_score *pscore = dynamic_cast<Paper_score *> (output))
                {
-                 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);
            }
        }
-      else if (Text_interface::markup_p (scm_car (s)))
+      else if (Text_interface::is_markup (scm_car (s)))
        paper_book->add_score (scm_car (s));
       else
        assert (0);
@@ -136,3 +142,4 @@ Book::process (Output_def *default_paper,
   scm_remember_upto_here_1 (scm_key);
   return paper_book;
 }
+