* lily/book.cc:

[lilypond.git] / lily / book.cc

diff --git a/lily/book.cc b/lily/book.cc
index d15233f70c5ac04eab8c0f1f84b90f15b1003b7c..0ba3fdf7f85d99062f0e1e2499593254834f3071 100644 (file)
--- a/lily/book.cc
+++ b/lily/book.cc
@@ -6,10 +6,10 @@
   (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "book.hh"
 
 #include <cstdio>
 
-#include "book.hh"
 #include "lilypond-key.hh"
 #include "global-context.hh"
 #include "main.hh"
@@ -20,6 +20,7 @@
 #include "paper-book.hh"
 #include "score.hh"
 #include "stencil.hh"
+#include "text-item.hh"
 #include "warn.hh"
 
 #include "ly-smobs.icc"
@@ -29,7 +30,7 @@ Book::Book ()
 {
   paper_ = 0;
   header_ = SCM_EOL;
-  assert (!scores_.size ());
+  scores_ = SCM_EOL;
   smobify_self ();
 }
 
@@ -44,16 +45,16 @@ SCM
 Book::mark_smob (SCM s)
 {
   Book *book = (Book*) SCM_CELL_WORD_1 (s);
-  int score_count = book->scores_.size ();
-  for (int i = 0; i < score_count; i++)
-    scm_gc_mark (book->scores_[i]->self_scm ());
 
 #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_);
+
   return book->header_;
 }
 
@@ -64,23 +65,26 @@ Book::print_smob (SCM, SCM p, scm_print_state*)
   return 1;
 }
 
+void
+Book::add_score (SCM s)
+{
+  scores_ = scm_cons (s, scores_);
+}
+
 /* This function does not dump the output; outname is required eg. for
    dumping header fields.  */
 Paper_book *
 Book::process (String outname, Output_def *default_def)
 {
-  bool error = false;
-  for (int i = 0; i < scores_.size(); i++)
-    error = error || scores_[i]->error_found_;
-
-  if (error)
-    return 0;
+  for (SCM s = scores_; s != SCM_EOL; s = scm_cdr (s))
+    if (Score *score = unsmob_score (scm_car (s)))
+      if (score->error_found_)
+       return 0;
 
   Paper_book *paper_book = new Paper_book ();
   Real scale = scm_to_double (paper_->c_variable ("outputscale"));
   Output_def * scaled_bookdef = scale_output_def (paper_, scale);
 
-
   Object_key * key = new Lilypond_general_key (0, user_key_, 0);
   SCM  scm_key = key->self_scm();
   scm_gc_unprotect_object (scm_key);
@@ -89,40 +93,30 @@ Book::process (String outname, Output_def *default_def)
   scm_gc_unprotect_object (scaled_bookdef->self_scm());
   
   paper_book->header_ = header_;
-  int score_count = scores_.size ();
-  for (int i = 0; i < score_count; i++)
+
+  /* Render in order of parsing.  */
+  for (SCM s = scm_reverse (scores_); s != SCM_EOL; s = scm_cdr (s))
     {
-      SCM systems = scores_[i]->book_rendering (outname,
-                                               paper_book->paper_,
-                                               default_def,
-                                               key
-                                               );
-      
-      /*
-       If the score is empty, generate no output.  Should we
-       do titling?
-      */
-      if (SCM_NFALSEP(scm_vector_p (systems)))
+      if (Score *score = unsmob_score (scm_car (s)))
        {
-         Score_systems sc;
-         sc.systems_ = systems;
-         sc.header_ = scores_[i]->header_;
-         sc.texts_ = scores_[i]->texts_;
-         paper_book->score_systems_.push (sc);
+         SCM systems = score
+           ->book_rendering (outname, paper_book->paper_, default_def, key);
+      
+         /* If the score is empty, generate no output.  Should we do
+            titling? */
+         if (scm_is_vector (systems))
+           {
+             if (ly_c_module_p (header_))
+               paper_book->add_score (header_);
+             paper_book->add_score (systems);
+           }
        }
+      else if (Text_interface::markup_p (scm_car (s)))
+       paper_book->add_score (scm_car (s));
+      else
+       assert (0);
     }
 
-
   scm_remember_upto_here_1 (scm_key);
   return paper_book;
 }
-
-
-  
-
-void
-Book::add_score (Score *s)
-{
-  scores_.push (s);
-  scm_gc_unprotect_object (s->self_scm ());
-}