X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbook.cc;h=1d6edde999acb733da443ee9e67f136c04546765;hb=75eebcb49e52d296b1da3e1074e0825d2c780db4;hp=6b947a88184867aef1b4990a2cb34b4477d1ee90;hpb=2536405e9584f63d559653183971c0fec57ba037;p=lilypond.git

diff --git a/lily/book.cc b/lily/book.cc
index 6b947a8818..1d6edde999 100644
--- a/lily/book.cc
+++ b/lily/book.cc
@@ -3,14 +3,16 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include <stdio.h>
-
 #include "book.hh"
+
+#include <cstdio>
+using namespace std;
+
+#include "lilypond-key.hh"
 #include "global-context.hh"
-#include "ly-module.hh"
 #include "main.hh"
 #include "music-iterator.hh"
 #include "music-output.hh"
@@ -19,19 +21,29 @@
 #include "paper-book.hh"
 #include "score.hh"
 #include "stencil.hh"
+#include "text-interface.hh"
 #include "warn.hh"
 
+#include "performance.hh"
+#include "paper-score.hh"
+
 #include "ly-smobs.icc"
 
 Book::Book ()
   : Input ()
 {
-  bookpaper_ = 0;
+  paper_ = 0;
   header_ = SCM_EOL;
-  assert (!scores_.size ());
+  scores_ = SCM_EOL;
   smobify_self ();
 }
 
+Book* 
+Book::clone () const
+{
+  return new Book (*this);
+}
+
 Book::~Book ()
 {
 }
@@ -42,13 +54,17 @@ IMPLEMENT_DEFAULT_EQUAL_P (Book);
 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 ());
+  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_);
 
-  if (book->bookpaper_)
-    scm_gc_mark (book->bookpaper_->self_scm ());
   return book->header_;
 }
 
@@ -59,73 +75,71 @@ Book::print_smob (SCM, SCM p, scm_print_state*)
   return 1;
 }
 
-/* This function does not dump the output; outname is required eg. for
-   dumping header fields.  */
+void
+Book::add_score (SCM s)
+{
+  scores_ = scm_cons (s, scores_);
+}
+
+/* Concatenate all score outputs into a Paper_book
+ */
 Paper_book *
-Book::process (String outname, Output_def *default_def)
+Book::process (Output_def *default_paper,
+	       Output_def *default_layout)
 {
-  bool error = false;
-  for (int i = 0; i < scores_.size(); i++)
-    error |= scores_[i]->error_found_;
+  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;
 
-  if (error)
+  Output_def *paper = paper_ ? paper_ : default_paper;
+  if (!paper)
     return 0;
-    
-  Paper_book *paper_book = new Paper_book ();
-  Real scale = scm_to_double (bookpaper_->c_variable ("outputscale"));
   
-  Output_def * scaled_bookdef = scale_output_def (bookpaper_, scale);
+  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->unprotect ();
+
+  paper_book->paper_ = scaled_bookdef;
+  scaled_bookdef->unprotect ();
 
-  paper_book->bookpaper_ = scaled_bookdef;
-  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->bookpaper_,
-						default_def);
-      
-      /* 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_;
-	  paper_book->score_systems_.push (sc);
+	  SCM outputs = score
+	    ->book_rendering (paper_book->paper_, default_layout, key);
+
+	  while (scm_is_pair (outputs))
+	    {
+	      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))
+		{
+		  SCM systems = pscore->get_paper_systems ();
+		  if (ly_is_module (score->header_))
+		    paper_book->add_score (score->header_);
+		  paper_book->add_score (systems);
+		}
+
+	      outputs = scm_cdr (outputs);
+	    }
 	}
+      else if (Text_interface::is_markup (scm_car (s)))
+	paper_book->add_score (scm_car (s));
+      else
+	assert (0);
     }
 
+  scm_remember_upto_here_1 (scm_key);
   return paper_book;
 }
 
-LY_DEFINE(ly_make_book, "ly:make-book",
-	  2, 0, 1, (SCM bookpaper, SCM header, SCM scores),
-	  "Make a \\book of @var{bookpaper} and @var{header} (which may be #f as well)  "
-	  "containing @code{\\scores}.")
-{
-  Output_def * odef = unsmob_output_def (bookpaper);
-  SCM_ASSERT_TYPE (odef, bookpaper,
-		   SCM_ARG1, __FUNCTION__, "Output_def");
-
-  Book *book = new Book;
-  book->bookpaper_ = odef;
-
-  if (ly_c_module_p (header))
-    book->header_ = header;
-  
-  for (SCM s = scores; scm_is_pair (s); s = ly_cdr (s))
-    {
-      Score *score = unsmob_score (ly_car (s));
-      if (score)
-	book->scores_.push (score);
-    }
-  
-  SCM x = book->self_scm ();
-  scm_gc_unprotect_object (x);
-  return x;
-}
-