fix typos.

[lilypond.git] / lily / book.cc

diff --git a/lily/book.cc b/lily/book.cc
index 0861d4f6a8daf01d5b1af3518d5abb4a604ec607..640600f6d3d29fd13c44ab94ca39cbb176bad45d 100644 (file)
--- a/lily/book.cc
+++ b/lily/book.cc
@@ -8,25 +8,26 @@
 
 #include <stdio.h>
 
-#include "ly-smobs.icc"
-
+#include "lilypond-key.hh"
 #include "book.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 "warn.hh"
 
+#include "ly-smobs.icc"
+
 Book::Book ()
   : Input ()
 {
+  paper_ = 0;
   header_ = SCM_EOL;
   assert (!scores_.size ());
   smobify_self ();
@@ -46,6 +47,13 @@ Book::mark_smob (SCM 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 ());
   return book->header_;
 }
 
@@ -56,58 +64,89 @@ Book::print_smob (SCM, SCM p, scm_print_state*)
   return 1;
 }
 
-void
-Book::process (String outname, Music_output_def *default_def, SCM header)
+/* 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;
+
   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);
+  
+  paper_book->paper_ = 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++)
     {
-      Paper_def *paper = 0;
-      SCM systems = scores_[i]->book_rendering (outname, default_def, &paper);
-      if (systems != SCM_UNDEFINED)
+      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 (paper)
-           paper_book->papers_.push (paper);
-         
-         paper_book->scores_.push (systems);
-
-         // fixme.
-         //paper_book->global_headers_.push (global_input_file->header_);
-         //paper_book->headers_.push (scores_[i]->header_);
-         paper_book->headers_.push (header);
+         Score_systems sc;
+         sc.systems_ = systems;
+         sc.header_ = scores_[i]->header_;
+         paper_book->score_systems_.push (sc);
        }
     }
-  paper_book->output (outname);
-  scm_gc_unprotect_object (paper_book->self_scm ());
+
+
+  scm_remember_upto_here_1 (scm_key);
+  return paper_book;
 }
 
-/* FIXME: WIP, this is a hack.  Return first page as stencil.  */
-SCM
-Book::to_stencil (Music_output_def *default_def, SCM header)
+LY_DEFINE(ly_make_book, "ly:make-book",
+         2, 0, 1, (SCM paper, SCM header, SCM scores),
+         "Make a \\book of @var{paper} and @var{header} (which may be #f as well)  "
+         "containing @code{\\scores}.")
 {
-  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>", default_def,
-                                               &paper);
-      if (systems != SCM_UNDEFINED)
-       {
-         if (paper)
-           paper_book->papers_.push (paper);
-         paper_book->scores_.push (systems);
-         paper_book->headers_.push (header);
-       }
-    }
+  Output_def * odef = unsmob_output_def (paper);
+  SCM_ASSERT_TYPE (odef, paper,
+                  SCM_ARG1, __FUNCTION__, "Output_def");
+
+  Book *book = new Book;
+  book->paper_ = odef;
 
-  SCM pages = paper_book->pages ();
-  paper_book = 0;
-  if (pages != SCM_EOL)
+  if (ly_c_module_p (header))
+    book->header_ = header;
+  
+  for (SCM s = scores; scm_is_pair (s); s = scm_cdr (s))
     {
-      progress_indication (_f ("paper output to `%s'...", "<markup>"));
-      return (unsmob_page (ly_car (pages)))->to_stencil ();
+      Score *score = unsmob_score (scm_car (s));
+      if (score)
+       book->scores_.push (score);
     }
-  return SCM_EOL;
+  
+  SCM x = book->self_scm ();
+  scm_gc_unprotect_object (x);
+  return x;
+}
+  
+
+void
+Book::add_score (Score *s)
+{
+  scores_.push (s);
+  scm_gc_unprotect_object (s->self_scm ());
 }