X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbook.cc;h=2a1038941b8e630904c2f4abce75174991f966c4;hb=ee232b8901151e7371f77b099be6894bfcfad792;hp=0ba3fdf7f85d99062f0e1e2499593254834f3071;hpb=26bb48ca73e9b8f4c0aeca0427eff8b7520b0731;p=lilypond.git

diff --git a/lily/book.cc b/lily/book.cc
index 0ba3fdf7f8..2a1038941b 100644
--- a/lily/book.cc
+++ b/lily/book.cc
@@ -3,35 +3,73 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "book.hh"
 
 #include <cstdio>
+using namespace std;
 
-#include "lilypond-key.hh"
-#include "global-context.hh"
 #include "main.hh"
-#include "music-iterator.hh"
-#include "music-output.hh"
 #include "music.hh"
 #include "output-def.hh"
 #include "paper-book.hh"
 #include "score.hh"
-#include "stencil.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
 #include "warn.hh"
+#include "performance.hh"
+#include "paper-score.hh"
+#include "page-marker.hh"
 
 #include "ly-smobs.icc"
 
 Book::Book ()
-  : Input ()
 {
   paper_ = 0;
   header_ = SCM_EOL;
   scores_ = SCM_EOL;
+  input_location_ = SCM_EOL;
   smobify_self ();
+
+  input_location_ = make_input (Input ());
+}
+
+Book::Book (Book const &s)
+{
+  paper_ = 0;
+  header_ = SCM_EOL;
+  scores_ = SCM_EOL;
+  input_location_ = SCM_EOL;
+  smobify_self ();
+
+  if (s.paper_)
+    {
+      paper_ = s.paper_->clone ();
+      paper_->unprotect ();
+    }
+  
+  input_location_ = make_input (*s.origin ());
+
+  header_ = ly_make_anonymous_module (false);
+  if (ly_is_module (s.header_))
+    ly_module_copy (header_, s.header_);
+  
+  SCM *t = &scores_;
+  for (SCM p = s.scores_; scm_is_pair (p); p = scm_cdr (p))
+    {
+      Score *newscore = unsmob_score (scm_car (p))->clone ();
+
+      *t = scm_cons (newscore->self_scm (), SCM_EOL);
+      t = SCM_CDRLOC (*t);
+      newscore->unprotect ();
+    }
+}
+
+Input *
+Book::origin () const
+{
+  return unsmob_input (input_location_);
 }
 
 Book::~Book ()
@@ -44,17 +82,13 @@ IMPLEMENT_DEFAULT_EQUAL_P (Book);
 SCM
 Book::mark_smob (SCM s)
 {
-  Book *book = (Book*) SCM_CELL_WORD_1 (s);
-
-#if 0
-  if (book->key_)
-    scm_gc_mark (book->key_->self_scm());
-#endif
+  Book *book = (Book *) SCM_CELL_WORD_1 (s);
 
   if (book->paper_)
     scm_gc_mark (book->paper_->self_scm ());
   scm_gc_mark (book->scores_);
-
+  scm_gc_mark (book->input_location_);
+  
   return book->header_;
 }
 
@@ -71,52 +105,62 @@ 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.  */
+
+/* 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)
 {
-  for (SCM s = scores_; s != SCM_EOL; s = scm_cdr (s))
+  for (SCM s = scores_; scm_is_pair (s); 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 ();
-  Real scale = scm_to_double (paper_->c_variable ("outputscale"));
-  Output_def * scaled_bookdef = scale_output_def (paper_, scale);
+  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->self_scm();
-  scm_gc_unprotect_object (scm_key);
-  
   paper_book->paper_ = scaled_bookdef;
-  scm_gc_unprotect_object (scaled_bookdef->self_scm());
-  
+  scaled_bookdef->unprotect ();
+
   paper_book->header_ = header_;
 
   /* Render in order of parsing.  */
-  for (SCM s = scm_reverse (scores_); s != SCM_EOL; s = scm_cdr (s))
+  for (SCM s = scm_reverse (scores_); scm_is_pair (s); s = scm_cdr (s))
     {
       if (Score *score = unsmob_score (scm_car (s)))
 	{
-	  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))
+	  SCM outputs = score
+	    ->book_rendering (paper_book->paper_, default_layout);
+
+	  while (scm_is_pair (outputs))
 	    {
-	      if (ly_c_module_p (header_))
-		paper_book->add_score (header_);
-	      paper_book->add_score (systems);
+	      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::markup_p (scm_car (s)))
+      else if (Text_interface::is_markup_list (scm_car (s))
+	       || unsmob_page_marker (scm_car (s)))
 	paper_book->add_score (scm_car (s));
       else
 	assert (0);
     }
 
-  scm_remember_upto_here_1 (scm_key);
   return paper_book;
 }
+