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 4e804b7d52ee90e381df8336fb9de8ec0d655bcb..87df4efe841e33cf9b7d9317b7df960cb112aadb 100644 (file)
--- a/lily/book.cc
+++ b/lily/book.cc
@@ -3,37 +3,47 @@
 
   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-paper-def.hh"
-#include "ly-smobs.icc"
-#include "stencil.hh"
 #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-def.hh"
 #include "music-output.hh"
 #include "music.hh"
-#include "page.hh"
+#include "output-def.hh"
 #include "paper-book.hh"
-#include "paper-def.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 ()
 {
 }
@@ -44,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_;
 }
 
@@ -62,62 +76,70 @@ Book::print_smob (SCM, SCM p, scm_print_state*)
 }
 
 void
-Book::process (String outname, Music_output_def *default_def, SCM header)
+Book::add_score (SCM s)
 {
-  Paper_book *paper_book = new Paper_book ();
-  int score_count = scores_.size ();
-  for (int i = 0; i < score_count; i++)
-    {
-      Paper_def *paper = 0;
-      SCM systems = scores_[i]->book_rendering (outname,
-                                               bookpaper_,
-                                               default_def, &paper);
-      if (systems != SCM_UNDEFINED)
-       {
-         Score_lines sc;
-         sc.paper_ = paper;
-         sc.lines_ = systems;
-         sc.header_ = header;
-
-         paper_book->score_lines_.push (sc);
-       }
-    }
-  paper_book->output (outname);
-  scm_gc_unprotect_object (paper_book->self_scm ());
+  scores_ = scm_cons (s, scores_);
 }
 
-/* FIXME: WIP, this is a hack.  Return first page as stencil.  */
-SCM
-Book::to_stencil (Music_output_def *default_def, SCM header)
+
+/* Concatenate all score outputs into a Paper_book
+ */
+Paper_book *
+Book::process (Output_def *default_paper,
+              Output_def *default_layout)
 {
+  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;
+
+  Output_def *paper = paper_ ? paper_ : default_paper;
+  if (!paper)
+    return 0;
+  
   Paper_book *paper_book = new Paper_book ();
-  int score_count = scores_.size ();
-  for (int i = 0; i < score_count; i++)
-    {
-      Paper_def *paper = 0;
-      SCM systems = scores_[i]->book_rendering ("<markup>",
-                                               bookpaper_,
-                                               default_def,
-                                               &paper);
-      if (systems != SCM_UNDEFINED)
-       {
-         Score_lines sc;
-         sc.paper_ = paper;
-         sc.lines_ = systems;
-         sc.header_ =header;
+  Real scale = scm_to_double (paper->c_variable ("output-scale"));
+  Output_def *scaled_bookdef = scale_output_def (paper, scale);
 
-         paper_book->score_lines_.push (sc);
+  Object_key *key = new Lilypond_general_key (0, user_key_, 0);
+  SCM scm_key = key->unprotect ();
 
-         // wtf: code dup.
-       }
-    }
+  paper_book->paper_ = scaled_bookdef;
+  scaled_bookdef->unprotect ();
 
-  SCM pages = paper_book->pages ();
-  paper_book = 0;
-  if (pages != SCM_EOL)
+  paper_book->header_ = header_;
+
+  /* Render in order of parsing.  */
+  for (SCM s = scm_reverse (scores_); s != SCM_EOL; s = scm_cdr (s))
     {
-      progress_indication (_f ("paper output to `%s'...", "<markup>"));
-      return (unsmob_page (ly_car (pages)))->to_stencil ().smobbed_copy ();
+      if (Score *score = unsmob_score (scm_car (s)))
+       {
+         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))
+               {
+                 if (ly_is_module (score->header_))
+                   paper_book->add_score (score->header_);
+                 paper_book->add_score (pscore->self_scm ());
+               }
+
+             outputs = scm_cdr (outputs);
+           }
+       }
+      else if (Text_interface::is_markup (scm_car (s)))
+       paper_book->add_score (scm_car (s));
+      else
+       assert (0);
     }
-  return SCM_EOL;
+
+  scm_remember_upto_here_1 (scm_key);
+  return paper_book;
 }
+